From 9dfd68f84afe91151e88df599fac90b4bd813a18 Mon Sep 17 00:00:00 2001
From: Nathan R <NJR4123@gmail.com>
Date: Wed, 6 May 2020 00:18:33 -0400
Subject: [PATCH 01/41] Fixed typo in NetworkUsageUnits.java (#10770)

Changed Netowork usage units. comment to Network usage units.
---
 .../java/com/azure/management/network/NetworkUsageUnit.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkUsageUnit.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkUsageUnit.java
index 77353673a6c2..f8e3e6c60e5f 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkUsageUnit.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkUsageUnit.java
@@ -5,7 +5,7 @@
 import com.azure.core.util.ExpandableStringEnum;
 import java.util.Collection;
 
-/** Netowork usage units. */
+/** Network usage units. */
 public class NetworkUsageUnit extends ExpandableStringEnum<NetworkUsageUnit> {
     /** Static value Count for NetworkUsageUnit. */
     public static final NetworkUsageUnit COUNT = fromString("Count");

From c123e88d3e78b3d1b81a977aae0646220457f2c1 Mon Sep 17 00:00:00 2001
From: Tanyi Chen <tanchen@microsoft.com>
Date: Wed, 6 May 2020 12:58:45 +0800
Subject: [PATCH 02/41] Mgmt generation: feature 2015 12 (#10772)

* feat: add datashare

* feat: generate feature 2015-12

* feat: update pom
---
 eng/mgmt/api-specs.json                       |   4 +
 sdk/features/mgmt-v2015_12_01/pom.xml         |  12 +-
 .../features/v2015_12_01/Features.java        |  10 +
 .../v2015_12_01/OperationDisplay.java         |  95 ++++++
 .../implementation/FeatureClientImpl.java     | 277 +++++++++++++++++-
 .../implementation/FeatureResultImpl.java     |   1 +
 .../implementation/FeaturesImpl.java          |  22 +-
 .../implementation/FeaturesInner.java         |  90 ++++++
 .../implementation/OperationInner.java        |  70 +++++
 9 files changed, 563 insertions(+), 18 deletions(-)
 create mode 100644 sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/OperationDisplay.java
 create mode 100644 sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/OperationInner.java

diff --git a/eng/mgmt/api-specs.json b/eng/mgmt/api-specs.json
index 171cf72329f2..8a7ec28d1fc0 100644
--- a/eng/mgmt/api-specs.json
+++ b/eng/mgmt/api-specs.json
@@ -102,6 +102,10 @@
     "source": "specification/datamigration/resource-manager/readme.md",
     "args": "--multiapi --fluent"
   },
+  "datashare/resource-manager": {
+    "source": "specification/datashare/resource-manager/readme.md",
+    "args": "--multiapi --fluent"
+  },
   "devtestlabs/resource-manager" : {
     "source": "specification/devtestlabs/resource-manager/readme.md",
     "args": "--multiapi --fluent"
diff --git a/sdk/features/mgmt-v2015_12_01/pom.xml b/sdk/features/mgmt-v2015_12_01/pom.xml
index 5aa22f96cbe4..63e28dedf39e 100644
--- a/sdk/features/mgmt-v2015_12_01/pom.xml
+++ b/sdk/features/mgmt-v2015_12_01/pom.xml
@@ -11,15 +11,15 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-features</artifactId>
-    <version>1.0.0-beta</version>
+    <version>1.0.0-beta-1</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Features Management</name>
     <description>This package contains Microsoft Features Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
         </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>
+        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
         <tag>HEAD</tag>
     </scm>
     <properties>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/Features.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/Features.java
index 5f4650df2e19..64a2d475e6e2 100644
--- a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/Features.java
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/Features.java
@@ -26,6 +26,16 @@ public interface Features extends HasInner<FeaturesInner> {
      */
     Observable<FeatureResult> registerAsync(String resourceProviderNamespace, String featureName);
 
+    /**
+     * Unregisters the preview feature for the subscription.
+     *
+     * @param resourceProviderNamespace The namespace of the resource provider.
+     * @param featureName The name of the feature to unregister.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FeatureResult> unregisterAsync(String resourceProviderNamespace, String featureName);
+
     /**
      * Gets all the preview features that are available through AFEC for the subscription.
      *
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/OperationDisplay.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/OperationDisplay.java
new file mode 100644
index 000000000000..13e97b37c8ae
--- /dev/null
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/OperationDisplay.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.features.v2015_12_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.Features.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Profile, endpoint, etc.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.Features.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set service provider: Microsoft.Features.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set operation type: Read, write, delete, etc.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+}
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureClientImpl.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureClientImpl.java
index db2b6732bd67..a6c74d7761c4 100644
--- a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureClientImpl.java
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureClientImpl.java
@@ -8,15 +8,36 @@
 
 package com.microsoft.azure.management.features.v2015_12_01.implementation;
 
+import com.google.common.reflect.TypeToken;
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
+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.credentials.ServiceClientCredentials;
 import com.microsoft.rest.RestClient;
+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;
 
 /**
  * Initializes a new instance of the FeatureClientImpl class.
  */
 public class FeatureClientImpl extends AzureServiceClient {
+    /** The Retrofit service to perform REST calls. */
+    private FeatureClientService service;
     /** the {@link AzureClient} used for long running operations. */
     private AzureClient azureClient;
 
@@ -63,11 +84,11 @@ public String apiVersion() {
         return this.apiVersion;
     }
 
-    /** Gets or sets the preferred language for the response. */
+    /** The preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets Gets or sets the preferred language for the response.
+     * Gets The preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -76,7 +97,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets Gets or sets the preferred language for the response.
+     * Sets The preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -86,11 +107,11 @@ public FeatureClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** 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.
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -99,7 +120,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -109,11 +130,11 @@ public FeatureClientImpl withLongRunningOperationRetryTimeout(int longRunningOpe
         return this;
     }
 
-    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** Whether a unique x-ms-client-request-id should be generated. 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.
+     * Gets Whether a unique x-ms-client-request-id should be generated. 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.
      */
@@ -122,7 +143,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets Whether a unique x-ms-client-request-id should be generated. 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
@@ -182,6 +203,7 @@ protected void initialize() {
         this.generateClientRequestId = true;
         this.features = new FeaturesInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
+        initializeService();
     }
 
     /**
@@ -191,6 +213,241 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s)", super.userAgent(), "FeatureClient", "2015-12-01");
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "FeatureClient", "2015-12-01");
     }
+
+    private void initializeService() {
+        service = restClient().retrofit().create(FeatureClientService.class);
+    }
+
+    /**
+     * The interface defining all the services for FeatureClient to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface FeatureClientService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.features.v2015_12_01.FeatureClient listOperations" })
+        @GET("providers/Microsoft.Features/operations")
+        Observable<Response<ResponseBody>> listOperations(@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.features.v2015_12_01.FeatureClient listOperationsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listOperationsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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> listOperations() {
+        ServiceResponse<Page<OperationInner>> response = listOperationsSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>> listOperationsAsync(final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listOperationsSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listOperationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>> listOperationsAsync() {
+        return listOperationsWithServiceResponseAsync()
+            .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 Microsoft.Features 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>>> listOperationsWithServiceResponseAsync() {
+        return listOperationsSinglePageAsync()
+            .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(listOperationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>>> listOperationsSinglePageAsync() {
+        if (this.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.apiVersion() is required and cannot be null.");
+        }
+        return service.listOperations(this.apiVersion(), this.acceptLanguage(), this.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 = listOperationsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listOperationsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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> listOperationsNext(final String nextPageLink) {
+        ServiceResponse<Page<OperationInner>> response = listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>> listOperationsNextAsync(final String nextPageLink, final ServiceFuture<List<OperationInner>> serviceFuture, final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listOperationsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listOperationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>> listOperationsNextAsync(final String nextPageLink) {
+        return listOperationsNextWithServiceResponseAsync(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 Microsoft.Features 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>>> listOperationsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listOperationsNextSinglePageAsync(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(listOperationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Features 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>>> listOperationsNextSinglePageAsync(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.listOperationsNext(nextUrl, this.acceptLanguage(), this.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 = listOperationsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listOperationsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
 }
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureResultImpl.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureResultImpl.java
index ee2a56edd3f3..e4322acf9233 100644
--- a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureResultImpl.java
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeatureResultImpl.java
@@ -21,6 +21,7 @@ class FeatureResultImpl extends IndexableRefreshableWrapperImpl<FeatureResult, F
     FeatureResultImpl(FeatureResultInner inner,  FeaturesManager manager) {
         super(null, inner);
         this.manager = manager;
+        // set resource ancestor and positional variables
         this.resourceProviderNamespace = IdParsingUtils.getValueFromIdByName(inner.id(), "providers");
         this.featureName = IdParsingUtils.getValueFromIdByName(inner.id(), "features");
     }
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesImpl.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesImpl.java
index ef192cd9b8a3..590f4de39ecb 100644
--- a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesImpl.java
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesImpl.java
@@ -44,6 +44,18 @@ public FeatureResult call(FeatureResultInner inner) {
         });
     }
 
+    @Override
+    public Observable<FeatureResult> unregisterAsync(String resourceProviderNamespace, String featureName) {
+        FeaturesInner client = this.inner();
+        return client.unregisterAsync(resourceProviderNamespace, featureName)
+        .map(new Func1<FeatureResultInner, FeatureResult>() {
+            @Override
+            public FeatureResult call(FeatureResultInner inner) {
+                return new FeatureResultImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<FeatureResult> listAsync() {
         FeaturesInner client = this.inner();
@@ -84,10 +96,14 @@ public FeatureResult call(FeatureResultInner inner) {
     public Observable<FeatureResult> getAsync(String resourceProviderNamespace, String featureName) {
         FeaturesInner client = this.inner();
         return client.getAsync(resourceProviderNamespace, featureName)
-        .map(new Func1<FeatureResultInner, FeatureResult>() {
+        .flatMap(new Func1<FeatureResultInner, Observable<FeatureResult>>() {
             @Override
-            public FeatureResult call(FeatureResultInner inner) {
-                return wrapModel(inner);
+            public Observable<FeatureResult> call(FeatureResultInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FeatureResult)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesInner.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesInner.java
index a14453d20df4..94389dcdec67 100644
--- a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesInner.java
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/FeaturesInner.java
@@ -74,6 +74,10 @@ interface FeaturesService {
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/{resourceProviderNamespace}/features/{featureName}/register")
         Observable<Response<ResponseBody>> register(@Path("resourceProviderNamespace") String resourceProviderNamespace, @Path("featureName") String featureName, @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.features.v2015_12_01.Features unregister" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/{resourceProviderNamespace}/features/{featureName}/unregister")
+        Observable<Response<ResponseBody>> unregister(@Path("resourceProviderNamespace") String resourceProviderNamespace, @Path("featureName") String featureName, @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.features.v2015_12_01.Features listNext" })
         @GET
         Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -478,6 +482,92 @@ private ServiceResponse<FeatureResultInner> registerDelegate(Response<ResponseBo
                 .build(response);
     }
 
+    /**
+     * Unregisters the preview feature for the subscription.
+     *
+     * @param resourceProviderNamespace The namespace of the resource provider.
+     * @param featureName The name of the feature to unregister.
+     * @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 FeatureResultInner object if successful.
+     */
+    public FeatureResultInner unregister(String resourceProviderNamespace, String featureName) {
+        return unregisterWithServiceResponseAsync(resourceProviderNamespace, featureName).toBlocking().single().body();
+    }
+
+    /**
+     * Unregisters the preview feature for the subscription.
+     *
+     * @param resourceProviderNamespace The namespace of the resource provider.
+     * @param featureName The name of the feature to unregister.
+     * @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<FeatureResultInner> unregisterAsync(String resourceProviderNamespace, String featureName, final ServiceCallback<FeatureResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(unregisterWithServiceResponseAsync(resourceProviderNamespace, featureName), serviceCallback);
+    }
+
+    /**
+     * Unregisters the preview feature for the subscription.
+     *
+     * @param resourceProviderNamespace The namespace of the resource provider.
+     * @param featureName The name of the feature to unregister.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FeatureResultInner object
+     */
+    public Observable<FeatureResultInner> unregisterAsync(String resourceProviderNamespace, String featureName) {
+        return unregisterWithServiceResponseAsync(resourceProviderNamespace, featureName).map(new Func1<ServiceResponse<FeatureResultInner>, FeatureResultInner>() {
+            @Override
+            public FeatureResultInner call(ServiceResponse<FeatureResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Unregisters the preview feature for the subscription.
+     *
+     * @param resourceProviderNamespace The namespace of the resource provider.
+     * @param featureName The name of the feature to unregister.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FeatureResultInner object
+     */
+    public Observable<ServiceResponse<FeatureResultInner>> unregisterWithServiceResponseAsync(String resourceProviderNamespace, String featureName) {
+        if (resourceProviderNamespace == null) {
+            throw new IllegalArgumentException("Parameter resourceProviderNamespace is required and cannot be null.");
+        }
+        if (featureName == null) {
+            throw new IllegalArgumentException("Parameter featureName 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.unregister(resourceProviderNamespace, featureName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FeatureResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FeatureResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FeatureResultInner> clientResponse = unregisterDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FeatureResultInner> unregisterDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FeatureResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FeatureResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Gets all the preview features that are available through AFEC for the subscription.
      *
diff --git a/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/OperationInner.java b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/OperationInner.java
new file mode 100644
index 000000000000..a31eb8d629a0
--- /dev/null
+++ b/sdk/features/mgmt-v2015_12_01/src/main/java/com/microsoft/azure/management/features/v2015_12_01/implementation/OperationInner.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.features.v2015_12_01.implementation;
+
+import com.microsoft.azure.management.features.v2015_12_01.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Microsoft.Features operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name")
+    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;
+    }
+
+    /**
+     * Set operation name: {provider}/{resource}/{operation}.
+     *
+     * @param name the name value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * 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;
+    }
+
+}

From 8e9e3fa2303915e736b0f1ca8d0931eb65667709 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 6 May 2020 06:49:46 -0700
Subject: [PATCH 03/41] Sync eng/common directory with azure-sdk-tools
 repository (#10739)

---
 eng/common/TestResources/Remove-TestResources.ps1  | 7 ++++++-
 eng/common/scripts/Submit-PullRequest.ps1          | 2 +-
 eng/common/scripts/copy-docs-to-blobstorage.ps1    | 2 +-
 eng/common/scripts/copy-readmes-to-docs.ps1        | 8 +++++---
 eng/common/scripts/create-tags-and-git-release.ps1 | 2 +-
 eng/common/scripts/git-branch-push.ps1             | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/eng/common/TestResources/Remove-TestResources.ps1 b/eng/common/TestResources/Remove-TestResources.ps1
index 53debad343e1..565803213096 100644
--- a/eng/common/TestResources/Remove-TestResources.ps1
+++ b/eng/common/TestResources/Remove-TestResources.ps1
@@ -124,7 +124,12 @@ if (![string]::IsNullOrWhiteSpace($ServiceDirectory)) {
     $preRemovalScript = Join-Path -Path $root -ChildPath 'remove-test-resources-pre.ps1'
     if (Test-Path $preRemovalScript) {
         Log "Invoking pre resource removal script '$preRemovalScript'"
-        &$preRemovalScript -ResourceGroupName $ResourceGroupName @PSBoundParameters
+
+        if ($PSCmdlet.ParameterSetName.StartsWith('ResourceGroup')) {
+            $PSBoundParameters.Add('ResourceGroupName', $ResourceGroupName);
+        }
+
+        &$preRemovalScript @PSBoundParameters
     }
 }
 
diff --git a/eng/common/scripts/Submit-PullRequest.ps1 b/eng/common/scripts/Submit-PullRequest.ps1
index 145e69b7f17c..2313a83c9f9a 100644
--- a/eng/common/scripts/Submit-PullRequest.ps1
+++ b/eng/common/scripts/Submit-PullRequest.ps1
@@ -41,7 +41,7 @@ param(
   $PRBody = $PRTitle
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $query = "state=open&head=${PROwner}:${PRBranch}&base=${BaseBranch}"
 
diff --git a/eng/common/scripts/copy-docs-to-blobstorage.ps1 b/eng/common/scripts/copy-docs-to-blobstorage.ps1
index 58c6d3654019..3d097abab8b2 100644
--- a/eng/common/scripts/copy-docs-to-blobstorage.ps1
+++ b/eng/common/scripts/copy-docs-to-blobstorage.ps1
@@ -10,7 +10,7 @@ param (
   $UploadLatest=1
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $Language = $Language.ToLower()
 
diff --git a/eng/common/scripts/copy-readmes-to-docs.ps1 b/eng/common/scripts/copy-readmes-to-docs.ps1
index 285eefce5a18..837e52f36607 100644
--- a/eng/common/scripts/copy-readmes-to-docs.ps1
+++ b/eng/common/scripts/copy-readmes-to-docs.ps1
@@ -9,7 +9,9 @@ param (
   [String]$TargetServices
 )
 
-$PACKAGE_README_REGEX = ".*[\/\\]sdk[\\\/][^\/\\]+[\\\/][^\/\\]+[\/\\]README\.md" 
+Write-Host "> $PSCommandPath $args"
+
+$PACKAGE_README_REGEX = ".*[\/\\]sdk[\\\/][^\/\\]+[\\\/][^\/\\]+[\/\\]README\.md"
 
 Write-Host "repo is $CodeRepo"
 
@@ -52,10 +54,10 @@ else {
 
 foreach($service in $selectedServices){
   $readmePath = Join-Path -Path $CodeRepo  -ChildPath "sdk/$service"
-  Write-Host "Examining: $readmePath" 
+  Write-Host "Examining: $readmePath"
 
   $libraries = $metadataResponse | Where-Object { $_.RepoPath -eq $service }
-  
+
   foreach($library in $libraries){
 
     $package = $library.Package
diff --git a/eng/common/scripts/create-tags-and-git-release.ps1 b/eng/common/scripts/create-tags-and-git-release.ps1
index 50cdbe00364d..f2f4c77384c3 100644
--- a/eng/common/scripts/create-tags-and-git-release.ps1
+++ b/eng/common/scripts/create-tags-and-git-release.ps1
@@ -18,7 +18,7 @@ param (
   [switch]$forceCreate = $false
 )
 
-Write-Host  $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 $VERSION_REGEX = "(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))?((?<pre>[^0-9][^\s]+))?"
 $SDIST_PACKAGE_REGEX = "^(?<package>.*)\-(?<versionstring>$VERSION_REGEX$)"
diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1
index 8be1cd1f30b2..4f2b5d771373 100644
--- a/eng/common/scripts/git-branch-push.ps1
+++ b/eng/common/scripts/git-branch-push.ps1
@@ -28,7 +28,7 @@ param(
     [string] $PushArgs = ""
 )
 
-Write-Host $MyInvocation.Line
+Write-Host "> $PSCommandPath $args"
 
 # This is necessay because of the janky git command output writing to stderr.
 # Without explicitly setting the ErrorActionPreference to continue the script

From 2c53711d4054a3f52074eea0cc6812465717707c Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 6 May 2020 07:44:29 -0700
Subject: [PATCH 04/41] Increment package version after release of com.azure
 azure-search-documents (#10833)

---
 eng/jacoco-test-coverage/pom.xml                      | 2 +-
 eng/versioning/version_client.txt                     | 2 +-
 sdk/core/azure-core-serializer-json-gson/CHANGELOG.md | 5 ++++-
 sdk/search/azure-search-documents/CHANGELOG.md        | 3 +++
 sdk/search/azure-search-documents/pom.xml             | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 352563cddc96..65267347a381 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -175,7 +175,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-search-documents</artifactId>
-      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
+      <version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 15fbf70c17bb..c869e229bcb6 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -26,7 +26,7 @@ com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-eventhubs;5.0.3;5.1.0-beta.1
 com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0-beta.1
 com.azure:azure-messaging-servicebus;7.0.0-beta.1;7.0.0-beta.2
-com.azure:azure-search-documents;1.0.0-beta.2;1.0.0-beta.3
+com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
 com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4
 com.azure:azure-security-keyvault-secrets;4.2.0-beta.2;4.2.0-beta.3
diff --git a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md
index 8df66935cab9..2eadb1c6038f 100644
--- a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md
+++ b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.0.0-beta.2 (Unreleased)
+
+
 ## 1.0.0-beta.1 (2020-05-04)
 
-- Initial release. Please see the README and wiki for information on the new design.
\ No newline at end of file
+- Initial release. Please see the README and wiki for information on the new design.
diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md
index 27eaf4c46539..d0ebefe8c067 100644
--- a/sdk/search/azure-search-documents/CHANGELOG.md
+++ b/sdk/search/azure-search-documents/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.0.0-beta.4 (Unreleased)
+
+
 ## 1.0.0-beta.3 (2020-05-05)
 - Replaced `isRetrievable` API with `isHidden`, parameter name changed from `retrievable` to `hidden`.
 - Changed Azure Search service version from `2019-05-06` to `2019-05-06-Preview`
diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml
index 1e40f786b853..5b019af6fb6f 100644
--- a/sdk/search/azure-search-documents/pom.xml
+++ b/sdk/search/azure-search-documents/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-search-documents</artifactId>
-  <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
+  <version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
   <packaging>jar</packaging>
 
   <properties>

From 1bfd8f7208c761adf6a625a37e2329346a1b8009 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Wed, 6 May 2020 09:09:47 -0700
Subject: [PATCH 05/41] Identity credential updates (#10769)

---
 .../azure/identity/EnvironmentCredential.java | 50 ++++++++++---------
 .../azure/identity/IntelliJCredential.java    |  9 ++--
 .../identity/VisualStudioCodeCredential.java  | 22 +++++---
 .../VisualStudioCacheAccessor.java            | 13 ++---
 4 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/EnvironmentCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/EnvironmentCredential.java
index 31df6a3a8b80..c333e2118d9c 100644
--- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/EnvironmentCredential.java
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/EnvironmentCredential.java
@@ -38,6 +38,7 @@ public class EnvironmentCredential implements TokenCredential {
     private final Configuration configuration;
     private final IdentityClientOptions identityClientOptions;
     private final ClientLogger logger = new ClientLogger(EnvironmentCredential.class);
+    private final TokenCredential tokenCredential;
 
     /**
      * Creates an instance of the default environment credential provider.
@@ -47,36 +48,39 @@ public class EnvironmentCredential implements TokenCredential {
     EnvironmentCredential(IdentityClientOptions identityClientOptions) {
         this.configuration = Configuration.getGlobalConfiguration().clone();
         this.identityClientOptions = identityClientOptions;
-    }
+        TokenCredential targetCredential = null;
 
-    @Override
-    public Mono<AccessToken> getToken(TokenRequestContext request) {
-        return Mono.fromSupplier(() -> {
-            String clientId = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID);
-            String tenantId = configuration.get(Configuration.PROPERTY_AZURE_TENANT_ID);
-            String clientSecret = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_SECRET);
-            String certPath = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_CERTIFICATE_PATH);
-            String username = configuration.get(Configuration.PROPERTY_AZURE_USERNAME);
-            String password = configuration.get(Configuration.PROPERTY_AZURE_PASSWORD);
-            if (verifyNotNull(clientId)) {
-                if (verifyNotNull(tenantId, clientSecret)) {
-                    // TODO: support other clouds
-                    return new ClientSecretCredential(tenantId, clientId, clientSecret, identityClientOptions);
-                } else if (verifyNotNull(tenantId, certPath)) {
-                    return new ClientCertificateCredential(tenantId, clientId, certPath, null, identityClientOptions);
-                } else if (verifyNotNull(username, password)) {
-                    return new UsernamePasswordCredential(clientId,
+        String clientId = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID);
+        String tenantId = configuration.get(Configuration.PROPERTY_AZURE_TENANT_ID);
+        String clientSecret = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_SECRET);
+        String certPath = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_CERTIFICATE_PATH);
+        String username = configuration.get(Configuration.PROPERTY_AZURE_USERNAME);
+        String password = configuration.get(Configuration.PROPERTY_AZURE_PASSWORD);
+        if (verifyNotNull(clientId)) {
+            if (verifyNotNull(tenantId, clientSecret)) {
+                targetCredential = new ClientSecretCredential(tenantId, clientId, clientSecret, identityClientOptions);
+            } else if (verifyNotNull(tenantId, certPath)) {
+                targetCredential = new ClientCertificateCredential(tenantId, clientId, certPath,
+                        null, identityClientOptions);
+            } else if (verifyNotNull(username, password)) {
+                targetCredential = new UsernamePasswordCredential(clientId,
                         tenantId,
                         username,
                         password,
                         identityClientOptions);
-                }
             }
+        }
+        tokenCredential = targetCredential;
+    }
 
-            // Other environment variables
-            throw logger.logExceptionAsError(new CredentialUnavailableException(
-                "Cannot create any credentials with the current environment variables"));
-        }).flatMap(cred -> cred.getToken(request));
+    @Override
+    public Mono<AccessToken> getToken(TokenRequestContext request) {
+        if (tokenCredential == null) {
+            return Mono.error(logger.logExceptionAsError(new CredentialUnavailableException(
+                    "Cannot create any credentials with the current environment variables")));
+        } else {
+            return tokenCredential.getToken(request);
+        }
     }
 
     private boolean verifyNotNull(String... configs) {
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java
index 3798a75f793a..ea868138423e 100644
--- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java
@@ -7,6 +7,7 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
+import com.azure.core.util.CoreUtils;
 import com.azure.identity.implementation.IdentityClient;
 import com.azure.identity.implementation.IdentityClientBuilder;
 import com.azure.identity.implementation.IdentityClientOptions;
@@ -49,9 +50,11 @@ class IntelliJCredential implements TokenCredential {
             authMethodDetails = null;
         }
 
-        String azureEnv = authMethodDetails != null ? authMethodDetails.getAzureEnv() : "";
-        String cloudInstance = accessor.getAzureAuthHost(azureEnv);
-        options.setAuthorityHost(cloudInstance);
+        if (CoreUtils.isNullOrEmpty(options.getAuthorityHost())) {
+            String azureEnv = authMethodDetails != null ? authMethodDetails.getAzureEnv() : "";
+            String cloudInstance = accessor.getAzureAuthHost(azureEnv);
+            options.setAuthorityHost(cloudInstance);
+        }
 
         String tenant = tenantId;
 
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/VisualStudioCodeCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/VisualStudioCodeCredential.java
index d7f6ec0e24f7..c1825bc19775 100644
--- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/VisualStudioCodeCredential.java
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/VisualStudioCodeCredential.java
@@ -6,6 +6,7 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
+import com.azure.core.util.CoreUtils;
 import com.azure.identity.implementation.IdentityClient;
 import com.azure.identity.implementation.IdentityClientBuilder;
 import com.azure.identity.implementation.IdentityClientOptions;
@@ -35,17 +36,26 @@ class VisualStudioCodeCredential implements TokenCredential {
 
         IdentityClientOptions options = (identityClientOptions == null ? new IdentityClientOptions()
                                                  : identityClientOptions);
+        String tenant;
 
-        String tenant = tenantId;
-        if (tenant == null) {
-            tenant = "common";
-        }
         VisualStudioCacheAccessor accessor = new VisualStudioCacheAccessor();
-        Map<String, String> userSettings = accessor.getUserSettingsDetails(tenant);
+        Map<String, String> userSettings = accessor.getUserSettingsDetails();
+
         cloudInstance = userSettings.get("cloud");
-        options.setAuthorityHost(accessor.getAzureAuthHost(cloudInstance));
+        if (CoreUtils.isNullOrEmpty(options.getAuthorityHost())) {
+            options.setAuthorityHost(accessor.getAzureAuthHost(cloudInstance));
+        }
+
+        if (!CoreUtils.isNullOrEmpty(tenantId)) {
+            tenant = tenantId;
+        } else if (userSettings.containsKey("tenant")) {
+            tenant = userSettings.get("tenant");
+        } else {
+            tenant = "common";
+        }
 
         identityClient = new IdentityClientBuilder()
+                .tenantId(tenant)
                 .clientId("aebc6443-996d-45c2-90f0-388ff96faa56")
                 .identityClientOptions(options)
                 .build();
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/VisualStudioCacheAccessor.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/VisualStudioCacheAccessor.java
index 8f7ec711abb0..f358bb02c8f9 100644
--- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/VisualStudioCacheAccessor.java
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/VisualStudioCacheAccessor.java
@@ -59,19 +59,17 @@ private JsonNode getUserSettings() {
     /**
      * Get the user configured settings of Visual Studio code.
      *
-     * @param tenantId the user specified tenant id.
      * @return a Map containing Vs Code user settings
      */
-    public Map<String, String> getUserSettingsDetails(String tenantId) {
+    public Map<String, String> getUserSettingsDetails() {
         JsonNode userSettings = getUserSettings();
         Map<String, String> details = new HashMap<>();
 
-        String tenant = tenantId;
-
+        String tenant = null;
         String cloud = "Azure";
 
         if (userSettings != null && !userSettings.isNull()) {
-            if (userSettings.has("azure.tenant") && CoreUtils.isNullOrEmpty(tenant)) {
+            if (userSettings.has("azure.tenant")) {
                 tenant = userSettings.get("azure.tenant").asText();
             }
 
@@ -80,7 +78,10 @@ public Map<String, String> getUserSettingsDetails(String tenantId) {
             }
         }
 
-        details.put("tenant", tenant);
+        if (!CoreUtils.isNullOrEmpty(tenant)) {
+            details.put("tenant", tenant);
+        }
+
         details.put("cloud", cloud);
         return details;
     }

From aa39e866c545ea78cf810588ee3209158f6c2a58 Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Wed, 6 May 2020 09:53:16 -0700
Subject: [PATCH 06/41] Add missing logging links in README files (#10834)

---
 sdk/core/azure-core-serializer-json-gson/README.md    | 3 +++
 sdk/core/azure-core-serializer-json-jackson/README.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sdk/core/azure-core-serializer-json-gson/README.md b/sdk/core/azure-core-serializer-json-gson/README.md
index fddde2c0c585..b6a6caeb2997 100644
--- a/sdk/core/azure-core-serializer-json-gson/README.md
+++ b/sdk/core/azure-core-serializer-json-gson/README.md
@@ -45,4 +45,7 @@ Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+<!-- Links -->
+[logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK
+
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fcore%2Fazure-core-serializer-json-gson%2FREADME.png)
diff --git a/sdk/core/azure-core-serializer-json-jackson/README.md b/sdk/core/azure-core-serializer-json-jackson/README.md
index a04b2e3a675e..12539da9988e 100644
--- a/sdk/core/azure-core-serializer-json-jackson/README.md
+++ b/sdk/core/azure-core-serializer-json-jackson/README.md
@@ -45,4 +45,7 @@ Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+<!-- Links -->
+[logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK
+
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fcore%2Fazure-core-serializer-json-jackson%2FREADME.png)

From 1956e6bb374c7c0adb31efb980be253d693f4e8c Mon Sep 17 00:00:00 2001
From: Sameeksha Vaity <savaity@microsoft.com>
Date: Wed, 6 May 2020 12:06:15 -0700
Subject: [PATCH 07/41] Rename apiKey() to credential() in FormRecognizer and
 TextAnalytics ClientBuilder (#10738)

---
 .../azure-ai-formrecognizer/CHANGELOG.md      |  1 +
 .../azure-ai-formrecognizer/README.md         | 15 ++++++------
 .../FormRecognizerClientBuilder.java          | 15 ++++++------
 .../AdvancedDiffLabeledUnlabeledData.java     |  2 +-
 ...AdvancedDiffLabeledUnlabeledDataAsync.java |  2 +-
 ...ognizerAsyncClientJavaDocCodeSnippets.java |  4 ++--
 ...rmRecognizerClientJavaDocCodeSnippets.java |  4 ++--
 .../ai/formrecognizer/GetBoundingBoxes.java   |  2 +-
 .../formrecognizer/GetBoundingBoxesAsync.java |  2 +-
 .../ai/formrecognizer/ManageCustomModels.java |  2 +-
 .../ManageCustomModelsAsync.java              |  2 +-
 .../ai/formrecognizer/ReadmeSamples.java      | 16 ++++++-------
 .../ai/formrecognizer/RecognizeContent.java   |  2 +-
 .../formrecognizer/RecognizeContentAsync.java |  2 +-
 .../formrecognizer/RecognizeCustomForms.java  |  2 +-
 .../RecognizeCustomFormsAsync.java            |  2 +-
 .../ai/formrecognizer/RecognizeReceipts.java  |  2 +-
 .../RecognizeReceiptsAsync.java               |  2 +-
 .../RecognizeReceiptsFromUrl.java             |  2 +-
 .../RecognizeReceiptsFromUrlAsync.java        |  2 +-
 .../formrecognizer/TrainModelWithLabels.java  |  2 +-
 .../TrainModelWithLabelsAsync.java            |  2 +-
 .../TrainModelWithoutLabels.java              |  2 +-
 .../TrainModelsWithoutLabelsAsync.java        |  2 +-
 .../FormRecognizerClientBuilderTest.java      |  2 +-
 .../FormRecognizerClientBuilderUnitTest.java  | 10 ++++----
 .../azure-ai-textanalytics/CHANGELOG.md       |  2 +-
 .../azure-ai-textanalytics/README.md          | 23 ++++++++++---------
 .../TextAnalyticsClientBuilder.java           | 13 ++++++-----
 .../ai/textanalytics/AnalyzeSentiment.java    |  2 +-
 .../textanalytics/AnalyzeSentimentAsync.java  |  2 +-
 .../ai/textanalytics/DetectLanguage.java      |  2 +-
 .../ai/textanalytics/DetectLanguageAsync.java |  2 +-
 .../ai/textanalytics/ExtractKeyPhrases.java   |  2 +-
 .../textanalytics/ExtractKeyPhrasesAsync.java |  2 +-
 .../azure/ai/textanalytics/ReadmeSamples.java | 22 +++++++++---------
 .../ai/textanalytics/RecognizeEntities.java   |  2 +-
 .../textanalytics/RecognizeEntitiesAsync.java |  2 +-
 .../RecognizeLinkedEntities.java              |  2 +-
 .../RecognizeLinkedEntitiesAsync.java         |  2 +-
 ...Key.java => RotateAzureKeyCredential.java} |  6 ++---
 ...ava => RotateAzureKeyCredentialAsync.java} |  6 ++---
 ...alyticsAsyncClientJavaDocCodeSnippets.java | 12 +++++-----
 ...extAnalyticsClientJavaDocCodeSnippets.java |  4 ++--
 .../batch/AnalyzeSentimentBatchDocuments.java |  2 +-
 .../AnalyzeSentimentBatchDocumentsAsync.java  |  2 +-
 .../AnalyzeSentimentBatchStringDocuments.java |  2 +-
 ...yzeSentimentBatchStringDocumentsAsync.java |  2 +-
 .../batch/DetectLanguageBatchDocuments.java   |  2 +-
 .../DetectLanguageBatchDocumentsAsync.java    |  2 +-
 .../DetectLanguageBatchStringDocuments.java   |  2 +-
 ...tectLanguageBatchStringDocumentsAsync.java |  2 +-
 .../ExtractKeyPhrasesBatchDocuments.java      |  2 +-
 .../ExtractKeyPhrasesBatchDocumentsAsync.java |  2 +-
 ...ExtractKeyPhrasesBatchStringDocuments.java |  2 +-
 ...ctKeyPhrasesBatchStringDocumentsAsync.java |  2 +-
 .../RecognizeEntitiesBatchDocuments.java      |  2 +-
 .../RecognizeEntitiesBatchDocumentsAsync.java |  2 +-
 ...RecognizeEntitiesBatchStringDocuments.java |  2 +-
 ...nizeEntitiesBatchStringDocumentsAsync.java |  2 +-
 ...RecognizeLinkedEntitiesBatchDocuments.java |  2 +-
 ...nizeLinkedEntitiesBatchDocumentsAsync.java |  2 +-
 ...izeLinkedEntitiesBatchStringDocuments.java |  2 +-
 ...nkedEntitiesBatchStringDocumentsAsync.java |  2 +-
 .../ai/textanalytics/DocumentInputTest.java   |  2 +-
 .../TextAnalyticsClientBuilderTest.java       |  2 +-
 .../TextAnalyticsClientBuilderUnitTest.java   | 23 +++++++++++--------
 67 files changed, 143 insertions(+), 135 deletions(-)
 rename sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/{RotateApiKey.java => RotateAzureKeyCredential.java} (93%)
 rename sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/{RotateApiKeyAsync.java => RotateAzureKeyCredentialAsync.java} (95%)

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
index f05f58881d2e..3c2e00b52909 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.0.0-beta.2 (2020-05-06)
 - Fixed Receipt type bug to select the valueString field via fieldValue.
+- Rename `apiKey()` to `credential()` on FormRecognizerClientBuilder.
 
 This package's 
 [documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-ai-formrecognizer_1.0.0-beta.2/sdk/formrecognizer/azure-ai-formrecognizer/README.md) 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
index d310096c43c7..f64bb4085578 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
@@ -59,7 +59,7 @@ az cognitiveservices account create \
 ```
 ### Authenticate the client
 In order to interact with the Form Recognizer service, you will need to create an instance of the `FormRecognizerClient` 
-class. You will need an **endpoint** and an **API key** to instantiate a client object, 
+class. You will need an **endpoint** and an **key** to instantiate a client object, 
 they can be found in the [Azure Portal][azure_portal] under the "Quickstart" in your created
 Form Recognizer resource. See the full details regarding [authentication][authentication] of Cognitive Services.
 
@@ -67,7 +67,7 @@ Form Recognizer resource. See the full details regarding [authentication][authen
 The `credential` parameter may be provided as a [`AzureKeyCredential`][azure_key_credential] from [azure-core][azure_core].
 
 ##### Create FormRecognizerClient with AzureKeyCredential
-To use an [API key][api_key], provide the key as a string to the AzureKeyCredential. This can be found in the [Azure Portal][azure_portal] 
+To use AzureKeyCredential authentication, provide the [key][key] as a string to the [AzureKeyCredential][azure_key_credential]. This can be found in the [Azure Portal][azure_portal] 
    under the "Quickstart" section or by running the following Azure CLI command:
 
 ```bash
@@ -77,7 +77,7 @@ Use the API key as the credential parameter to authenticate the client:
 <!-- embedme ./src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java#L37-L40 -->
 ```java
 FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-    .apiKey(new AzureKeyCredential("{api_key}"))
+    .credential(new AzureKeyCredential("{key}"))
     .endpoint("{endpoint}")
     .buildClient();
 ```
@@ -85,13 +85,13 @@ The Azure Form Recognizer client library provides a way to **rotate the existing
 
 <!-- embedme ./src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java#L47-L53 -->
 ```java
-AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+AzureKeyCredential credential = new AzureKeyCredential("{key}");
 FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-    .apiKey(credential)
+    .credential(credential)
     .endpoint("{endpoint}")
     .buildClient();
 
-credential.update("{new_api_key}");
+credential.update("{new_key}");
 ```
 
 ## Key concepts
@@ -336,7 +336,8 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact [opencode@microsoft.com][coc_contact] with any additional questions or comments.
 
 <!-- LINKS -->
-[api_key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
+[azure_key_credential]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/core/azure-core/src/main/java/com/azure/core/credential/AzureKeyCredential.java
+[key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
 [api_reference_doc]: https://aka.ms/azsdk-java-formrecognizer-ref-docs
 [authentication]: https://docs.microsoft.com/azure/cognitive-services/authentication
 [azure_cli]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account-cli?tabs=windows
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilder.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilder.java
index e9a5bd0c6cc5..5200eb9e3bd0 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilder.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilder.java
@@ -43,7 +43,7 @@
  *
  * <p>
  * The client needs the service endpoint of the Azure Form Recognizer to access the resource service.
- * {@link #apiKey(AzureKeyCredential)} gives
+ * {@link #credential(AzureKeyCredential)} gives
  * the builder access credential.
  * </p>
  *
@@ -114,7 +114,7 @@ public FormRecognizerClientBuilder() {
      *
      * @return A FormRecognizerClient with the options set from the builder.
      * @throws NullPointerException if {@link #endpoint(String) endpoint} or
-     * {@link #apiKey(AzureKeyCredential) apiKey} has not been set.
+     * {@link #credential(AzureKeyCredential)} has not been set.
      * @throws IllegalArgumentException if {@link #endpoint(String) endpoint} cannot be parsed into a valid URL.
      */
     public FormRecognizerClient buildClient() {
@@ -132,8 +132,8 @@ public FormRecognizerClient buildClient() {
      * </p>
      *
      * @return A FormRecognizerAsyncClient with the options set from the builder.
-     * @throws NullPointerException if {@link #endpoint(String) endpoint} or
-     * {@link #apiKey(AzureKeyCredential) apiKey} has not been set.
+     * @throws NullPointerException if {@link #endpoint(String) endpoint} or {@link #credential(AzureKeyCredential)}
+     * has not been set.
      * @throws IllegalArgumentException if {@link #endpoint(String) endpoint} cannot be parsed into a valid URL.
      */
     public FormRecognizerAsyncClient buildAsyncClient() {
@@ -219,14 +219,15 @@ public FormRecognizerClientBuilder endpoint(String endpoint) {
     }
 
     /**
-     * Sets the credential to use when authenticating HTTP requests for this FormRecognizerClientBuilder.
+     * Sets the {@link AzureKeyCredential} to use when authenticating HTTP requests for this
+     * FormRecognizerClientBuilder.
      *
-     * @param apiKeyCredential API key credential
+     * @param apiKeyCredential {@link AzureKeyCredential} API key credential
      *
      * @return The updated FormRecognizerClientBuilder object.
      * @throws NullPointerException If {@code apiKeyCredential} is {@code null}
      */
-    public FormRecognizerClientBuilder apiKey(AzureKeyCredential apiKeyCredential) {
+    public FormRecognizerClientBuilder credential(AzureKeyCredential apiKeyCredential) {
         this.credential = Objects.requireNonNull(apiKeyCredential, "'apiKeyCredential' cannot be null.");
         return this;
     }
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledData.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledData.java
index 63d68064e5b1..383ac95ea3b7 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledData.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledData.java
@@ -29,7 +29,7 @@ public static void main(String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
 
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledDataAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledDataAsync.java
index a276f1bb4305..6ea47c7df417 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledDataAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AdvancedDiffLabeledUnlabeledDataAsync.java
@@ -36,7 +36,7 @@ public static void main(String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
 
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClientJavaDocCodeSnippets.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClientJavaDocCodeSnippets.java
index 8a20174d502b..19d7771e5c33 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerAsyncClientJavaDocCodeSnippets.java
@@ -31,7 +31,7 @@ public class FormRecognizerAsyncClientJavaDocCodeSnippets {
     public void createFormRecognizerAsyncClient() {
         // BEGIN: com.azure.ai.formrecognizer.FormRecognizerAsyncClient.instantiation
         FormRecognizerAsyncClient formRecognizerAsyncClient = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
         // END: com.azure.ai.formrecognizer.FormRecognizerAsyncClient.instantiation
@@ -47,7 +47,7 @@ public void createFormRecognizerAsyncClientWithPipeline() {
             .build();
 
         FormRecognizerAsyncClient formRecognizerAsyncClient = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .pipeline(pipeline)
             .buildAsyncClient();
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerClientJavaDocCodeSnippets.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerClientJavaDocCodeSnippets.java
index b63a74a39410..ecf5a62f8873 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerClientJavaDocCodeSnippets.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/FormRecognizerClientJavaDocCodeSnippets.java
@@ -28,7 +28,7 @@ public class FormRecognizerClientJavaDocCodeSnippets {
     public void createFormRecognizerClient() {
         // BEGIN: com.azure.ai.formrecognizer.FormRecognizerClient.instantiation
         FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
         // END: com.azure.ai.formrecognizer.FormRecognizerClient.instantiation
@@ -44,7 +44,7 @@ public void createFormRecognizerClientWithPipeline() {
             .build();
 
         FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .pipeline(pipeline)
             .buildClient();
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxes.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxes.java
index 3888caf35c23..81beb2d11e09 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxes.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxes.java
@@ -25,7 +25,7 @@ public class GetBoundingBoxes {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxesAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxesAsync.java
index c2f4ab4d92cc..f4525add2062 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxesAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/GetBoundingBoxesAsync.java
@@ -28,7 +28,7 @@ public class GetBoundingBoxesAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModels.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModels.java
index 924f228152ad..94140b0527d0 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModels.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModels.java
@@ -26,7 +26,7 @@ public class ManageCustomModels {
     public static void main(final String[] args) {
         // Instantiate a client that will be used to call the service.
         FormTrainingClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient().getFormTrainingClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModelsAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModelsAsync.java
index ab508858b83a..1c4729c7d5a6 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModelsAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ManageCustomModelsAsync.java
@@ -22,7 +22,7 @@ public class ManageCustomModelsAsync {
     public static void main(final String[] args) {
         // Instantiate a client that will be used to call the service.
         FormTrainingAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient().getFormTrainingAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java
index 3d2fa63107f8..74e21002bbf4 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java
@@ -31,26 +31,26 @@ public class ReadmeSamples {
     private FormTrainingClient formTrainingClient = formRecognizerClient.getFormTrainingClient();
 
     /**
-     * Code snippet for getting sync client using the API key authentication.
+     * Code snippet for getting sync client using the AzureKeyCredential authentication.
      */
-    public void useApiKeySyncClient() {
+    public void useAzureKeyCredentialSyncClient() {
         FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
     }
 
     /**
-     * Code snippet for rotating API key of the client
+     * Code snippet for rotating AzureKeyCredential of the client
      */
-    public void rotatingApiKey() {
-        AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+    public void rotatingAzureKeyCredential() {
+        AzureKeyCredential credential = new AzureKeyCredential("{key}");
         FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint("{endpoint}")
             .buildClient();
 
-        credential.update("{new_api_key}");
+        credential.update("{new_key}");
     }
 
     public void recognizeCustomForm() {
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContent.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContent.java
index aa9ce8165358..abd803df8ddc 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContent.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContent.java
@@ -32,7 +32,7 @@ public static void main(final String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
 
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContentAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContentAsync.java
index 015140e3763d..149a09ddf71c 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContentAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeContentAsync.java
@@ -26,7 +26,7 @@ public static void main(final String[] args)  {
         // Instantiate a client that will be used to call the service.
 
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomForms.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomForms.java
index 33b4150dea21..103d306b01ff 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomForms.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomForms.java
@@ -24,7 +24,7 @@ public class RecognizeCustomForms {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomFormsAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomFormsAsync.java
index 92230bc18811..a8e648d23bdf 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomFormsAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeCustomFormsAsync.java
@@ -36,7 +36,7 @@ public class RecognizeCustomFormsAsync {
     public static void main(String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceipts.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceipts.java
index b31778da8978..8f4a7b711dcd 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceipts.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceipts.java
@@ -33,7 +33,7 @@ public class RecognizeReceipts {
     public static void main(final String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsAsync.java
index d091a1fd806f..4e871ae1b4af 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsAsync.java
@@ -37,7 +37,7 @@ public class RecognizeReceiptsAsync {
     public static void main(final String[] args) throws IOException {
         // Instantiate a client that will be used to call the service.
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrl.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrl.java
index a19a597861e8..981d0a648218 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrl.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrl.java
@@ -25,7 +25,7 @@ public class RecognizeReceiptsFromUrl {
     public static void main(final String[] args) {
         // Instantiate a client that will be used to call the service.
         FormRecognizerClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrlAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrlAsync.java
index 006481d07830..2d60b2d8b83e 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrlAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/RecognizeReceiptsFromUrlAsync.java
@@ -28,7 +28,7 @@ public class RecognizeReceiptsFromUrlAsync {
     public static void main(final String[] args) {
         // Instantiate a client that will be used to call the service.
         FormRecognizerAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabels.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabels.java
index 735c09055935..faef79025a9e 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabels.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabels.java
@@ -22,7 +22,7 @@ public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
 
         FormTrainingClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient().getFormTrainingClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabelsAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabelsAsync.java
index b36f6b6d5d5c..529b7d039f08 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabelsAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithLabelsAsync.java
@@ -27,7 +27,7 @@ public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
 
         FormTrainingAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_Key}"))
+            .credential(new AzureKeyCredential("{api_Key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient().getFormTrainingAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithoutLabels.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithoutLabels.java
index 1216b471be03..aec502c17e44 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithoutLabels.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelWithoutLabels.java
@@ -22,7 +22,7 @@ public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
 
         FormTrainingClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_Key}"))
+            .credential(new AzureKeyCredential("{api_Key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildClient().getFormTrainingClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelsWithoutLabelsAsync.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelsWithoutLabelsAsync.java
index 8685eb782771..a877e5a26a81 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelsWithoutLabelsAsync.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/TrainModelsWithoutLabelsAsync.java
@@ -27,7 +27,7 @@ public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
 
         FormTrainingAsyncClient client = new FormRecognizerClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
             .buildAsyncClient().getFormTrainingAsyncClient();
 
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderTest.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderTest.java
index d264bd8493d8..8ca09af6bc69 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderTest.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderTest.java
@@ -133,7 +133,7 @@ String getEndpoint() {
      */
     FormRecognizerClientBuilder createClientBuilder(String endpoint, AzureKeyCredential credential) {
         final FormRecognizerClientBuilder clientBuilder = new FormRecognizerClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint(endpoint);
 
         if (interceptorManager.isPlaybackMode()) {
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderUnitTest.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderUnitTest.java
index 59717344b555..b6e41332f82f 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderUnitTest.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientBuilderUnitTest.java
@@ -48,21 +48,21 @@ public void invalidProtocol() {
     }
 
     /**
-     * Test for null API key
+     * Test for null AzureKeyCredential
      */
     @Test
-    public void nullApiKey() {
+    public void nullAzureKeyCredential() {
         assertThrows(NullPointerException.class, () -> {
             final FormRecognizerClientBuilder builder = new FormRecognizerClientBuilder();
-            builder.endpoint(VALID_HTTPS_LOCALHOST).apiKey(null);
+            builder.endpoint(VALID_HTTPS_LOCALHOST).credential(null);
         });
     }
 
     /**
-     * Test for empty Api Key without any other authentication
+     * Test for empty Key without any other authentication
      */
     @Test
-    public void emptyApiKey() {
+    public void emptyKeyCredential() {
         assertThrows(IllegalArgumentException.class, () -> new AzureKeyCredential(""));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
index 1b76ce7af009..62108b5578b0 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 1.0.0-beta.5 (Unreleased)
-
+- Rename `apiKey()` to `credential()` on TextAnalyticsClientBuilder.
 
 ## 1.0.0-beta.4 (2020-04-07)
 - Throws an illegal argument exception when the given list of documents is an empty list.
diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md
index 99da1134884b..54f9af356ed2 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/README.md
@@ -68,32 +68,32 @@ Text Analytics resource. See the full details regarding [authentication][authent
 The authentication credential may be provided as the API key to your resource or as a token from Azure Active Directory.
 
 
-##### **Option 1**: Create TextAnalyticsClient with API Key Credential
-To use an [API key][api_key], provide the key as a string. This can be found in the [Azure Portal][azure_portal] 
+##### **Option 1**: Create TextAnalyticsClient with AzureKeyCredential
+To use AzureKeyCredential authentication, provide the [key][key] as a string to the [AzureKeyCredential][azure_key_credential]. This can be found in the [Azure Portal][azure_portal] 
    under the "Quickstart" section or by running the following Azure CLI command:
 
 ```bash
 az cognitiveservices account keys list --resource-group <your-resource-group-name> --name <your-resource-name>
 ```
-Use the API key as the credential parameter to authenticate the client:
+Use the key as the credential parameter to authenticate the client:
 <!-- embedme ./src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java#L43-L46 -->
 ```java
 TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-    .apiKey(new AzureKeyCredential("{api_key}"))
+    .credential(new AzureKeyCredential("{key}"))
     .endpoint("{endpoint}")
     .buildClient();
 ```
-The Azure Text Analytics client library provides a way to **rotate the existing API key**.
+The Azure Text Analytics client library provides a way to **rotate the existing key**.
 
 <!-- embedme ./src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java#L73-L79 -->
 ```java
-AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+AzureKeyCredential credential = new AzureKeyCredential("{key}");
 TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-    .apiKey(credential)
+    .credential(credential)
     .endpoint("{endpoint}")
     .buildClient();
 
-credential.update("{new_api_key}");
+credential.update("{new_key}");
 ```
 ##### **Option 2**: Create TextAnalyticsClient with Azure Active Directory Credential
 To use an [Azure Active Directory (AAD) token credential][aad_credential],
@@ -202,14 +202,14 @@ Text analytics support both synchronous and asynchronous client creation by usin
 <!-- embedme ./src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java#L43-L46 -->
 ``` java
 TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-    .apiKey(new AzureKeyCredential("{api_key}"))
+    .credential(new AzureKeyCredential("{key}"))
     .endpoint("{endpoint}")
     .buildClient();
 ```
 <!-- embedme ./src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java#L53-L56 -->
 ``` java
 TextAnalyticsAsyncClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-    .apiKey(new AzureKeyCredential("{api_key}"))
+    .credential(new AzureKeyCredential("{key}"))
     .endpoint("{endpoint}")
     .buildAsyncClient();
 ```
@@ -314,8 +314,9 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact [opencode@microsoft.com][coc_contact] with any additional questions or comments.
 
 <!-- LINKS -->
+[azure_key_credential]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/core/azure-core/src/main/java/com/azure/core/credential/AzureKeyCredential.java
 [aad_credential]: https://docs.microsoft.com/azure/cognitive-services/authentication#authenticate-with-azure-active-directory
-[api_key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
+[key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
 [api_reference_doc]: https://aka.ms/azsdk-java-textanalytics-ref-docs
 [authentication]: https://docs.microsoft.com/azure/cognitive-services/authentication
 [azure_cli]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account-cli?tabs=windows
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilder.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilder.java
index 74d98eee9127..b78dfeac6610 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilder.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilder.java
@@ -43,7 +43,7 @@
  *
  * <p>
  * The client needs the service endpoint of the Azure Text Analytics to access the resource service. {@link
- * #apiKey(AzureKeyCredential)} or {@link #credential(TokenCredential) credential(TokenCredential)} give the builder
+ * #credential(AzureKeyCredential)} or {@link #credential(TokenCredential) credential(TokenCredential)} give the builder
  * access credential.
  * </p>
  *
@@ -125,7 +125,7 @@ public TextAnalyticsClientBuilder() {
      * </p>
      *
      * @return A {@link TextAnalyticsClient} with the options set from the builder.
-     * @throws NullPointerException if {@link #endpoint(String) endpoint} or {@link #apiKey(AzureKeyCredential) apiKey}
+     * @throws NullPointerException if {@link #endpoint(String) endpoint} or {@link #credential(AzureKeyCredential)}
      * has not been set.
      * @throws IllegalArgumentException if {@link #endpoint(String) endpoint} cannot be parsed into a valid URL.
      */
@@ -143,7 +143,7 @@ public TextAnalyticsClient buildClient() {
      * </p>
      *
      * @return A {@link TextAnalyticsAsyncClient} with the options set from the builder.
-     * @throws NullPointerException if {@link #endpoint(String) endpoint} or {@link #apiKey(AzureKeyCredential) apiKey}
+     * @throws NullPointerException if {@link #endpoint(String) endpoint} or {@link #credential(AzureKeyCredential)}
      * has not been set.
      * @throws IllegalArgumentException if {@link #endpoint(String) endpoint} cannot be parsed into a valid URL.
      */
@@ -254,13 +254,14 @@ public TextAnalyticsClientBuilder endpoint(String endpoint) {
     }
 
     /**
-     * Sets the credential to use when authenticating HTTP requests for this {@link TextAnalyticsClientBuilder}.
+     * Sets the {@link AzureKeyCredential} to use when authenticating HTTP requests for this
+     * {@link TextAnalyticsClientBuilder}.
      *
-     * @param keyCredential API key credential
+     * @param keyCredential {@link AzureKeyCredential} API key credential
      * @return The updated {@link TextAnalyticsClientBuilder} object.
      * @throws NullPointerException If {@code keyCredential} is {@code null}
      */
-    public TextAnalyticsClientBuilder apiKey(AzureKeyCredential keyCredential) {
+    public TextAnalyticsClientBuilder credential(AzureKeyCredential keyCredential) {
         this.credential = Objects.requireNonNull(keyCredential, "'keyCredential' cannot be null.");
         return this;
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentiment.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentiment.java
index fda179d703fd..8dce1bfbda75 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentiment.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentiment.java
@@ -19,7 +19,7 @@ public class AnalyzeSentiment {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentimentAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentimentAsync.java
index 1f1350887654..7c8dba522894 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentimentAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/AnalyzeSentimentAsync.java
@@ -20,7 +20,7 @@ public class AnalyzeSentimentAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
index 720bf192d52f..31366ed43a82 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
@@ -18,7 +18,7 @@ public class DetectLanguage {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
index 5b02434eab6d..a4fc692a651a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
@@ -19,7 +19,7 @@ public class DetectLanguageAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrases.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrases.java
index ecd766f34870..e9c30347e536 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrases.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrases.java
@@ -17,7 +17,7 @@ public class ExtractKeyPhrases {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrasesAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrasesAsync.java
index fe183de2eec7..824922014fc8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrasesAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ExtractKeyPhrasesAsync.java
@@ -19,7 +19,7 @@ public class ExtractKeyPhrasesAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
index c6450ddaadc2..3a30b3c8b9ec 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
@@ -37,21 +37,21 @@ public void configureHttpClient() {
     }
 
     /**
-     * Code snippet for getting sync client using the API key authentication.
+     * Code snippet for getting sync client using the AzureKeyCredential authentication.
      */
-    public void useApiKeySyncClient() {
+    public void useAzureKeyCredentialSyncClient() {
         TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
     }
 
     /**
-     * Code snippet for getting async client using API key authentication.
+     * Code snippet for getting async client using AzureKeyCredential authentication.
      */
-    public void useApiKeyAsyncClient() {
+    public void useAzureKeyCredentialAsyncClient() {
         TextAnalyticsAsyncClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
     }
@@ -67,16 +67,16 @@ public void useAadAsyncClient() {
     }
 
     /**
-     * Code snippet for rotating API key of the client
+     * Code snippet for rotating AzureKeyCredential of the client
      */
-    public void rotatingApiKey() {
-        AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+    public void rotatingAzureKeyCredential() {
+        AzureKeyCredential credential = new AzureKeyCredential("{key}");
         TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint("{endpoint}")
             .buildClient();
 
-        credential.update("{new_api_key}");
+        credential.update("{new_key}");
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
index 12014b9bf8ce..3ceb99fcea66 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
@@ -17,7 +17,7 @@ public class RecognizeEntities {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
index 16860a1c238a..1e66ef5b36a5 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
@@ -19,7 +19,7 @@ public class RecognizeEntitiesAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
index 1565c2eb52ad..08bab97c57f6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
@@ -17,7 +17,7 @@ public class RecognizeLinkedEntities {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
index 884871cff5a2..5d533dad4d69 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
@@ -19,7 +19,7 @@ public class RecognizeLinkedEntitiesAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKey.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredential.java
similarity index 93%
rename from sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKey.java
rename to sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredential.java
index 64cb31d7c1a4..9cd085bceb24 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKey.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredential.java
@@ -9,7 +9,7 @@
 /**
  * Sample demonstrates how to rotate the existing API key of text analytics client
  */
-public class RotateApiKey {
+public class RotateAzureKeyCredential {
 
     /**
      * Main method to invoke this demo about how to rotate the existing API key of text analytics client.
@@ -17,9 +17,9 @@ public class RotateApiKey {
      * @param args Unused arguments to the program.
      */
     public static void main(String[] args) {
-        AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+        AzureKeyCredential credential = new AzureKeyCredential("{key}");
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKeyAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredentialAsync.java
similarity index 95%
rename from sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKeyAsync.java
rename to sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredentialAsync.java
index 90b893518755..8e26db32a53e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateApiKeyAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RotateAzureKeyCredentialAsync.java
@@ -10,7 +10,7 @@
 /**
  * Sample demonstrates how to rotate the existing API key of text analytics client
  */
-public class RotateApiKeyAsync {
+public class RotateAzureKeyCredentialAsync {
 
     /**
      * Main method to invoke this demo about how to rotate the existing API key of text analytics client.
@@ -18,9 +18,9 @@ public class RotateApiKeyAsync {
      * @param args Unused arguments to the program.
      */
     public static void main(String[] args) {
-        AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+        AzureKeyCredential credential = new AzureKeyCredential("{key}");
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
index 293b5112762b..7057181c728b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
@@ -33,7 +33,7 @@ public class TextAnalyticsAsyncClientJavaDocCodeSnippets {
     public TextAnalyticsAsyncClient createTextAnalyticsAsyncClient() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.instantiation
         TextAnalyticsAsyncClient textAnalyticsAsyncClient = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.instantiation
@@ -43,17 +43,17 @@ public TextAnalyticsAsyncClient createTextAnalyticsAsyncClient() {
     /**
      * Code snippet for updating the existing API key.
      */
-    public void rotateApiKey() {
-        // BEGIN: com.azure.ai.textanalytics.models.TextAnalyticsApiKeyCredential
-        AzureKeyCredential credential = new AzureKeyCredential("{api_key}");
+    public void rotateAzureKeyCredential() {
+        // BEGIN: com.azure.ai.textanalytics.models.AzureKeyCredential
+        AzureKeyCredential credential = new AzureKeyCredential("{key}");
 
         TextAnalyticsAsyncClient textAnalyticsAsyncClient = new TextAnalyticsClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
         credential.update("{new_api_key}");
-        // END: com.azure.ai.textanalytics.models.TextAnalyticsApiKeyCredential
+        // END: com.azure.ai.textanalytics.models.AzureKeyCredential
     }
 
     // Languages
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
index 27915a3fdcb4..d88c0e6eee6a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
@@ -39,7 +39,7 @@ public void createTextAnalyticsClientWithPipeline() {
             .build();
 
         TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .pipeline(pipeline)
             .buildClient();
@@ -52,7 +52,7 @@ public void createTextAnalyticsClientWithPipeline() {
     public void createTextAnalyticsClient() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.instantiation
         TextAnalyticsClient textAnalyticsClient = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.instantiation
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
index 422dde419aea..114f7a7cd6f8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
@@ -31,7 +31,7 @@ public class AnalyzeSentimentBatchDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
index 33320208fcfc..09ed165ffcae 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
@@ -30,7 +30,7 @@ public class AnalyzeSentimentBatchDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocuments.java
index 63dbe7fc3a56..2d5423f034db 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocuments.java
@@ -26,7 +26,7 @@ public class AnalyzeSentimentBatchStringDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocumentsAsync.java
index bee51fc1c905..2c3e2a32eb1d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchStringDocumentsAsync.java
@@ -27,7 +27,7 @@ public class AnalyzeSentimentBatchStringDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
index 9461cd8b04d6..c7e86c1e593f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
@@ -30,7 +30,7 @@ public class DetectLanguageBatchDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
index 90586073c778..b0c3ca69e63f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
@@ -29,7 +29,7 @@ public class DetectLanguageBatchDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
index 89e24f3ed420..755b55d740c3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
@@ -24,7 +24,7 @@ public class DetectLanguageBatchStringDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
index 7d275b1750e0..7c032136afb6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
@@ -25,7 +25,7 @@ public class DetectLanguageBatchStringDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
index dfe2f8ceaa99..820fe64c0f64 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
@@ -29,7 +29,7 @@ public class ExtractKeyPhrasesBatchDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
index e4e28bce670c..4fcd9a3c2971 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
@@ -28,7 +28,7 @@ public class ExtractKeyPhrasesBatchDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocuments.java
index 7afaf6295167..1ba940219ca7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocuments.java
@@ -24,7 +24,7 @@ public class ExtractKeyPhrasesBatchStringDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocumentsAsync.java
index bccb9ad84c8e..6bc3fe4e8543 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchStringDocumentsAsync.java
@@ -24,7 +24,7 @@ public class ExtractKeyPhrasesBatchStringDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
index bc74c16cf747..5bbf21d68270 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
@@ -29,7 +29,7 @@ public class RecognizeEntitiesBatchDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
index 4fdf184e3e2f..dc16b89f1ed4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
@@ -28,7 +28,7 @@ public class RecognizeEntitiesBatchDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
index 8353962295d3..714dc2a44d61 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
@@ -24,7 +24,7 @@ public class RecognizeEntitiesBatchStringDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
index 0b6e6de29d82..38511aeecf8a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
@@ -24,7 +24,7 @@ public class RecognizeEntitiesBatchStringDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
index 492ad2f1d008..b0e2ebdc23fc 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
@@ -29,7 +29,7 @@ public class RecognizeLinkedEntitiesBatchDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
index ce04bb66030d..ad08aed75cd7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
@@ -28,7 +28,7 @@ public class RecognizeLinkedEntitiesBatchDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
index b58034b19d2c..4c25929d6b99 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
@@ -24,7 +24,7 @@ public class RecognizeLinkedEntitiesBatchStringDocuments {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
index 681ef3b535dc..a364f2f1be5e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
@@ -24,7 +24,7 @@ public class RecognizeLinkedEntitiesBatchStringDocumentsAsync {
     public static void main(String[] args) {
         // Instantiate a client that will be used to call the service.
         TextAnalyticsAsyncClient client = new TextAnalyticsClientBuilder()
-            .apiKey(new AzureKeyCredential("{api_key}"))
+            .credential(new AzureKeyCredential("{key}"))
             .endpoint("{endpoint}")
             .buildAsyncClient();
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
index e57e35ffb531..63709dd10d1b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
@@ -31,7 +31,7 @@ public class DocumentInputTest {
     protected static void beforeTest() {
         client = new TextAnalyticsClientBuilder()
             .endpoint(VALID_HTTPS_LOCALHOST)
-            .apiKey(new AzureKeyCredential("fakeKey"))
+            .credential(new AzureKeyCredential("fakeKey"))
             .buildClient();
     }
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderTest.java
index 0bc5e7b5b01f..65557315c399 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderTest.java
@@ -306,7 +306,7 @@ String getEndpoint() {
      */
     TextAnalyticsClientBuilder createClientBuilder(String endpoint, AzureKeyCredential credential) {
         final TextAnalyticsClientBuilder clientBuilder = new TextAnalyticsClientBuilder()
-            .apiKey(credential)
+            .credential(credential)
             .endpoint(endpoint);
 
         if (interceptorManager.isPlaybackMode()) {
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderUnitTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderUnitTest.java
index fad092eb8771..cf37b68d6e4a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderUnitTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderUnitTest.java
@@ -4,6 +4,7 @@
 package com.azure.ai.textanalytics;
 
 import com.azure.core.credential.AzureKeyCredential;
+import com.azure.core.credential.TokenCredential;
 import org.junit.jupiter.api.Test;
 
 import static com.azure.ai.textanalytics.TestUtils.VALID_HTTPS_LOCALHOST;
@@ -48,22 +49,23 @@ public void invalidProtocol() {
     }
 
     /**
-     * Test for null API key
+     * Test for empty Api Key without any other authentication
      */
     @Test
-    public void nullApiKey() {
-        assertThrows(NullPointerException.class, () -> {
-            final TextAnalyticsClientBuilder builder = new TextAnalyticsClientBuilder();
-            builder.endpoint(VALID_HTTPS_LOCALHOST).apiKey(null);
-        });
+    public void emptyApiKey() {
+        assertThrows(IllegalArgumentException.class, () -> new AzureKeyCredential(""));
     }
 
     /**
-     * Test for empty Api Key without any other authentication
+     * Test for null API key
      */
     @Test
-    public void emptyApiKey() {
-        assertThrows(IllegalArgumentException.class, () -> new AzureKeyCredential(""));
+    public void nullApiKey() {
+        AzureKeyCredential azureKeyCredential = null;
+        assertThrows(NullPointerException.class, () -> {
+            final TextAnalyticsClientBuilder builder = new TextAnalyticsClientBuilder();
+            builder.endpoint(VALID_HTTPS_LOCALHOST).credential(azureKeyCredential);
+        });
     }
 
     /**
@@ -71,9 +73,10 @@ public void emptyApiKey() {
      */
     @Test
     public void nullAADCredential() {
+        TokenCredential tokenCredential = null;
         assertThrows(NullPointerException.class, () -> {
             final TextAnalyticsClientBuilder builder = new TextAnalyticsClientBuilder();
-            builder.endpoint(VALID_HTTPS_LOCALHOST).credential(null);
+            builder.endpoint(VALID_HTTPS_LOCALHOST).credential(tokenCredential);
         });
     }
 }

From a2e36dd6e7eb3b8648b0f65e27523dcf799f123b Mon Sep 17 00:00:00 2001
From: "Fred Gao (MSFT)" <v-yicgao@microsoft.com>
Date: Thu, 7 May 2020 08:34:33 +1200
Subject: [PATCH 08/41] Correct Azure Key Vault Certificates .md files content
 inconsistency and unclear (#10118)

* update according to issue

* update according to issue

* update according to comment

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-Authored-By: vcolin7 <vicolina@microsoft.com>

* update according comment

* Made additional changes in favor of readability and consistency in text and code samples.

* Update sdk/keyvault/azure-security-keyvault-certificates/README.md

Co-authored-by: vcolin7 <vicolina@microsoft.com>
---
 .../README.md                                 | 240 +++++++++---------
 .../CertificateClientJavaDocCodeSnippets.java |   2 +-
 2 files changed, 116 insertions(+), 126 deletions(-)

diff --git a/sdk/keyvault/azure-security-keyvault-certificates/README.md b/sdk/keyvault/azure-security-keyvault-certificates/README.md
index 3b6b0601cd40..8c4eb547c436 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/README.md
+++ b/sdk/keyvault/azure-security-keyvault-certificates/README.md
@@ -1,14 +1,13 @@
 # Azure Key Vault Certificate client library for Java
-Azure Key Vault allows you to create and store certificates in the Key Vault. Azure Key Vault client supports certificates backed by Rsa keys and Ec keys. It allows you to securely manage, tightly control your certificates.
+Azure Key Vault allows you to securely manage and tightly control your certificates. The Azure Key Vault Certificate client library supports certificates backed by RSA and EC keys.
 
- Multiple certificates, and multiple versions of the same certificate, can be kept in the Key Vault. Cryptographic keys in Key Vault backing the certificates are represented as [JSON Web Key [JWK]](https://tools.ietf.org/html/rfc7517) objects. This library offers operations to create, retrieve, update, delete, purge, backup, restore and list the certificates and its versions.
+Multiple certificates and multiple versions of the same certificate can be kept in the Key Vault. Cryptographic keys in Key Vault backing the certificates are represented as [JSON Web Key [JWK]](https://tools.ietf.org/html/rfc7517) objects. This library offers operations to create, retrieve, update, delete, purge, backup, restore, and list the certificates, as well as its versions.
 
 [Source code][source_code] | [API reference documentation][api_documentation] | [Product documentation][azkeyvault_docs] | [Samples][certificates_samples]
 
 ## Getting started
 ### Adding the package to your project
-
-Maven dependency for Azure Key Client library. Add it to your project's pom file.
+Maven dependency for the Azure Key Vault Certificate client library. Add it to your project's POM file.
 
 [//]: # ({x-version-update-start;com.azure:azure-security-keyvault-certificates;current})
 ```xml
@@ -21,7 +20,6 @@ Maven dependency for Azure Key Client library. Add it to your project's pom file
 [//]: # ({x-version-update-end})
 
 ### Prerequisites
-
 - Java Development Kit (JDK) with version 8 or above
 - [Azure Subscription][azure_subscription]
 - An existing [Azure Key Vault][azure_keyvault]. If you need to create a Key Vault, you can use the [Azure Cloud Shell](https://shell.azure.com/bash) to create one with this Azure CLI command. Replace `<your-resource-group-name>` and `<your-key-vault-name>` with your own, unique names:
@@ -31,14 +29,14 @@ Maven dependency for Azure Key Client library. Add it to your project's pom file
     ```
 
 ### Authenticate the client
-In order to interact with the Key Vault service, you'll need to create an instance of the [CertificateClient](#create-certificate-client) class. You would need a **vault url** and **client secret credentials (client id, client key, tenant id)** to instantiate a client object using the default `AzureCredential` examples shown in this document.
+In order to interact with the Azure Key Vault service, you'll need to create an instance of the [CertificateClient](#create-certificate-client) class. You need a **vault url** and **client secret credentials (client id, client secret, tenant id)** to instantiate a client object using the `DefaultAzureCredential` examples shown in this document.
 
 The `DefaultAzureCredential` way of authentication by providing client secret credentials is being used in this getting started section but you can find more ways to authenticate with [azure-identity][azure_identity].
 
 #### Create/Get credentials
-To create/get client key credentials you can use the [Azure Portal][azure_create_application_in_portal], [Azure CLI][azure_keyvault_cli_full] or [Azure Cloud Shell](https://shell.azure.com/bash)
+To create/get client secret credentials you can use the [Azure Portal][azure_create_application_in_portal], [Azure CLI][azure_keyvault_cli_full] or [Azure Cloud Shell](https://shell.azure.com/bash)
 
-Here is [Azure Cloud Shell](https://shell.azure.com/bash) snippet below to
+Here is an [Azure Cloud Shell](https://shell.azure.com/bash) snippet below to
 
  * Create a service principal and configure its access to Azure resources:
 
@@ -58,163 +56,161 @@ Here is [Azure Cloud Shell](https://shell.azure.com/bash) snippet below to
     }
     ```
 
-* Use the above returned credentials information to set **AZURE_CLIENT_ID**(appId), **AZURE_CLIENT_SECRET**(password) and **AZURE_TENANT_ID**(tenant) environment variables. The following example shows a way to do this in Bash:
+* Use the above returned credentials information to set the **AZURE_CLIENT_ID** (appId), **AZURE_CLIENT_SECRET** (password), and **AZURE_TENANT_ID** (tenantId) environment variables. The following example shows a way to do this in Bash:
 
-  ```Bash
+    ```Bash
     export AZURE_CLIENT_ID="generated-app-ID"
     export AZURE_CLIENT_SECRET="random-password"
     export AZURE_TENANT_ID="tenant-ID"
-  ```
+    ```
 
-* Grant the above mentioned application authorization to perform key operations on the keyvault:
+* Grant the aforementioned application authorization to perform certificate operations on the Key Vault:
 
     ```Bash
-    az keyvault set-policy --name <your-key-vault-name> --spn $AZURE_CLIENT_ID --certificate-permissions backup delete get list create
+    az keyvault set-policy --name <your-key-vault-name> --spn $AZURE_CLIENT_ID --certificate-permissions backup delete get list create update
     ```
 
     > --certificate-permissions:
     > Accepted values: backup, create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, restore, setissuers, update
 
-* Use the above mentioned Key Vault name to retreive details of your Vault which also contains your Key Vault URL:
+* Use the aforementioned Key Vault name to retrieve details of your Key Vault, which also contain your Key Vault URL:
 
     ```Bash
     az keyvault show --name <your-key-vault-name>
     ```
 
-#### Create Certificate client
-Once you've populated the **AZURE_CLIENT_ID**, **AZURE_CLIENT_SECRET** and **AZURE_TENANT_ID** environment variables and replaced **your-vault-url** with the above returned URI, you can create the CertificateClient:
+#### Create certificate client
+Once you've populated the **AZURE_CLIENT_ID**, **AZURE_CLIENT_SECRET**, and **AZURE_TENANT_ID** environment variables and replaced **your-key-vault-url** with the URI returned above, you can create the CertificateClient:
 
 ```Java
 import com.azure.identity.DefaultAzureCredentialBuilder;
 import com.azure.security.keyvault.certificates.CertificateClient;
+import com.azure.security.keyvault.certificates.CertificateClientBuilder;
 
 CertificateClient client = new CertificateClientBuilder()
-        .vaultUrl(<your-vault-url>)
-        .credential(new DefaultAzureCredentialBuilder().build())
-        .buildClient();
+    .vaultUrl(<your-key-vault-url>)
+    .credential(new DefaultAzureCredentialBuilder().build())
+    .buildClient();
 ```
 
-> NOTE: For using Asynchronous client use CertificateAsyncClient instead of CertificateClient and call buildAsyncClient()
+> NOTE: For using an asynchronous client use CertificateAsyncClient instead of CertificateClient and call `buildAsyncClient()`
 
 ## Key concepts
 ### Certificate
-  Azure Key Vault supports certificates with secret content types(`PKCS12` & `PEM`). The certificate can be backed by keys in key vault of types(`EC` & `RSA`). In addition to the certificate policy, the following attributes may be specified:
-* enabled: Specifies whether the certificate is enabled and useable.
+Azure Key Vault supports certificates with secret content types (`PKCS12` & `PEM`). The certificate can be backed by keys in Azure Key Vault of types (`EC` & `RSA`). In addition to the certificate policy, the following attributes may be specified:
+* enabled: Specifies whether the certificate is enabled and usable.
 * created: Indicates when this version of the certificate was created.
 * updated: Indicates when this version of the certificate was updated.
 
-### Certificate Client:
-The Certificate client performs the interactions with the Azure Key Vault service for getting, setting, updating, deleting, and listing certificates and its versions. The client also supports CRUD operations for certificate issuers and contacts in the key vault. An asynchronous and synchronous, CertificateClient, client exists in the SDK allowing for selection of a client based on an application's use case. Once you've initialized a Certificate, you can interact with the primary resource types in Key Vault.
+### Certificate client
+The certificate client performs the interactions with the Azure Key Vault service for getting, setting, updating, deleting, and listing certificates and its versions. The client also supports CRUD operations for certificate issuers and contacts in the key vault. Asynchronous (CertificateAsyncClient) and synchronous (CertificateClient) clients exist in the SDK allowing for the selection of a client based on an application's use case. Once you've initialized a certificate, you can interact with the primary resource types in Azure Key Vault.
 
 ## Examples
 ### Sync API
-The following sections provide several code snippets covering some of the most common Azure Key Vault Key Service tasks, including:
-- [Create a Certificate](#create-a-certificate)
-- [Retrieve a Certificate](#retrieve-a-certificate)
-- [Update an existing Certificate](#update-an-existing-certificate)
-- [Delete a Certificate](#delete-a-certificate)
-- [List Certificates](#list-certificates)
-
-### Create a Certificate
+The following sections provide several code snippets covering some of the most common Azure Key Vault Certificate service tasks, including:
+- [Create a certificate](#create-a-certificate)
+- [Retrieve a certificate](#retrieve-a-certificate)
+- [Update an existing certificate](#update-an-existing-certificate)
+- [Delete a certificate](#delete-a-certificate)
+- [List certificates](#list-certificates)
 
-Create a Certificate to be stored in the Azure Key Vault.
-- `beginCreateCertificate` creates a new certificate in the key vault. if the certificate with name already exists then a new version of the certificate is created.
+### Create a certificate
+Create a certificate to be stored in the Azure Key Vault.
+- `beginCreateCertificate` creates a new certificate in the Azure Key Vault. If a certificate with the same name already exists then a new version of the certificate is created.
 
 ```Java
+import com.azure.core.util.polling.LongRunningOperationStatus;
+import com.azure.core.util.polling.SyncPoller;
 import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.security.keyvault.certificates.models.Certificate;
-import com.azure.security.keyvault.certificates.models.CertificatePolicy;
-import com.azure.security.keyvault.certificates.models.CertificateOperation;
 import com.azure.security.keyvault.certificates.CertificateClient;
+import com.azure.security.keyvault.certificates.CertificateClientBuilder;
+import com.azure.security.keyvault.certificates.models.CertificateOperation;
+import com.azure.security.keyvault.certificates.models.CertificatePolicy;
+import com.azure.security.keyvault.certificates.models.KeyVaultCertificate;
+import com.azure.security.keyvault.certificates.models.KeyVaultCertificateWithPolicy; 
 
 CertificateClient certificateClient = new CertificateClientBuilder()
-        .vaultUrl(<your-vault-url>)
-        .credential(new DefaultAzureCredentialBuilder().build())
-        .buildClient();
+    .vaultUrl(<your-key-vault-url>)
+    .credential(new DefaultAzureCredentialBuilder().build())
+    .buildClient();
 
-SyncPoller<CertificateOperation, KeyVaultCertificateWithPolicy> certificatePoller = certificateClient
-    .beginCreateCertificate("certificateName", CertificatePolicy.getDefault());
+SyncPoller<CertificateOperation, KeyVaultCertificateWithPolicy> certificatePoller =
+    certificateClient.beginCreateCertificate("certificateName", CertificatePolicy.getDefault());
 certificatePoller.waitUntil(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED);
 KeyVaultCertificate certificate = certificatePoller.getFinalResult();
-System.out.printf("Certificate created with name %s", certificate.getName());
+System.out.printf("Certificate created with name \"%s\"\n", certificate.getName());
 ```
 
-### Retrieve a Certificate
-
-Retrieve a previously stored Certificate by calling `getCertificate` or `getCertificateVersion`.
+### Retrieve a certificate
+Retrieve a previously stored certificate by calling `getCertificate` or `getCertificateVersion`.
 
 ```Java
-KeyVaultCertificateWithPolicy certificate = certificateClient.getCertificate("certificateName");
-System.out.printf("Recevied certificate with name %s and version %s and secret id",
-    certificate.getProperties().getName(),
-    certificate.getProperties().getVersion(), certificate.getSecretId());
+KeyVaultCertificateWithPolicy certificate = certificateClient.getCertificate("<certificate-name>");
+System.out.printf("Recevied certificate with name \"%s\", version %s and secret id %s\n",
+    certificate.getProperties().getName(), certificate.getProperties().getVersion(), certificate.getSecretId());
 ```
 
-### Update an existing Certificate
-
-Update an existing Certificate by calling `updateCertificateProperties`.
+### Update an existing certificate
+Update an existing certificate by calling `updateCertificateProperties`.
 
 ```Java
 // Get the certificate to update.
-KeyVaultCertificate certificate = certificateClient.getCertificate("certificateName");
-// Update certificate enabled status
+KeyVaultCertificate certificate = certificateClient.getCertificate("<certificate-name>");
+// Update certificate enabled status.
 certificate.getProperties().setEnabled(false);
 KeyVaultCertificate updatedCertificate = certificateClient.updateCertificateProperties(certificate.getProperties());
-System.out.printf("Updated Certificate with name %s and enabled status %s",
+System.out.printf("Updated certificate with name \"%s\" and enabled status \"%s\"\n",
     updatedCertificate.getProperties().getName(), updatedCertificate.getProperties().isEnabled());
 ```
 
-### Delete a Certificate
-
-Delete an existing Certificate by calling `beginDeleteCertificate`.
+### Delete a certificate
+Delete an existing certificate by calling `beginDeleteCertificate`.
 
 ```Java
 SyncPoller<DeletedCertificate, Void> deleteCertificatePoller =
-    certificateClient.beginDeleteCertificate("certificateName");
-// Deleted Certificate is accessible as soon as polling beings.
+    certificateClient.beginDeleteCertificate("<certificate-name>");
+// Deleted certificate is accessible as soon as polling beings.
 PollResponse<DeletedCertificate> pollResponse = deleteCertificatePoller.poll();
-System.out.printf("Deleted certitifcate with name %s and recovery id %s", pollResponse.getValue().getName(),
+System.out.printf("Deleted certificate with name \"%s\" and recovery id %s", pollResponse.getValue().getName(),
     pollResponse.getValue().getRecoveryId());
 deleteCertificatePoller.waitForCompletion();
 ```
 
-### List Certificates
-
+### List certificates
 List the certificates in the key vault by calling `listPropertiesOfCertificates`.
 
 ```java
-// List operations don't return the certificates with their full information. So, for each returned certificate we call getCertificate to get the certificate with all its properties excluding the policy.
+// List operations don't return the certificates with their full information. So, for each returned certificate we call
+// getCertificate to get the certificate with all its properties excluding the policy.
 for (CertificateProperties certificateProperties : certificateClient.listPropertiesOfCertificates()) {
-    KeyVaultCertificate certificateWithAllProperties = certificateClient.getCertificateVersion(certificateProperties.getName(), certificateProperties.getVersion());
-    System.out.printf("Received certificate with name %s and secret id %s",
+    KeyVaultCertificate certificateWithAllProperties =
+        certificateClient.getCertificateVersion(certificateProperties.getName(), certificateProperties.getVersion());
+    System.out.printf("Received certificate with name \"%s\" and secret id %s",
         certificateWithAllProperties.getProperties().getName(), certificateWithAllProperties.getSecretId());
 }
 ```
 
 ### Async API
-The following sections provide several code snippets covering some of the most common asynchronous Azure Key Vault Key Service tasks, including:
-- [Create a Certificate Asynchronously](#create-a-certificate-asynchronously)
-- [Retrieve a Certificate Asynchronously](#retrieve-a-certificate-asynchronously)
-- [Update an existing Certificate Asynchronously](#update-an-existing-certificate-asynchronously)
-- [Delete a Certficate Asynchronously](#delete-a-certificate-asynchronously)
-- [List Certificates Asynchronously](#list-certificates-asynchronously)
-
-> Note : You should add "System.in.read()" or "Thread.Sleep()" after the function calls in the main class/thread to allow Async functions/operations to execute and finish before the main application/thread exits.
+The following sections provide several code snippets covering some of the most common asynchronous Azure Key Vault Certificate service tasks, including:
+- [Create a certificate asynchronously](#create-a-certificate-asynchronously)
+- [Retrieve a certificate asynchronously](#retrieve-a-certificate-asynchronously)
+- [Update an existing certificate asynchronously](#update-an-existing-certificate-asynchronously)
+- [Delete a certificate asynchronously](#delete-a-certificate-asynchronously)
+- [List certificates asynchronously](#list-certificates-asynchronously)
 
-### Create a Certificate Asynchronously
+> Note : You should add `System.in.read()` or `Thread.sleep()` after the function calls in the main class/thread to allow async functions/operations to execute and finish before the main application/thread exits.
 
-Create a Certificate to be stored in the Azure Key Vault.
-- `beginCreateCertificate` creates a new certificate in the key vault. if the certificate with name already exists then a new version of the certificate is created.
+### Create a certificate asynchronously
+Create a certificate to be stored in the Azure Key Vault.
+- `beginCreateCertificate` creates a new certificate in the Azure Key Vault. If a certificate with same name already exists then a new version of the certificate is created.
 
 ```Java
 import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.security.keyvault.certificates.models.Certificate;
-import com.azure.security.keyvault.certificates.models.CertificatePolicy;
-import com.azure.security.keyvault.certificates.models.CertificateOperation;
 import com.azure.security.keyvault.certificates.CertificateAsyncClient;
+import com.azure.security.keyvault.certificates.models.CertificatePolicy; 
 
-//Creates a certificate using the default policy and polls on its progress.
-certificateAsyncClient.beginCreateCertificate("certificateName", CertificatePolicy.getDefault())
+// Creates a certificate using the default policy and polls on its progress.
+certificateAsyncClient.beginCreateCertificate("<certificate-name>", CertificatePolicy.getDefault())
     .subscribe(pollResponse -> {
         System.out.println("---------------------------------------------------------------------------------");
         System.out.println(pollResponse.getStatus());
@@ -223,85 +219,79 @@ certificateAsyncClient.beginCreateCertificate("certificateName", CertificatePoli
     });
 ```
 
-### Retrieve a Certificate Asynchronously
-
-Retrieve a previously stored Certificate by calling `getCertificate` or `getCertificateVersion`.
+### Retrieve a certificate asynchronously
+Retrieve a previously stored certificate by calling `getCertificate` or `getCertificateVersion`.
 
 ```Java
-certificateAsyncClient.getCertificate("certificateName")
+certificateAsyncClient.getCertificate("<certificate-name>")
     .subscribe(certificateResponse ->
-        System.out.printf("Certificate is returned with name %s and secretId %s %n",
+        System.out.printf("Certificate was returned with name \"%s\" and secretId %s\n",
             certificateResponse.getProperties().getName(), certificateResponse.getSecretId()));
 ```
 
-### Update an existing Certificate Asynchronously
-
-Update an existing Certificate by calling `updateCertificateProperties`.
+### Update an existing certificate asynchronously
+Update an existing certificate by calling `updateCertificateProperties`.
 
 ```Java
-certificateAsyncClient.getCertificate("certificateName")
+certificateAsyncClient.getCertificate("<certificate-name>")
     .subscribe(certificateResponseValue -> {
         KeyVaultCertificate certificate = certificateResponseValue;
-        //Update enabled status of the certificate
+        // Update enabled status of the certificate.
         certificate.getProperties().setEnabled(false);
         certificateAsyncClient.updateCertificateProperties(certificate.getProperties())
             .subscribe(certificateResponse ->
-                System.out.printf("Certificate's enabled status %s %n",
+                System.out.printf("Certificate's enabled status %s\n",
                     certificateResponse.getProperties().isEnabled().toString()));
     });
 ```
 
-### Delete a Certificate Asynchronously
-
-Delete an existing Certificate by calling `beginDeleteCertificate`.
+### Delete a certificate asynchronously
+Delete an existing certificate by calling `beginDeleteCertificate`.
 
 ```java
-certificateAsyncClient.beginDeleteCertificate("certificateName")
+certificateAsyncClient.beginDeleteCertificate("<certificate-name>")
     .subscribe(pollResponse -> {
-        System.out.println("Delete Status: " + pollResponse.getStatus().toString());
-        System.out.println("Delete Certificate Name: " + pollResponse.getValue().getName());
-        System.out.println("Certificate Delete Date: " + pollResponse.getValue().getDeletedOn().toString());
+        System.out.printf("Deletion status: %s\n", pollResponse.getStatus().toString());
+        System.out.printf("Deleted certificate name: %s\n", pollResponse.getValue().getName());
+        System.out.printf("Certificate deletion date: %s\n", pollResponse.getValue().getDeletedOn().toString());
     });
 ```
 
-### List Certificates Asynchronously
-
-List the certificates in the key vault by calling `listPropertiesOfCertificates`.
+### List certificates asynchronously
+List the certificates in the Key Vault by calling `listPropertiesOfCertificates`.
 
 ```Java
-// The List Certificates operation returns certificates without their full properties, so for each certificate returned we call `getCertificate` to get all its attributes excluding the policy.
+// The List Certificates operation returns certificates without their full properties, so for each certificate returned
+// we call `getCertificate` to get all its attributes excluding the policy.
 certificateAsyncClient.listPropertiesOfCertificates()
-    .subscribe(certificateProperties -> certificateAsyncClient.getCertificate(certificateProperties.getName(),
-     certificateProperties.getVersion());
-        .subscribe(certificateResponse -> System.out.printf("Received certificate with name %s and key id %s",
-            certificateResponse.getName(), certificateResponse.getKeyId())));
+    .subscribe(certificateProperties ->
+        certificateAsyncClient.getCertificateVersion(certificateProperties.getName(),
+            certificateProperties.getVersion());
+        .subscribe(certificateResponse ->
+            System.out.printf("Received certificate with name \"%s\" and key id %s",
+                certificateResponse.getName(), certificateResponse.getKeyId())));
 ```
 
 ## Troubleshooting
 ### General
-Certificate Vault clients raise exceptions. For example, if you try to retrieve a certificate after it is deleted a `404` error is returned, indicating resource not found. In the following snippet, the error is handled gracefully by catching the exception and displaying additional information about the error.
+Azure Key Vault Certificate clients raise exceptions. For example, if you try to retrieve a certificate after it is deleted a `404` error is returned, indicating the resource was not found. In the following snippet, the error is handled gracefully by catching the exception and displaying additional information about the error.
 
 ```java
 try {
-    certificateClient.getCertificate("certificateName")
+    certificateClient.getCertificate("<certificate-name>")
 } catch (ResourceNotFoundException e) {
     System.out.println(e.getMessage());
 }
 ```
 
-### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
-the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
-[HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
+### Default HTTP client
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
-reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL operations. The Boring SSL library is an Uber JAR containing native libraries for Linux / macOS / Windows, and provides better performance compared to the default SSL implementation within the JDK. For more information, including how to reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
-Several KeyVault Java SDK samples are available to you in the SDK's GitHub repository. These samples provide example code for additional scenarios commonly encountered while working with Key Vault:
+Several Key Vault Java SDK samples are available to you in the SDK's GitHub repository. These samples provide example code for additional scenarios commonly encountered while working with Key Vault.
 
 ## Next steps Samples
 Samples are explained in detail [here][samples_readme].
@@ -314,10 +304,10 @@ This project welcomes contributions and suggestions. Most contributions require
 
 When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
 
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the Code of Conduct FAQ or contact <opencode@microsoft.com> with any additional questions or comments.
 
 <!-- LINKS -->
-[source_code]:  src
+[source_code]: src
 [api_documentation]: https://azure.github.io/azure-sdk-for-java
 [azkeyvault_docs]: https://docs.microsoft.com/azure/key-vault/
 [azure_identity]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity
@@ -327,9 +317,9 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 [azure_cli]: https://docs.microsoft.com/cli/azure
 [rest_api]: https://docs.microsoft.com/rest/api/keyvault/
 [azkeyvault_rest]: https://docs.microsoft.com/rest/api/keyvault/
-[azure_create_application_in_portal]:https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
-[azure_keyvault_cli]:https://docs.microsoft.com/azure/key-vault/quick-create-cli
-[azure_keyvault_cli_full]:https://docs.microsoft.com/cli/azure/keyvault?view=azure-cli-latest
+[azure_create_application_in_portal]: https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+[azure_keyvault_cli]: https://docs.microsoft.com/azure/key-vault/quick-create-cli
+[azure_keyvault_cli_full]: https://docs.microsoft.com/cli/azure/keyvault?view=azure-cli-latest
 [certificates_samples]: src/samples/java/com/azure/security/keyvault/certificates
 [samples_readme]: src/samples/README.md
 [performance_tuning]: https://github.com/Azure/azure-sdk-for-java/wiki/Performance-Tuning
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/samples/java/com/azure/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java b/sdk/keyvault/azure-security-keyvault-certificates/src/samples/java/com/azure/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java
index 409540d0cc74..9d10fc7ab2ac 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/samples/java/com/azure/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/samples/java/com/azure/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java
@@ -58,7 +58,7 @@ private CertificateClient getCertificateClient() {
     /**
      * Method to insert code snippets for {@link CertificateClient#getCertificatePolicy(String)}
      */
-    public void getCertiificatePolicyCodeSnippets() {
+    public void getCertificatePolicyCodeSnippets() {
         CertificateClient certificateClient = getCertificateClient();
         // BEGIN: com.azure.security.keyvault.certificates.CertificateClient.getCertificatePolicy#string
         CertificatePolicy policy = certificateClient.getCertificatePolicy("certificateName");

From d68e464eee6119a3c262d227c5be4d8016c882dc Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Wed, 6 May 2020 13:43:49 -0700
Subject: [PATCH 09/41] fix ci.data.yml (#10838)

---
 sdk/servicebus/ci.data.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/servicebus/ci.data.yml b/sdk/servicebus/ci.data.yml
index 61fcc14fb32a..414170a5ab3b 100644
--- a/sdk/servicebus/ci.data.yml
+++ b/sdk/servicebus/ci.data.yml
@@ -24,7 +24,7 @@ trigger:
       - sdk/servicebus/mgmt-v2015_08_01
       - sdk/servicebus/mgmt-v2017_04_01
       - sdk/servicebus/mgmt-v2018_01_01_preview
-      - sdk/servicebus/azure-servicebus
+      - sdk/servicebus/azure-messaging-servicebus
 
 pr:
   branches:
@@ -40,7 +40,7 @@ pr:
       - sdk/servicebus/mgmt-v2015_08_01
       - sdk/servicebus/mgmt-v2017_04_01
       - sdk/servicebus/mgmt-v2018_01_01_preview
-      - sdk/servicebus/azure-servicebus
+      - sdk/servicebus/azure-messaging-servicebus
 
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-data.yml

From 5343a15a44927cc01e873af433211ee7d526c370 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Wed, 6 May 2020 13:49:04 -0700
Subject: [PATCH 10/41] Rev Identity dependency versions May 2020 (#10843)

---
 eng/versioning/version_client.txt                               | 2 +-
 sdk/appconfiguration/azure-data-appconfiguration/pom.xml        | 2 +-
 .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml      | 2 +-
 sdk/eventhubs/azure-messaging-eventhubs/pom.xml                 | 2 +-
 sdk/keyvault/azure-security-keyvault-certificates/pom.xml       | 2 +-
 sdk/keyvault/azure-security-keyvault-keys/pom.xml               | 2 +-
 sdk/keyvault/azure-security-keyvault-secrets/pom.xml            | 2 +-
 sdk/servicebus/azure-messaging-servicebus/pom.xml               | 2 +-
 sdk/storage/azure-storage-blob-batch/pom.xml                    | 2 +-
 sdk/storage/azure-storage-blob-cryptography/pom.xml             | 2 +-
 sdk/storage/azure-storage-blob/pom.xml                          | 2 +-
 sdk/storage/azure-storage-common/pom.xml                        | 2 +-
 sdk/storage/azure-storage-file-datalake/pom.xml                 | 2 +-
 sdk/storage/azure-storage-queue/pom.xml                         | 2 +-
 sdk/textanalytics/azure-ai-textanalytics/pom.xml                | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index c869e229bcb6..e3e4ae8739e5 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -21,7 +21,7 @@ com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-data-appconfiguration;1.1.1;1.2.0-beta.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-identity;1.0.5;1.1.0-beta.4
+com.azure:azure-identity;1.0.6;1.1.0-beta.4
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-eventhubs;5.0.3;5.1.0-beta.1
 com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0-beta.1
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
index bc2c323cb329..1deabb0ad5e0 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
+++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
index 85d83804b2a0..bc9a6037cadd 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
index 877f8f709b84..da04f32024ba 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
index 02fc0b63cb24..adafcf04d5b2 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml
index e552653bf0ca..a573b32935b0 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
index efb56d759c55..edeffd75dd28 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml
index 57900c62ad2f..1b8a9bf2a600 100644
--- a/sdk/servicebus/azure-messaging-servicebus/pom.xml
+++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
index d90b29083b65..e80178d7c1ae 100644
--- a/sdk/storage/azure-storage-blob-batch/pom.xml
+++ b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
index 9f75e13b4b99..f4473f0dae79 100644
--- a/sdk/storage/azure-storage-blob-cryptography/pom.xml
+++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index 59199a9bce2a..c33b755bf64a 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index 4a96e0e09c32..1c4af2c4ca93 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml
index f460941177e2..53df8a8520b0 100644
--- a/sdk/storage/azure-storage-file-datalake/pom.xml
+++ b/sdk/storage/azure-storage-file-datalake/pom.xml
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index 74d1f1dc3502..ae396fd64781 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml
index 87482cfe8ceb..d0a4f7fd7277 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml
+++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.5</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.0.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

From a937ee19a5d6a8e087d4929d748a8586c9b0a0d3 Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Wed, 6 May 2020 14:22:16 -0700
Subject: [PATCH 11/41] move smoke-tests.yml to enable notifications (#10794)

---
 {eng/pipelines => common/smoke-tests}/smoke-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename {eng/pipelines => common/smoke-tests}/smoke-test.yml (98%)

diff --git a/eng/pipelines/smoke-test.yml b/common/smoke-tests/smoke-test.yml
similarity index 98%
rename from eng/pipelines/smoke-test.yml
rename to common/smoke-tests/smoke-test.yml
index ddb290c7fd7c..87ce42b7267b 100644
--- a/eng/pipelines/smoke-test.yml
+++ b/common/smoke-tests/smoke-test.yml
@@ -1,5 +1,5 @@
 variables:
-  - template: ./templates/variables/globals.yml
+  - template: /eng/pipelines/templates/variables/globals.yml
   - name: PomFile
     value: common/smoke-tests/pom.xml
 

From f8ff23b020f0aeb40e1c7be0de8d4925d60744ad Mon Sep 17 00:00:00 2001
From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com>
Date: Wed, 6 May 2020 14:56:24 -0700
Subject: [PATCH 12/41] Prepare Azure Storage for May 2020 release (#10841)

---
 eng/jacoco-test-coverage/pom.xml              | 14 ++++-----
 eng/versioning/version_client.txt             | 14 ++++-----
 .../azure-storage-blob-batch/CHANGELOG.md     |  4 +--
 .../azure-storage-blob-batch/README.md        | 12 ++++----
 sdk/storage/azure-storage-blob-batch/pom.xml  |  4 +--
 .../CHANGELOG.md                              |  8 ++---
 .../azure-storage-blob-cryptography/README.md | 12 ++++----
 .../azure-storage-blob-cryptography/pom.xml   |  4 +--
 sdk/storage/azure-storage-blob-nio/pom.xml    |  2 +-
 sdk/storage/azure-storage-blob/CHANGELOG.md   | 16 +++++-----
 sdk/storage/azure-storage-blob/README.md      | 10 +++----
 sdk/storage/azure-storage-blob/pom.xml        |  4 +--
 sdk/storage/azure-storage-common/CHANGELOG.md | 10 +++----
 sdk/storage/azure-storage-common/README.md    | 12 ++++----
 sdk/storage/azure-storage-common/pom.xml      |  2 +-
 .../azure-storage-file-datalake/CHANGELOG.md  | 29 ++++++++++---------
 .../azure-storage-file-datalake/README.md     | 20 ++++++-------
 .../azure-storage-file-datalake/pom.xml       |  4 +--
 .../azure-storage-file-share/CHANGELOG.md     | 10 +++----
 .../azure-storage-file-share/README.md        | 10 +++----
 sdk/storage/azure-storage-file-share/pom.xml  |  4 +--
 sdk/storage/azure-storage-perf/pom.xml        |  2 +-
 sdk/storage/azure-storage-queue/CHANGELOG.md  |  8 ++---
 sdk/storage/azure-storage-queue/README.md     | 10 +++----
 sdk/storage/azure-storage-queue/pom.xml       |  4 +--
 25 files changed, 115 insertions(+), 114 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 65267347a381..d5d83fe3967a 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -134,22 +134,22 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-batch</artifactId>
-      <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+      <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-cryptography</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
     </dependency>
     <!-- Uncomment this when blob-nio is added to sdk/storage/pom.service.xml -->
     <!--    <dependency>-->
@@ -160,17 +160,17 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-share</artifactId>
-      <version>12.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
+      <version>12.4.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-datalake</artifactId>
-      <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
+      <version>12.1.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-queue</artifactId>
-      <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
+      <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index e3e4ae8739e5..4c852817afd5 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -31,15 +31,15 @@ com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
 com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4
 com.azure:azure-security-keyvault-secrets;4.2.0-beta.2;4.2.0-beta.3
 com.azure:azure-sdk-template;1.0.4-beta.12;1.0.4-beta.13
-com.azure:azure-storage-blob;12.6.0;12.7.0-beta.1
-com.azure:azure-storage-blob-batch;12.5.0;12.6.0-beta.1
-com.azure:azure-storage-blob-cryptography;12.6.0;12.7.0-beta.1
+com.azure:azure-storage-blob;12.6.0;12.6.1
+com.azure:azure-storage-blob-batch;12.5.0;12.5.1
+com.azure:azure-storage-blob-cryptography;12.6.0;12.6.1
 com.azure:azure-storage-blob-nio;12.0.0-beta.1;12.0.0-beta.1
-com.azure:azure-storage-common;12.6.0;12.7.0-beta.1
-com.azure:azure-storage-file-share;12.4.0;12.5.0-beta.1
-com.azure:azure-storage-file-datalake;12.1.0;12.2.0-beta.1
+com.azure:azure-storage-common;12.6.0;12.6.1
+com.azure:azure-storage-file-share;12.4.0;12.4.1
+com.azure:azure-storage-file-datalake;12.1.0;12.1.1
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-queue;12.5.0;12.6.0-beta.1
+com.azure:azure-storage-queue;12.5.0;12.5.1
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 
diff --git a/sdk/storage/azure-storage-blob-batch/CHANGELOG.md b/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
index 3c344b210b61..f1034389e694 100644
--- a/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 12.6.0-beta.1 (Unreleased)
-
+## 12.5.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.5.0 (2020-04-06)
 - Fixed a bug where the Date header wouldn't be updated with a new value on request retry.
diff --git a/sdk/storage/azure-storage-blob-batch/README.md b/sdk/storage/azure-storage-blob-batch/README.md
index 0546a2aa9d05..80135f59a028 100644
--- a/sdk/storage/azure-storage-blob-batch/README.md
+++ b/sdk/storage/azure-storage-blob-batch/README.md
@@ -22,7 +22,7 @@ definition, such as text or binary data.
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-batch</artifactId>
-  <version>12.5.0</version>
+  <version>12.5.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -112,7 +112,7 @@ System.out.printf("Deleting blob with lease completed with status code %d%n",
     deleteWithLeaseResponse.getStatusCode());
 ```
 
-Setting `AccessTier` on blobs in batch that have different pre-requisites. 
+Setting `AccessTier` on blobs in batch that have different pre-requisites.
 
 <!-- embedme ./src/samples/java/com/azure/storage/blob/batch/ReadmeSamples.java#L81-L97 -->
 ```java
@@ -142,14 +142,14 @@ status codes returned for [REST API][error_codes] requests. For example, if you
 doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
index e80178d7c1ae..3c3125147a2d 100644
--- a/sdk/storage/azure-storage-blob-batch/pom.xml
+++ b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-batch</artifactId>
-  <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+  <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
 
   <name>Microsoft Azure client library for Blob Storage batching</name>
   <description>This module contains client library for Microsoft Azure Blob Storage batching.</description>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md b/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
index 690a4db578b8..4c3954236e88 100644
--- a/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 12.7.0-beta.1 (Unreleased)
-
+## 12.6.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.6.0 (2020-04-06)
 - It is now possible to specify a key/keyResolver after they specify a pipeline/client on the builder.
@@ -12,7 +12,7 @@
 - Fixed a bug where the EncryptedBlockClientBuilder.pipeline method would not allow the client to support decryption.
 - Added support for specifying a customer provided key.
 - Fixed a bug that would cause EncryptedBlobClient.upload(InputStream, long) to not encrypt the data.
-- Changed getAppendBlobClient, getBlockBlobClient, and getPageBlobClient on EncryptedBlobClient to throw as working with such clients is not supported. 
+- Changed getAppendBlobClient, getBlockBlobClient, and getPageBlobClient on EncryptedBlobClient to throw as working with such clients is not supported.
 
 ## 12.4.0 (2020-02-12)
 - Added support for upload via OutputStream by adding EncryptedBlobClient.getOutputStream methods
@@ -54,4 +54,4 @@ and
 ### Features included in `azure-storage-blob-cryptography`
 - This package supports client side encryption for blob storage.
 - Reactive streams support using [Project Reactor](https://projectreactor.io/).
-  
+
diff --git a/sdk/storage/azure-storage-blob-cryptography/README.md b/sdk/storage/azure-storage-blob-cryptography/README.md
index adfdc5ba6b89..192d90c424bb 100644
--- a/sdk/storage/azure-storage-blob-cryptography/README.md
+++ b/sdk/storage/azure-storage-blob-cryptography/README.md
@@ -4,7 +4,7 @@ Azure Blob storage is Microsoft's object storage solution for the cloud. Blob
 storage is optimized for storing massive amounts of unstructured data.
 Unstructured data is data that does not adhere to a particular data model or
 definition, such as text or binary data.
-This package supports client side encryption for blob storage. 
+This package supports client side encryption for blob storage.
 
 ## Getting started
 
@@ -21,7 +21,7 @@ This package supports client side encryption for blob storage.
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-cryptography</artifactId>
-  <version>12.6.0</version>
+  <version>12.6.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -109,14 +109,14 @@ status codes returned for [REST API][error_codes] requests. For example, if you
 doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
index f4473f0dae79..32d0af33d2e2 100644
--- a/sdk/storage/azure-storage-blob-cryptography/pom.xml
+++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-cryptography</artifactId>
-  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
+  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
 
   <name>Microsoft Azure client library for Blob Storage cryptography</name>
   <description>This module contains client library for Microsoft Azure Blob Storage cryptography.</description>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml
index c4a6163495a5..6acf574c3e6f 100644
--- a/sdk/storage/azure-storage-blob-nio/pom.xml
+++ b/sdk/storage/azure-storage-blob-nio/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
index b32f5ee6c43d..629406a3ed9b 100644
--- a/sdk/storage/azure-storage-blob/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 12.7.0-beta.1 (Unreleased)
-
+## 12.6.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.6.0 (2020-04-06)
 - Fixed a bug that would prevent client initialization against Azurite in some containerized environments.
@@ -16,11 +16,11 @@
 - Fixed a bug in ReliableDownload that would cause multiple subscriber errors.
 - Added logic to ReliableDownload to retry on TimeoutException
 - Added default timeout to download stream to timeout if a certain amount of time passes without seeing any data.
-- Fixed a bug that would cause IOExceptions to be swallowed in BlobClient.upload(InputStream, long) 
+- Fixed a bug that would cause IOExceptions to be swallowed in BlobClient.upload(InputStream, long)
 
 ## 12.4.0 (2020-02-12)
 - Added ability to access BlobProperties from BlobInputStream.
-- Modified downloadToFile to populate BlobProperties.blobSize to be the actual blob size instead of the content length of the first range. 
+- Modified downloadToFile to populate BlobProperties.blobSize to be the actual blob size instead of the content length of the first range.
 - Added upload methods on BlobClient to upload from an InputStream.
 
 - Added support for the 2019-07-07 service version.
@@ -86,11 +86,11 @@ and
 - Replaced URL parameters with String on appendBlockFromUrl, beginCopy, copyFromUrl, stageBlockFromUrl, uploadPagesFromUrl, and copyIncremental
 - Added support for emulator endpoints
 - Added support for additional connection string configurations and support for use development connection
-- Changed constructors for AppendBlobItem, BlockBlobItem, PageBlobItem, 
+- Changed constructors for AppendBlobItem, BlockBlobItem, PageBlobItem,
 - Renamed listBlobsFlat to listBlobs and listBlobHierarchy to listBlobsByHierarchy
 - Replaced startCopyFromUrl with beginCopy and return poller
 - Renamed BlobContainerSasPermission and BlobSasPermission getters to use has prefix
-- Replaced BlobAccessConditions, AppendBlobAccessConditions, and PageBlobAccessConditions with BlobRequestConditions, AppendBlobRequestConditions, and PageBlobRequestConditions. 
+- Replaced BlobAccessConditions, AppendBlobAccessConditions, and PageBlobAccessConditions with BlobRequestConditions, AppendBlobRequestConditions, and PageBlobRequestConditions.
 - Removed ModifiedAccessConditions and SourceModifiedAccessConditions in favor of RequestConditions, removed BlobContainerAccessConditions in favor of BlobRequestConditions.
 - Removed AppendPositionAccessConditions, LeaseAccessConditions, and SequenceNumberAccessConditions
 - Renamed LeaseClient, LeaseAsyncClient, and LeaseClientBuilder to BlobLeaseClient, BlobLeaseAsyncClient, and BlobLeaseClientBuilder
@@ -118,12 +118,12 @@ and
 - Added `LeaseClient` and `LeaseAsyncClient` to the specialized package and removed the leasing methods from `BlobClient`, `BlobAsyncClient`, `ContainerClient`, and `ContainerAsyncClient`.
 - Added `blocksize` parameter to sync `blockBlobClient`.
 - Use Primitives for `exist` API return type.
-- Removed a `create` and `appendBlockFromUrl` overload API in `AppendBlob`. 
+- Removed a `create` and `appendBlockFromUrl` overload API in `AppendBlob`.
 - Fixed `create` method name in PageBlob.
 - Renamed `setTier` to `setAccessTier` from `BlobAsyncClientBase` and `BlobClientBase` classes.
 - Added `ParallelTransferOptions` to buffered upload, upload from file and download to file methods.
 - Removed `Metadata` class and uses Map<String, String> for `matadata` field of `BlobProperties` and `ContainerProperties`.
-- Removed SAS token generation APIs from clients, use BlobServiceSasSignatureValues to generate SAS tokens. 
+- Removed SAS token generation APIs from clients, use BlobServiceSasSignatureValues to generate SAS tokens.
 - Removed `SASTokenCredential`, `SASTokenCredentialPolicy` and the corresponding `credential(SASTokenCredential)` method in client builder, and added sasToken(String) instead.
 
 ## 12.0.0-preview.3 (2019-09-10)
diff --git a/sdk/storage/azure-storage-blob/README.md b/sdk/storage/azure-storage-blob/README.md
index 1460d5147865..acf04271cd02 100644
--- a/sdk/storage/azure-storage-blob/README.md
+++ b/sdk/storage/azure-storage-blob/README.md
@@ -22,7 +22,7 @@ definition, such as text or binary data.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-storage-blob</artifactId>
-    <version>12.6.0</version>
+    <version>12.6.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -326,14 +326,14 @@ status codes returned for [REST API][error_codes] requests. For example, if you
 doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index c33b755bf64a..28d07c8607b7 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob</artifactId>
-  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
 
   <name>Microsoft Azure client library for Blob Storage</name>
   <description>This module contains client library for Microsoft Azure Blob Storage.</description>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
index 953f42749991..3ad95c8ce8a3 100644
--- a/sdk/storage/azure-storage-common/CHANGELOG.md
+++ b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -1,11 +1,11 @@
 # Release History
 
-## 12.7.0-beta.1 (Unreleased)
-
+## 12.6.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.6.0 (2020-04-06)
-- Added a constant for the directory metadata marker. 
-- Fixed bug where x-ms headers were not being word-sorted. 
+- Added a constant for the directory metadata marker.
+- Fixed bug where x-ms headers were not being word-sorted.
 
 ## 12.5.0 (2020-03-11)
 - Added types that enabled buffered upload in datalake.
@@ -39,4 +39,4 @@
 ### Features included in `azure-storage-blob-cryptography`
 - This package supports common functionality needed for blob storage.
 - Reactive streams support using [Project Reactor](https://projectreactor.io/).
-  
+
diff --git a/sdk/storage/azure-storage-common/README.md b/sdk/storage/azure-storage-common/README.md
index 46bbdae0111b..a14826576b1b 100644
--- a/sdk/storage/azure-storage-common/README.md
+++ b/sdk/storage/azure-storage-common/README.md
@@ -1,7 +1,7 @@
 # Azure Storage Common shared library for Java
 Azure Storage Common is a library that has common dependencies for all Azure Storage packages.
 
-[Source code][source] | [API reference documentation][docs] 
+[Source code][source] | [API reference documentation][docs]
 
 ## Getting started
 
@@ -18,7 +18,7 @@ Azure Storage Common is a library that has common dependencies for all Azure Sto
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-storage-common</artifactId>
-    <version>12.6.0</version>
+    <version>12.6.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -32,14 +32,14 @@ Azure Storage Common is a library that has common dependencies for all Azure Sto
 ## Troubleshooting
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index 1c4af2c4ca93..4ce74ff61b99 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-common</artifactId>
-  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
 
   <name>Microsoft Azure common module for Storage</name>
   <description>This module contains common code based for all Microsoft Azure Storage client libraries.</description>
diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
index c5ee20edc5c3..475d47067916 100644
--- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
@@ -1,18 +1,19 @@
 # Release History
 
-## 12.2.0-beta.1 (Unreleased)
+## 12.1.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 
 ## 12.1.0 (2020-04-06)
 - Fixed a NPE caused due to deserializing a non existent lastModifiedTime.
-- Added an isDirectory property to PathProperties. 
-- Fixed DataLakeFileSystemClient.createFile/createDirectory, DataLakeDirectoryClient.createFile/createSubdirectory to not overwrite by default 
+- Added an isDirectory property to PathProperties.
+- Fixed DataLakeFileSystemClient.createFile/createDirectory, DataLakeDirectoryClient.createFile/createSubdirectory to not overwrite by default
 - Added overloads to DataLakeFileSystemClient.createFile/createDirectory, DataLakeDirectoryClient.createFile/createSubdirectory to allow overwrite behavior.
 - Fixed a bug where the Date header wouldn't be updated with a new value on request retry.
 - Fixed a bug where rename would not work with Url encoded destinations.
 
 ## 12.0.1 (2020-03-11)
-- GA release. 
+- GA release.
 - Fixed bug that caused rename to fail on paths that are url encoded.
 - Mapped StorageErrorException and BlobStorageException to DataLakeStorageException on DataLakeServiceClient.listFileSystems
 - Removed DataLakeFileSystem.getRootDirectory methods to get the root directory in a file system.
@@ -44,13 +45,13 @@ and
 - Added SAS generation methods on clients to improve discoverability and convenience of sas.
 - Mapped StorageErrorException and BlobStorageException to DataLakeStorageException.
 - Added support for exists method on FileClients and DirectoryClients
-- Added support for no overwrite by default on min create method on FileClients and DirectoryClients and flush method on FileClients 
+- Added support for no overwrite by default on min create method on FileClients and DirectoryClients and flush method on FileClients
 
 ## 12.0.0-beta.7 (2019-12-04)
-This package's 
-[documentation](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/storage/azure-storage-file-datalake/README.md) 
-and 
-[samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage/azure-storage-file-datalake/src/samples/java/com/azure/storage/file/datalake) 
+This package's
+[documentation](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/storage/azure-storage-file-datalake/README.md)
+and
+[samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage/azure-storage-file-datalake/src/samples/java/com/azure/storage/file/datalake)
 
 - Fixed bug in ClientBuilders that prevented OAuth from functioning.
 - Added a check in ClientBuilders to enforce HTTPS for bearer token authentication.
@@ -60,7 +61,7 @@ and
 - Renamed setters and getters in PathPermissions and RolePermissions to be more detailed.
 - Fixed camel-casing of the word SubDirectory.
 - Upgraded to version 1.1.0 of Azure Core.
-- Upgraded to version 12.1.0 of Azure Storage Blob. 
+- Upgraded to version 12.1.0 of Azure Storage Blob.
 
 ## 12.0.0-preview.5
 - Initial Release. Please see the README and wiki for information on the new design.
@@ -71,7 +72,7 @@ and
 - Support for DataLakeDirectoryClient: create, delete, rename, get properties, get access control, set metadata, set properties, set access control, create file, delete file, create sub-directory, delete sub-directory
 - Support for DataLakeFileClient: create, delete, rename, get properties, get access control, set metadata, set properties, set access control, append, flush, read
 
-This package's 
-[documentation](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/storage/azure-storage-file-datalake/README.md) 
-and 
-[samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage/azure-storage-file-datalake/src/samples/java/com/azure/storage/file/datalake) 
+This package's
+[documentation](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/storage/azure-storage-file-datalake/README.md)
+and
+[samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage/azure-storage-file-datalake/src/samples/java/com/azure/storage/file/datalake)
diff --git a/sdk/storage/azure-storage-file-datalake/README.md b/sdk/storage/azure-storage-file-datalake/README.md
index 3f67b34ea515..ffccc1d08c77 100644
--- a/sdk/storage/azure-storage-file-datalake/README.md
+++ b/sdk/storage/azure-storage-file-datalake/README.md
@@ -1,9 +1,9 @@
 # Azure File Data Lake client library for Java
 
-Azure Data Lake Storage is Microsoft's optimized storage solution for for big 
+Azure Data Lake Storage is Microsoft's optimized storage solution for for big
 data analytics workloads. A fundamental part of Data Lake Storage Gen2 is the
-addition of a hierarchical namespace to Blob storage. The hierarchical 
-namespace organizes objects/files into a hierarchy of directories for 
+addition of a hierarchical namespace to Blob storage. The hierarchical
+namespace organizes objects/files into a hierarchy of directories for
 efficient data access.
 
 [Source code][source] | [API reference documentation][docs] | [REST API documentation][rest_docs] | [Product documentation][product_docs] | [Samples][samples]
@@ -25,7 +25,7 @@ Add a dependency on Azure Storage File Datalake
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-storage-file-datalake</artifactId>
-    <version>12.1.0</version>
+    <version>12.1.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -128,7 +128,7 @@ Data Lake Storage Gen2 offers two types of resources:
 
 |ADLS Gen2                  | Blob       |
 | --------------------------| ---------- |
-|Filesystem                 | Container  | 
+|Filesystem                 | Container  |
 |Path (File or Directory)   | Blob       |
 
 Note: This client library does not support hierarchical namespace (HNS) disabled storage accounts.
@@ -381,19 +381,19 @@ status codes returned for [REST API][error_codes] requests. For example, if you
 doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
 
-Several Storage datalake  Java SDK samples are available to you in the SDK's GitHub repository. 
+Several Storage datalake  Java SDK samples are available to you in the SDK's GitHub repository.
 
 ## Contributing
 
diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml
index 53df8a8520b0..416c1bd482bd 100644
--- a/sdk/storage/azure-storage-file-datalake/pom.xml
+++ b/sdk/storage/azure-storage-file-datalake/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file-datalake</artifactId>
-  <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
+  <version>12.1.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
 
   <name>Microsoft Azure client library for File Storage Data Lake</name>
   <description>This module contains client library for Microsoft Azure File Storage Data Lake.</description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md
index 085ccd3a324b..8a05ae3a80ec 100644
--- a/sdk/storage/azure-storage-file-share/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 12.5.0-beta.1 (Unreleased)
-
+## 12.4.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.4.0 (2020-04-06)
 - Fixed an issue where whitespace would cause NtfsFileAttributes.toAttributes/fromAttributes to result in an error parsing the attributes.
@@ -42,7 +42,7 @@ and
 - GA release.
 - Changed return type for forceCloseHandle from void to CloseHandlesInfo.
 - Changed return type for forceCloseAllHandles from int to CloseHandlesInfo.
-- Upgraded to version 1.1.0 of Azure Core. 
+- Upgraded to version 1.1.0 of Azure Core.
 
 ## 12.0.0-preview.5 (2019-10-31)
 - Renamed FileReference to StorageFileItem
@@ -86,7 +86,7 @@ and
 - Fixed metadata does not allow capital letter issue. [`Bug 5295`](https://github.com/Azure/azure-sdk-for-java/issues/5295)
 - Updated the return type of `downloadToFile` API to `FileProperties` on sync API and `Mono<FileProperties>` on async API.
 - `getFileServiceUrl`, `getShareUrl`, `getDirectoryUrl`, `getFileUrl` API now returns URL with scheme, host, resource name and snapshot if any.
-- Removed SAS token generation APIs from clients, use FileServiceSasSignatureValues to generate SAS tokens. 
+- Removed SAS token generation APIs from clients, use FileServiceSasSignatureValues to generate SAS tokens.
 - Removed `SASTokenCredential`, `SASTokenCredentialPolicy` and the corresponding `credential(SASTokenCredential)` method in client builder, and added sasToken(String) instead.
 
 ## 12.0.0-preview.3 (2019-09-10)
@@ -132,7 +132,7 @@ demonstrate the new API.
 ### Features included in `azure-storage-file`
 - This is initial SDK release for storage file service.
 - Packages scoped by functionality
-    - `azure-storage-file` contains a `FileServiceClient`,  `FileServiceAsyncClient`, `ShareClient`, `ShareAsyncClient`, `DirectoryClient`, `DirectoryAsyncClient`, `FileClient` and `FileAsyncClient` for storage file operations. 
+    - `azure-storage-file` contains a `FileServiceClient`,  `FileServiceAsyncClient`, `ShareClient`, `ShareAsyncClient`, `DirectoryClient`, `DirectoryAsyncClient`, `FileClient` and `FileAsyncClient` for storage file operations.
 - Client instances are scoped to storage file service.
 - Reactive streams support using [Project Reactor](https://projectreactor.io/).
 
diff --git a/sdk/storage/azure-storage-file-share/README.md b/sdk/storage/azure-storage-file-share/README.md
index 346dfcc5e910..fceadb015cf2 100644
--- a/sdk/storage/azure-storage-file-share/README.md
+++ b/sdk/storage/azure-storage-file-share/README.md
@@ -24,7 +24,7 @@ Shares provide a way to organize sets of files and also can be mounted as an SMB
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file-share</artifactId>
-  <version>12.4.0</version>
+  <version>12.4.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -451,14 +451,14 @@ fileClient.setHttpHeaders(newFileSize, httpHeaders);
 When you interact with file using this Java client library, errors returned by the service correspond to the same HTTP status codes returned for [REST API][storage_file_rest] requests. For example, if you try to retrieve a share that doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml
index 6d0f0b4e80a4..5d491b91a3b6 100644
--- a/sdk/storage/azure-storage-file-share/pom.xml
+++ b/sdk/storage/azure-storage-file-share/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file-share</artifactId>
-  <version>12.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
+  <version>12.4.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
 
   <name>Microsoft Azure client library for File Share Storage</name>
   <description>This module contains client library for Microsoft Azure File Share Storage.</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-perf/pom.xml b/sdk/storage/azure-storage-perf/pom.xml
index d3b07acb68e2..8cefcf3ac31f 100644
--- a/sdk/storage/azure-storage-perf/pom.xml
+++ b/sdk/storage/azure-storage-perf/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-queue/CHANGELOG.md b/sdk/storage/azure-storage-queue/CHANGELOG.md
index 7aefe5475250..cbda4a9138ea 100644
--- a/sdk/storage/azure-storage-queue/CHANGELOG.md
+++ b/sdk/storage/azure-storage-queue/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 12.6.0-beta.1 (Unreleased)
-
+## 12.5.1 (2020-05-06)
+- Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
 ## 12.5.0 (2020-04-06)
 - Fixed a bug that would prevent client initialization against Azurite in some containerized environments.
@@ -64,7 +64,7 @@ and
 - Changed `VoidResponse` to `Response<Void>` on sync API, and `Mono<VoidResponse>` to `Mono<Response<Void>>` on async API.
 - Fixed metadata does not allow capital letter issue. [`Bug 5295`](https://github.com/Azure/azure-sdk-for-java/issues/5295)
 - `getQueueServiceUrl`, `getQueueUrl` API now returns URL with scheme, host, resource name and snapshot if any.
-- Removed SAS token generation APIs from clients, use QueueServiceSasSignatureValues to generate SAS tokens. 
+- Removed SAS token generation APIs from clients, use QueueServiceSasSignatureValues to generate SAS tokens.
 - Removed `SASTokenCredential`, `SASTokenCredentialPolicy` and the corresponding `credential(SASTokenCredential)` method in client builder, and added sasToken(String) instead.
 
 ## 12.0.0-preview.3 (2019-09-10)
@@ -107,4 +107,4 @@ demonstrate the new API.
     - `azure-storage-queue` contains a `QueueServiceClient`, `QueueServiceAsyncClient`, `QueueClient` and `QueueAsyncClient` for storage queue operations.
 - Client instances are scoped to storage queue service.
 - Reactive streams support using [Project Reactor](https://projectreactor.io/).
-  
+
diff --git a/sdk/storage/azure-storage-queue/README.md b/sdk/storage/azure-storage-queue/README.md
index e7f8bbf99c50..f941e932c817 100644
--- a/sdk/storage/azure-storage-queue/README.md
+++ b/sdk/storage/azure-storage-queue/README.md
@@ -20,7 +20,7 @@ A single queue message can be up to 64 KB in size, and a queue can contain milli
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-queue</artifactId>
-  <version>12.5.0</version>
+  <version>12.5.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -397,14 +397,14 @@ queueClient.setMetadata(metadata);
 When you interact with queue using this Java client library, errors returned by the service correspond to the same HTTP status codes returned for [REST API][storage_rest] requests. For example, if you try to retrieve a queue that doesn't exist in your Storage Account, a `404` error is returned, indicating `Not Found`.
 
 ### Default HTTP Client
-All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure 
+All client libraries by default use the Netty HTTP client. Adding the above dependency will automatically configure
 the client library to use the Netty HTTP client. Configuring or changing the HTTP client is detailed in the
 [HTTP clients wiki](https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients).
 
 ### Default SSL library
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL 
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides 
-better performance compared to the default SSL implementation within the JDK. For more information, including how to 
+All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
+operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
+better performance compared to the default SSL implementation within the JDK. For more information, including how to
 reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
 
 ## Next steps
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index ae396fd64781..e247dbfe3c1e 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-queue</artifactId>
-  <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
+  <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
 
   <name>Microsoft Azure client library for Queue Storage</name>
   <description>This module contains client library for Microsoft Azure Queue Storage.</description>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

From 3ff2f93ee58509797589ba0a8dec780b67f1459e Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Wed, 6 May 2020 14:59:28 -0700
Subject: [PATCH 13/41] Fix the pom file version scanner

---
 eng/versioning/pom_file_version_scanner.ps1 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eng/versioning/pom_file_version_scanner.ps1 b/eng/versioning/pom_file_version_scanner.ps1
index 08b91364e6a4..48f925433eed 100644
--- a/eng/versioning/pom_file_version_scanner.ps1
+++ b/eng/versioning/pom_file_version_scanner.ps1
@@ -293,14 +293,13 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
         Write-Error-With-Color "Error: <dependencyManagement> is not allowed. Every dependency must have its own version and version update tag"
     }
 
+    $xmlNsManager = New-Object -TypeName "Xml.XmlNamespaceManager" -ArgumentList $xmlPomFile.NameTable
+    $xmlNsManager.AddNamespace("ns", $xmlPomFile.DocumentElement.NamespaceURI)
+
     # Ensure that the project has a version tag with the exception of projects under the eng directory which
     # aren't releasing libraries but still need to have their dependencies checked
     if ($pomFile.Split([IO.Path]::DirectorySeparatorChar) -notcontains "eng") 
     {
-
-        $xmlNsManager = New-Object -TypeName "Xml.XmlNamespaceManager" -ArgumentList $xmlPomFile.NameTable
-        $xmlNsManager.AddNamespace("ns", $xmlPomFile.DocumentElement.NamespaceURI)
-
         $versionNode = $xmlPomFile.SelectSingleNode("/ns:project/ns:version", $xmlNsManager)
         if ($xmlPomFile.project.version -and $versionNode)
         {

From c60b7cca30de7a703f60029ab256d76290fbf8a6 Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Wed, 6 May 2020 17:03:30 -0700
Subject: [PATCH 14/41] Disable tests that fail on Ubuntu 18 (#10853)

---
 .../implementation/ServiceBusMessageProcessorTest.java        | 4 ++++
 .../implementation/ServiceBusReceiveLinkProcessorTest.java    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
index 1c1305504a9e..d8691cb6ebc3 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -98,6 +99,7 @@ void autoCompletesNoAutoRenew() {
     /**
      * Verifies that all messages are emitted downstream.
      */
+    @Disabled("Fails on Ubuntu 18")
     @Test
     void autoCompletesAndAutoRenews() {
         // Arrange
@@ -159,6 +161,7 @@ void emitsDoesNotAutoCompleteOrRenew() {
     /**
      * When the max auto-renewal time has elapsed, we throw an error.
      */
+    @Disabled("Fails on Ubuntu 18")
     @Test
     void autoRenewExpires() {
         // Arrange
@@ -204,6 +207,7 @@ void autoRenewExpires() {
     /**
      * When an error occurs in auto-renew lock we stop processing the next items.
      */
+    @Disabled("Fails on Ubuntu 18")
     @Test
     void autoRenewOperationErrors() {
         // Arrange
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
index 847765353a54..5ea87289d080 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
@@ -278,6 +279,7 @@ void newLinkOnClose() {
     /**
      * Verifies that we can get the next AMQP link when the first one encounters a retryable error.
      */
+    @Disabled("Fails on Ubuntu 18")
     @Test
     void newLinkOnRetryableError() {
         // Arrange
@@ -394,6 +396,7 @@ void noSubscribersWhenTerminated() {
     /**
      * Verifies it keeps trying to get a link and stops after retries are exhausted.
      */
+    @Disabled("Fails on Ubuntu 18")
     @Test
     void retriesUntilExhausted() {
         // Arrange

From c09fa51d67929da72f2008944ea31b1b8fefd1d7 Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Wed, 6 May 2020 17:06:55 -0700
Subject: [PATCH 15/41] Update amqp version to prepare for release (#10851)

---
 eng/jacoco-test-coverage/pom.xml      | 2 +-
 eng/versioning/version_client.txt     | 2 +-
 sdk/core/azure-core-amqp/CHANGELOG.md | 4 ++--
 sdk/core/azure-core-amqp/README.md    | 2 +-
 sdk/core/azure-core-amqp/pom.xml      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index d5d83fe3967a..699bfdb8bc58 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
+      <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 4c852817afd5..1a1278b8d22d 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -7,7 +7,7 @@ com.azure:azure-client-sdk-parent;1.7.0;1.7.0
 com.azure:azure-ai-formrecognizer;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-ai-textanalytics;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-core;1.5.0;1.6.0-beta.1
-com.azure:azure-core-amqp;1.1.0;1.2.0-beta.1
+com.azure:azure-core-amqp;1.1.0;1.1.1
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-http-netty;1.5.1;1.6.0-beta.1
 com.azure:azure-core-http-okhttp;1.2.2;1.3.0-beta.1
diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md
index 8344eff83898..3be470179800 100644
--- a/sdk/core/azure-core-amqp/CHANGELOG.md
+++ b/sdk/core/azure-core-amqp/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
-## 1.2.0-beta.1 (Unreleased)
-
+## 1.1.1 (2020-05-07)
+- Bug fix to get link size from service the first time before sending message from `ReactorSender`.
 
 ## 1.1.0 (2020-05-04)
 
diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md
index 84f5ecec0d2f..651e0fbbf525 100644
--- a/sdk/core/azure-core-amqp/README.md
+++ b/sdk/core/azure-core-amqp/README.md
@@ -16,7 +16,7 @@ own AMQP client library that abstracts from the underlying transport library's i
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-amqp</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
index 9781cc97670a..3d4af2f99744 100644
--- a/sdk/core/azure-core-amqp/pom.xml
+++ b/sdk/core/azure-core-amqp/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-amqp</artifactId>
-  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
+  <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Java Core AMQP Library</name>

From 37420c3104f2931e5176597fb79ee60fa3523946 Mon Sep 17 00:00:00 2001
From: Mohammad Derakhshani <moderakh@users.noreply.github.com>
Date: Wed, 6 May 2020 17:35:37 -0700
Subject: [PATCH 16/41] cosmosdb analyticalStorage -> analyticalStore (#10728)

* COSMOSDB analyticalStorage -> analyticalStore

* updated docs
---
 .../cosmos/models/CosmosContainerProperties.java   | 14 +++++++-------
 .../azure/cosmos/AnalyticalStorageCodeSnippet.java |  4 +---
 .../java/com/azure/cosmos/CosmosContainerTest.java |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerProperties.java
index 723e9de73ced..8b7cdd720988 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerProperties.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerProperties.java
@@ -244,17 +244,17 @@ public CosmosContainerProperties setDefaultTimeToLiveInSeconds(Integer timeToLiv
     }
 
     /**
-     * Sets the analytical storage time to live in seconds for items in a container from the Azure Cosmos DB service.
+     * Sets the analytical store time to live in seconds for items in a container from the Azure Cosmos DB service.
      *
      * It is an optional property. A valid value must be either a nonzero positive integer, '-1', or 0.
-     * By default, AnalyticalStorageTimeToLive is set to 0 meaning the analytical store is turned off for the container;
+     * By default, AnalyticalStoreTimeToLive is set to 0 meaning the analytical store is turned off for the container;
      * -1 means documents in analytical store never expire.
      * The unit of measurement is seconds. The maximum allowed value is 2147483647.
      *
-     * @param timeToLive the analytical storage time to live in seconds.
+     * @param timeToLive the analytical store time to live in seconds.
      * @return the CosmosContainerProperties.
      */
-    public CosmosContainerProperties setAnalyticalStorageTimeToLiveInSeconds(Integer timeToLive) {
+    public CosmosContainerProperties setAnalyticalStoreTimeToLiveInSeconds(Integer timeToLive) {
         // a "null" value is represented as a missing element on the wire.
         // setting timeToLive to null should remove the property from the property bag.
         if (timeToLive != null) {
@@ -267,16 +267,16 @@ public CosmosContainerProperties setAnalyticalStorageTimeToLiveInSeconds(Integer
     }
 
     /**
-     * Gets the analytical storage time to live in seconds for items in a container from the Azure Cosmos DB service.
+     * Gets the analytical store time to live in seconds for items in a container from the Azure Cosmos DB service.
      *
      * It is an optional property. A valid value must be either a nonzero positive integer, '-1', or 0.
-     * By default, AnalyticalStorageTimeToLive is set to 0 meaning the analytical store is turned off for the container;
+     * By default, AnalyticalStoreTimeToLive is set to 0 meaning the analytical store is turned off for the container;
      * -1 means documents in analytical store never expire.
      * The unit of measurement is seconds. The maximum allowed value is 2147483647.
      *
      * @return analytical ttl
      */
-    public Integer getAnalyticalStorageTimeToLiveInSeconds() {
+    public Integer getAnalyticalStoreTimeToLiveInSeconds() {
         if (super.has(Constants.Properties.ANALYTICAL_STORAGE_TTL)) {
             return super.getInt(Constants.Properties.ANALYTICAL_STORAGE_TTL);
         }
diff --git a/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/AnalyticalStorageCodeSnippet.java b/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/AnalyticalStorageCodeSnippet.java
index 5317d24b719a..6d95fca46413 100644
--- a/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/AnalyticalStorageCodeSnippet.java
+++ b/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/AnalyticalStorageCodeSnippet.java
@@ -7,8 +7,6 @@
 import com.azure.cosmos.models.CosmosAsyncDatabaseResponse;
 import com.azure.cosmos.models.CosmosContainerProperties;
 
-import java.time.Instant;
-
 public class AnalyticalStorageCodeSnippet {
 
     public static void main(String[] args) throws Exception {
@@ -20,7 +18,7 @@ public static void main(String[] args) throws Exception {
 
         CosmosAsyncDatabaseResponse database = client.createDatabaseIfNotExists("testDB").block();
         CosmosContainerProperties cosmosContainerProperties = new CosmosContainerProperties("testContainer", "/id");
-        cosmosContainerProperties.setAnalyticalStorageTimeToLiveInSeconds(-1);
+        cosmosContainerProperties.setAnalyticalStoreTimeToLiveInSeconds(-1);
 
         database.getDatabase().createContainer(cosmosContainerProperties).block();
 
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java
index 90bddb077306..698d0538d02f 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerTest.java
@@ -92,7 +92,7 @@ public void createContainer_withAnalyticalTTL(Integer analyticalTTL) throws Exce
         String collectionName = UUID.randomUUID().toString();
         CosmosContainerProperties containerProperties = new CosmosContainerProperties(collectionName, "/id");
 
-        containerProperties.setAnalyticalStorageTimeToLiveInSeconds(analyticalTTL);
+        containerProperties.setAnalyticalStoreTimeToLiveInSeconds(analyticalTTL);
         if (analyticalTTL != null && analyticalTTL > 0) {
             containerProperties.setDefaultTimeToLiveInSeconds(analyticalTTL - 1);
         }
@@ -101,7 +101,7 @@ public void createContainer_withAnalyticalTTL(Integer analyticalTTL) throws Exce
         assertThat(containerResponse.getRequestCharge()).isGreaterThan(0);
         validateContainerResponse(containerProperties, containerResponse);
 
-        assertThat(containerResponse.getProperties().getAnalyticalStorageTimeToLiveInSeconds()).isEqualTo(analyticalTTL);
+        assertThat(containerResponse.getProperties().getAnalyticalStoreTimeToLiveInSeconds()).isEqualTo(analyticalTTL);
     }
 
     @Test(groups = {"emulator"}, timeOut = TIMEOUT)

From cab9bae298e049fd52370f35b9ea3536496d3e06 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 6 May 2020 18:58:29 -0700
Subject: [PATCH 17/41] Increment version for storage releases (#10852)

* Increment package version after release of com.azure azure-storage-blob-batch

* Increment package version after release of com.azure azure-storage-blob

* Increment package version after release of com.azure azure-storage-blob-cryptography

* Increment package version after release of com.azure azure-storage-file-datalake

* Increment package version after release of com.azure azure-storage-common

* Increment package version after release of com.azure azure-storage-queue

* Update Share Files version as automation failed

Co-authored-by: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
---
 eng/jacoco-test-coverage/pom.xml                   | 14 +++++++-------
 eng/versioning/version_client.txt                  | 14 +++++++-------
 .../pom.xml                                        |  2 +-
 sdk/search/azure-search-documents/pom.xml          |  2 +-
 sdk/storage/azure-storage-blob-batch/CHANGELOG.md  |  3 +++
 sdk/storage/azure-storage-blob-batch/pom.xml       |  4 ++--
 .../azure-storage-blob-cryptography/CHANGELOG.md   |  3 +++
 .../azure-storage-blob-cryptography/pom.xml        |  4 ++--
 sdk/storage/azure-storage-blob-nio/pom.xml         |  2 +-
 sdk/storage/azure-storage-blob/CHANGELOG.md        |  3 +++
 sdk/storage/azure-storage-blob/pom.xml             |  4 ++--
 sdk/storage/azure-storage-common/CHANGELOG.md      |  3 +++
 sdk/storage/azure-storage-common/pom.xml           |  2 +-
 .../azure-storage-file-datalake/CHANGELOG.md       |  3 +++
 sdk/storage/azure-storage-file-datalake/pom.xml    |  4 ++--
 sdk/storage/azure-storage-file-share/CHANGELOG.md  |  2 ++
 sdk/storage/azure-storage-file-share/pom.xml       |  4 ++--
 sdk/storage/azure-storage-perf/pom.xml             |  2 +-
 sdk/storage/azure-storage-queue/CHANGELOG.md       |  3 +++
 sdk/storage/azure-storage-queue/pom.xml            |  4 ++--
 20 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 699bfdb8bc58..d04257b07b24 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -134,22 +134,22 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-batch</artifactId>
-      <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+      <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-cryptography</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
     </dependency>
     <!-- Uncomment this when blob-nio is added to sdk/storage/pom.service.xml -->
     <!--    <dependency>-->
@@ -160,17 +160,17 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-share</artifactId>
-      <version>12.4.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
+      <version>12.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-datalake</artifactId>
-      <version>12.1.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
+      <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-queue</artifactId>
-      <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
+      <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 1a1278b8d22d..6868415b26ca 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -31,15 +31,15 @@ com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
 com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4
 com.azure:azure-security-keyvault-secrets;4.2.0-beta.2;4.2.0-beta.3
 com.azure:azure-sdk-template;1.0.4-beta.12;1.0.4-beta.13
-com.azure:azure-storage-blob;12.6.0;12.6.1
-com.azure:azure-storage-blob-batch;12.5.0;12.5.1
-com.azure:azure-storage-blob-cryptography;12.6.0;12.6.1
+com.azure:azure-storage-blob;12.6.1;12.7.0-beta.1
+com.azure:azure-storage-blob-batch;12.5.1;12.6.0-beta.1
+com.azure:azure-storage-blob-cryptography;12.6.1;12.7.0-beta.1
 com.azure:azure-storage-blob-nio;12.0.0-beta.1;12.0.0-beta.1
-com.azure:azure-storage-common;12.6.0;12.6.1
-com.azure:azure-storage-file-share;12.4.0;12.4.1
-com.azure:azure-storage-file-datalake;12.1.0;12.1.1
+com.azure:azure-storage-common;12.6.1;12.7.0-beta.1
+com.azure:azure-storage-file-share;12.4.1;12.5.0-beta.1
+com.azure:azure-storage-file-datalake;12.1.1;12.2.0-beta.1
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-queue;12.5.0;12.5.1
+com.azure:azure-storage-queue;12.5.1;12.6.0-beta.1
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
index bc9a6037cadd..51ecdaa85565 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml
index 5b019af6fb6f..76280d8f3fb7 100644
--- a/sdk/search/azure-search-documents/pom.xml
+++ b/sdk/search/azure-search-documents/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-blob-batch/CHANGELOG.md b/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
index f1034389e694..4329717ca484 100644
--- a/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.6.0-beta.1 (Unreleased)
+
+
 ## 12.5.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
index 3c3125147a2d..e80178d7c1ae 100644
--- a/sdk/storage/azure-storage-blob-batch/pom.xml
+++ b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-batch</artifactId>
-  <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+  <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
 
   <name>Microsoft Azure client library for Blob Storage batching</name>
   <description>This module contains client library for Microsoft Azure Blob Storage batching.</description>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md b/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
index 4c3954236e88..55904d87ced9 100644
--- a/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.7.0-beta.1 (Unreleased)
+
+
 ## 12.6.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
index 32d0af33d2e2..f4473f0dae79 100644
--- a/sdk/storage/azure-storage-blob-cryptography/pom.xml
+++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-cryptography</artifactId>
-  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
+  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
 
   <name>Microsoft Azure client library for Blob Storage cryptography</name>
   <description>This module contains client library for Microsoft Azure Blob Storage cryptography.</description>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml
index 6acf574c3e6f..c4a6163495a5 100644
--- a/sdk/storage/azure-storage-blob-nio/pom.xml
+++ b/sdk/storage/azure-storage-blob-nio/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
index 629406a3ed9b..1557cf3f4e1d 100644
--- a/sdk/storage/azure-storage-blob/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.7.0-beta.1 (Unreleased)
+
+
 ## 12.6.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index 28d07c8607b7..c33b755bf64a 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob</artifactId>
-  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
 
   <name>Microsoft Azure client library for Blob Storage</name>
   <description>This module contains client library for Microsoft Azure Blob Storage.</description>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
index 3ad95c8ce8a3..2e28f1a3f9bb 100644
--- a/sdk/storage/azure-storage-common/CHANGELOG.md
+++ b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.7.0-beta.1 (Unreleased)
+
+
 ## 12.6.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index 4ce74ff61b99..1c4af2c4ca93 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-common</artifactId>
-  <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+  <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
 
   <name>Microsoft Azure common module for Storage</name>
   <description>This module contains common code based for all Microsoft Azure Storage client libraries.</description>
diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
index 475d47067916..e2187f891c9b 100644
--- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.2.0-beta.1 (Unreleased)
+
+
 ## 12.1.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml
index 416c1bd482bd..53df8a8520b0 100644
--- a/sdk/storage/azure-storage-file-datalake/pom.xml
+++ b/sdk/storage/azure-storage-file-datalake/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file-datalake</artifactId>
-  <version>12.1.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
+  <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
 
   <name>Microsoft Azure client library for File Storage Data Lake</name>
   <description>This module contains client library for Microsoft Azure File Storage Data Lake.</description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md
index 8a05ae3a80ec..533e8202bd9a 100644
--- a/sdk/storage/azure-storage-file-share/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Release History
 
+## 12.5.0-beta.1 (Unreleased)
+
 ## 12.4.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml
index 5d491b91a3b6..6d0f0b4e80a4 100644
--- a/sdk/storage/azure-storage-file-share/pom.xml
+++ b/sdk/storage/azure-storage-file-share/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file-share</artifactId>
-  <version>12.4.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
+  <version>12.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
 
   <name>Microsoft Azure client library for File Share Storage</name>
   <description>This module contains client library for Microsoft Azure File Share Storage.</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
diff --git a/sdk/storage/azure-storage-perf/pom.xml b/sdk/storage/azure-storage-perf/pom.xml
index 8cefcf3ac31f..d3b07acb68e2 100644
--- a/sdk/storage/azure-storage-perf/pom.xml
+++ b/sdk/storage/azure-storage-perf/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-queue/CHANGELOG.md b/sdk/storage/azure-storage-queue/CHANGELOG.md
index cbda4a9138ea..fd34f0d19c1a 100644
--- a/sdk/storage/azure-storage-queue/CHANGELOG.md
+++ b/sdk/storage/azure-storage-queue/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 12.6.0-beta.1 (Unreleased)
+
+
 ## 12.5.1 (2020-05-06)
 - Updated `azure-core` version to `1.5.0` to pickup fixes for percent encoding `UTF-8` and invalid leading bytes in a body string.
 
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index e247dbfe3c1e..ae396fd64781 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-queue</artifactId>
-  <version>12.5.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
+  <version>12.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
 
   <name>Microsoft Azure client library for Queue Storage</name>
   <description>This module contains client library for Microsoft Azure Queue Storage.</description>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.6.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

From 1e6ba5842bca0f82367a8f4734ce930266dfcf48 Mon Sep 17 00:00:00 2001
From: Chuang <54572251+xccc-msft@users.noreply.github.com>
Date: Thu, 7 May 2020 10:20:09 +0800
Subject: [PATCH 18/41] consume latest core mgmt changes (#10824)

---
 .../appservice/ApiManagementConfig.java       |  2 +-
 .../management/appservice/ArmIdWrapper.java   |  2 +-
 .../management/appservice/ContainerInfo.java  |  2 +-
 .../appservice/HostingEnvironmentProfile.java |  2 +-
 .../appservice/PrivateLinkResource.java       |  2 +-
 .../appservice/SnapshotRecoverySource.java    |  2 +-
 .../azure/management/appservice/Solution.java |  2 +-
 .../appservice/VirtualNetworkProfile.java     |  2 +-
 ...ServiceCertificateKeyVaultBindingImpl.java |  4 +-
 .../AppServiceCertificateOrderImpl.java       |  2 +-
 .../AppServiceCertificateOrdersImpl.java      |  2 +-
 .../AppServiceCertificatesImpl.java           |  2 +-
 .../implementation/AppServiceDomainImpl.java  |  2 +-
 .../implementation/AppServiceDomainsImpl.java |  2 +-
 .../implementation/AppServicePlansImpl.java   |  2 +-
 .../DeploymentSlotBaseImpl.java               |  2 +-
 .../implementation/DeploymentSlotsImpl.java   |  6 +-
 .../implementation/FunctionAppsImpl.java      |  6 +-
 .../FunctionDeploymentSlotsImpl.java          |  6 +-
 .../implementation/HostNameBindingImpl.java   |  6 +-
 .../implementation/WebAppBaseImpl.java        |  4 +-
 .../WebAppSourceControlImpl.java              |  2 +-
 .../implementation/WebAppsImpl.java           |  6 +-
 .../appservice/models/OperationInner.java     |  2 +-
 .../azure/management/graphrbac/AppRole.java   |  2 +-
 .../graphrbac/OAuth2Permission.java           |  2 +-
 .../management/graphrbac/ResourceAccess.java  |  2 +-
 .../implementation/RoleAssignmentImpl.java    |  4 +-
 .../implementation/RoleDefinitionImpl.java    |  2 +-
 .../models/ClassicAdministratorInner.java     |  2 +-
 .../ProviderOperationsMetadataInner.java      |  2 +-
 .../graphrbac/models/RoleAssignmentInner.java |  2 +-
 .../graphrbac/models/RoleDefinitionInner.java |  2 +-
 .../compute/ApiEntityReference.java           |  2 +-
 .../management/compute/CreationSource.java    |  2 +-
 .../compute/ImageDiskReference.java           |  2 +-
 .../management/compute/ManagedArtifact.java   |  2 +-
 .../azure/management/compute/SourceVault.java |  2 +-
 .../compute/SubResourceReadOnly.java          |  2 +-
 .../implementation/AvailabilitySetImpl.java   | 10 +--
 .../implementation/AvailabilitySetsImpl.java  |  2 +-
 .../CustomImageDataDiskImpl.java              |  6 +-
 .../compute/implementation/DisksImpl.java     |  2 +-
 .../implementation/EncryptionSettings.java    |  4 +-
 .../compute/implementation/GalleriesImpl.java |  2 +-
 .../implementation/GalleryImageImpl.java      | 28 +++----
 .../GalleryImageVersionImpl.java              | 30 ++++----
 .../compute/implementation/GalleryImpl.java   |  2 +-
 ...DiskVolumeLegacyEncryptionMonitorImpl.java |  2 +-
 .../ProximityPlacementGroupImpl.java          |  6 +-
 .../ProxyEncryptionMonitorImpl.java           |  8 +-
 .../compute/implementation/SnapshotsImpl.java |  2 +-
 .../implementation/VMSSPatchPayload.java      |  8 +-
 .../VirtualMachineCustomImageImpl.java        | 12 +--
 .../VirtualMachineCustomImagesImpl.java       |  2 +-
 .../VirtualMachineDataDiskImpl.java           |  2 +-
 .../VirtualMachineExtensionImageImpl.java     |  4 +-
 .../VirtualMachineExtensionImageTypeImpl.java |  6 +-
 ...rtualMachineExtensionImageVersionImpl.java |  6 +-
 .../VirtualMachineExtensionImpl.java          | 26 +++----
 .../VirtualMachineExtensionsImpl.java         |  8 +-
 .../VirtualMachineImageImpl.java              |  2 +-
 .../implementation/VirtualMachineImpl.java    | 52 ++++++-------
 .../VirtualMachineScaleSetImpl.java           | 74 +++++++++----------
 .../VirtualMachineScaleSetVMImpl.java         | 28 +++----
 ...achineScaleSetVMInstanceExtensionImpl.java |  8 +-
 .../VirtualMachineScaleSetsImpl.java          |  2 +-
 .../implementation/VirtualMachinesImpl.java   |  2 +-
 .../models/RunCommandDocumentBaseInner.java   |  2 +-
 ...rtualMachineCustomImageOperationsTest.java |  4 +-
 ...tualMachineManagedDiskOperationsTests.java |  2 +-
 .../VirtualMachineOperationsTests.java        |  4 +-
 ...VirtualMachineScaleSetOperationsTests.java |  2 +-
 .../containerregistry/EventContent.java       |  2 +-
 .../containerregistry/ImageUpdateTrigger.java |  2 +-
 .../management/containerregistry/Request.java |  2 +-
 .../SourceTriggerDescriptor.java              |  2 +-
 .../StorageAccountProperties.java             |  2 +-
 .../implementation/RegistriesImpl.java        |  4 +-
 .../RegistryDockerTaskStepImpl.java           |  2 +-
 .../RegistryEncodedTaskStepImpl.java          |  2 +-
 .../RegistryFileTaskStepImpl.java             |  2 +-
 .../implementation/RegistryImpl.java          |  6 +-
 .../RegistrySourceTriggerImpl.java            |  4 +-
 .../implementation/RegistryTaskImpl.java      | 22 +++---
 .../implementation/WebhookImpl.java           | 16 ++--
 .../implementation/WebhooksClientImpl.java    |  4 +-
 .../models/EventInfoInner.java                |  2 +-
 .../containerservice/ResourceReference.java   |  2 +-
 .../KubernetesClustersImpl.java               |  4 +-
 .../AgentPoolAvailableVersionsInner.java      |  2 +-
 .../models/AgentPoolUpgradeProfileInner.java  |  2 +-
 .../ManagedClusterUpgradeProfileInner.java    |  2 +-
 ...estratorVersionProfileListResultInner.java |  2 +-
 .../cosmosdb/CassandraKeyspaceResource.java   |  2 +-
 .../cosmosdb/CassandraTableResource.java      |  2 +-
 .../management/cosmosdb/FailoverPolicy.java   |  2 +-
 .../cosmosdb/GremlinDatabaseResource.java     |  2 +-
 .../cosmosdb/GremlinGraphResource.java        |  2 +-
 .../azure/management/cosmosdb/Location.java   |  2 +-
 .../cosmosdb/MongoDBCollectionResource.java   |  2 +-
 .../cosmosdb/MongoDBDatabaseResource.java     |  2 +-
 .../cosmosdb/PrivateEndpointProperty.java     |  2 +-
 .../cosmosdb/SqlContainerResource.java        |  2 +-
 .../cosmosdb/SqlDatabaseResource.java         |  2 +-
 .../cosmosdb/SqlStoredProcedureResource.java  |  2 +-
 .../cosmosdb/SqlTriggerResource.java          |  2 +-
 .../SqlUserDefinedFunctionResource.java       |  2 +-
 .../management/cosmosdb/TableResource.java    |  2 +-
 .../cosmosdb/VirtualNetworkRule.java          |  2 +-
 .../implementation/CosmosDBAccountImpl.java   | 12 +--
 .../implementation/CosmosDBAccountsImpl.java  |  4 +-
 .../PrivateEndpointConnectionImpl.java        |  2 +-
 .../PrivateEndpointConnectionsImpl.java       |  4 +-
 .../PrivateLinkResourceImpl.java              |  6 +-
 .../implementation/SqlDatabaseImpl.java       |  2 +-
 .../management/cosmosdb/CosmosDBTests.java    |  2 +-
 .../dns/implementation/ARecordSetsImpl.java   |  2 +-
 .../implementation/AaaaRecordSetsImpl.java    |  2 +-
 .../implementation/CNameRecordSetsImpl.java   |  2 +-
 .../dns/implementation/CaaRecordSetsImpl.java |  2 +-
 .../dns/implementation/DnsRecordSetImpl.java  |  4 +-
 .../dns/implementation/DnsZoneImpl.java       | 32 ++++----
 .../dns/implementation/DnsZonesImpl.java      |  4 +-
 .../dns/implementation/MXRecordSetsImpl.java  |  2 +-
 .../dns/implementation/NSRecordSetsImpl.java  |  2 +-
 .../dns/implementation/PtrRecordSetsImpl.java |  2 +-
 .../dns/implementation/SrvRecordSetsImpl.java |  2 +-
 .../dns/implementation/TxtRecordSetsImpl.java |  2 +-
 .../management/keyvault/PrivateEndpoint.java  |  2 +-
 .../keyvault/VirtualNetworkRule.java          |  2 +-
 .../implementation/DeletedVaultImpl.java      |  2 +-
 .../keyvault/implementation/VaultImpl.java    |  2 +-
 .../keyvault/implementation/VaultsImpl.java   |  4 +-
 .../keyvault/models/DeletedVaultInner.java    |  2 +-
 .../msi/implementation/IdentitesImpl.java     |  2 +-
 .../msi/implementation/IdentityImpl.java      |  4 +-
 .../java/com/azure/management/TestUtils.java  |  2 +-
 ...teCosmosDBTableWithVirtualNetworkRule.java |  4 +-
 .../samples/DeployUsingARMTemplate.java       |  2 +-
 .../DeployUsingARMTemplateWithTags.java       |  2 +-
 .../com/azure/management/samples/Utils.java   | 24 +++---
 .../management/monitor/MetricAlertStatus.java |  2 +-
 .../management/monitor/WorkspaceInfo.java     |  2 +-
 .../implementation/ActionGroupImpl.java       |  2 +-
 .../implementation/ActionGroupsImpl.java      |  2 +-
 .../implementation/ActivityLogAlertImpl.java  |  2 +-
 .../implementation/ActivityLogAlertsImpl.java |  2 +-
 .../implementation/AutoscaleSettingsImpl.java |  2 +-
 .../implementation/DiagnosticSettingImpl.java | 10 +--
 .../DiagnosticSettingsCategoryImpl.java       |  2 +-
 .../DiagnosticSettingsImpl.java               |  4 +-
 .../monitor/implementation/EventDataImpl.java |  2 +-
 .../implementation/MetricAlertImpl.java       |  2 +-
 .../implementation/MetricAlertsImpl.java      |  2 +-
 .../implementation/MetricDefinitionImpl.java  |  2 +-
 .../monitor/implementation/MetricImpl.java    |  2 +-
 .../monitor/models/BaselineResponseInner.java |  2 +-
 .../monitor/models/EventDataInner.java        |  2 +-
 .../monitor/models/MetricDefinitionInner.java |  2 +-
 .../monitor/models/MetricInner.java           |  2 +-
 .../monitor/models/MetricNamespaceInner.java  |  2 +-
 .../models/SingleMetricBaselineInner.java     |  2 +-
 .../ApplicationGatewayFirewallRuleSet.java    |  2 +-
 .../management/network/ConnectivityHop.java   |  2 +-
 .../network/ExpressRouteCircuitPeeringId.java |  2 +-
 .../network/ExpressRouteCircuitReference.java |  2 +-
 .../network/ExpressRouteConnectionId.java     |  2 +-
 .../network/NetworkIntentPolicy.java          |  2 +-
 .../network/NetworkInterfaceAssociation.java  |  2 +-
 .../network/ReferencedPublicIpAddress.java    |  2 +-
 .../network/ResourceNavigationLink.java       |  2 +-
 .../SecurityGroupNetworkInterface.java        |  2 +-
 .../network/ServiceTagInformation.java        |  2 +-
 .../management/network/SubnetAssociation.java |  2 +-
 .../management/network/TopologyResource.java  |  2 +-
 .../network/TroubleshootingDetails.java       |  2 +-
 .../management/network/VirtualHubId.java      |  2 +-
 ...tualNetworkConnectionGatewayReference.java |  2 +-
 .../ApplicationGatewayBackendHealthImpl.java  |  4 +-
 ...wayBackendHttpConfigurationHealthImpl.java |  4 +-
 ...onGatewayBackendHttpConfigurationImpl.java | 12 +--
 .../ApplicationGatewayBackendImpl.java        |  4 +-
 ...icationGatewayBackendServerHealthImpl.java |  2 +-
 .../ApplicationGatewayFrontendImpl.java       | 10 +--
 ...ApplicationGatewayIPConfigurationImpl.java |  6 +-
 .../ApplicationGatewayImpl.java               | 32 ++++----
 .../ApplicationGatewayListenerImpl.java       | 12 +--
 .../ApplicationGatewayPathRuleImpl.java       | 10 +--
 ...ationGatewayRedirectConfigurationImpl.java |  6 +-
 ...licationGatewayRequestRoutingRuleImpl.java | 18 ++---
 .../ApplicationGatewayUrlPathMapImpl.java     | 12 +--
 .../ApplicationGatewaysImpl.java              |  2 +-
 .../ApplicationSecurityGroupsImpl.java        |  2 +-
 .../implementation/ConnectionMonitorImpl.java |  8 +-
 .../ConnectionMonitorsImpl.java               |  2 +-
 .../DdosProtectionPlansImpl.java              |  2 +-
 .../ExpressRouteCircuitImpl.java              |  2 +-
 .../ExpressRouteCircuitPeeringImpl.java       |  4 +-
 .../ExpressRouteCircuitsImpl.java             |  2 +-
 .../ExpressRouteCrossConnectionImpl.java      |  2 +-
 ...xpressRouteCrossConnectionPeeringImpl.java |  4 +-
 .../ExpressRouteCrossConnectionsImpl.java     |  2 +-
 .../implementation/Ipv6PeeringConfigImpl.java |  2 +-
 .../LoadBalancerBackendImpl.java              |  6 +-
 .../LoadBalancerFrontendImpl.java             | 14 ++--
 .../implementation/LoadBalancerImpl.java      | 18 ++---
 .../LoadBalancerInboundNatPoolImpl.java       |  2 +-
 .../LoadBalancerInboundNatRuleImpl.java       |  6 +-
 .../implementation/LoadBalancerProbeImpl.java |  2 +-
 .../implementation/LoadBalancersImpl.java     |  2 +-
 .../implementation/LoadBalancingRuleImpl.java | 10 +--
 .../LocalNetworkGatewayImpl.java              |  2 +-
 .../LocalNetworkGatewaysImpl.java             |  2 +-
 .../network/implementation/NetworkImpl.java   |  6 +-
 .../implementation/NetworkInterfaceImpl.java  |  6 +-
 .../implementation/NetworkInterfacesImpl.java |  2 +-
 .../implementation/NetworkManager.java        | 12 +--
 .../implementation/NetworkPeeringImpl.java    |  8 +-
 .../NetworkSecurityGroupImpl.java             |  4 +-
 .../NetworkSecurityGroupsImpl.java            |  2 +-
 .../NetworkSecurityRuleImpl.java              |  4 +-
 .../implementation/NetworkWatcherImpl.java    |  2 +-
 .../implementation/NetworkWatchersImpl.java   |  2 +-
 .../network/implementation/NetworksImpl.java  |  2 +-
 .../NicIPConfigurationBaseImpl.java           | 12 +--
 .../NicIPConfigurationImpl.java               | 12 +--
 .../implementation/PacketCaptureImpl.java     |  4 +-
 .../PacketCaptureStatusImpl.java              |  2 +-
 .../implementation/PublicIPAddressImpl.java   |  8 +-
 .../implementation/PublicIPAddressesImpl.java |  2 +-
 .../implementation/RouteFiltersImpl.java      |  2 +-
 .../implementation/RouteTableImpl.java        |  2 +-
 .../implementation/RouteTablesImpl.java       |  2 +-
 .../implementation/SecurityGroupViewImpl.java |  2 +-
 .../network/implementation/SubnetImpl.java    |  8 +-
 .../network/implementation/TopologyImpl.java  |  8 +-
 ...alMachineScaleSetNetworkInterfaceImpl.java |  4 +-
 ...lMachineScaleSetNetworkInterfacesImpl.java |  2 +-
 .../VirtualNetworkGatewayConnectionImpl.java  | 12 +--
 .../VirtualNetworkGatewayConnectionsImpl.java |  2 +-
 ...tualNetworkGatewayIPConfigurationImpl.java | 10 +--
 .../VirtualNetworkGatewayImpl.java            |  6 +-
 .../VirtualNetworkGatewaysImpl.java           |  2 +-
 ...cationGatewayAvailableSslOptionsInner.java |  2 +-
 .../models/ApplicationGatewayInner.java       |  2 +-
 .../models/ApplicationSecurityGroupInner.java |  2 +-
 .../models/AvailableDelegationInner.java      |  2 +-
 .../AvailablePrivateEndpointTypeInner.java    |  2 +-
 .../models/AzureFirewallFqdnTagInner.java     |  2 +-
 .../network/models/AzureFirewallInner.java    |  2 +-
 .../network/models/BastionHostInner.java      |  2 +-
 .../models/BgpServiceCommunityInner.java      |  2 +-
 .../network/models/DdosCustomPolicyInner.java |  2 +-
 .../models/ExpressRouteCircuitInner.java      |  2 +-
 .../ExpressRouteCrossConnectionInner.java     |  2 +-
 .../models/ExpressRouteGatewayInner.java      |  2 +-
 .../network/models/ExpressRoutePortInner.java |  2 +-
 .../ExpressRoutePortsLocationInner.java       |  2 +-
 .../ExpressRouteServiceProviderInner.java     |  2 +-
 .../network/models/FirewallPolicyInner.java   |  2 +-
 .../network/models/LoadBalancerInner.java     |  2 +-
 .../models/LocalNetworkGatewayInner.java      |  2 +-
 .../network/models/NatGatewayInner.java       |  2 +-
 .../network/models/NetworkInterfaceInner.java |  2 +-
 .../network/models/NetworkProfileInner.java   |  2 +-
 .../models/NetworkSecurityGroupInner.java     |  2 +-
 .../network/models/NetworkWatcherInner.java   |  2 +-
 .../network/models/P2SVpnGatewayInner.java    |  2 +-
 .../PacketCaptureQueryStatusResultInner.java  |  2 +-
 .../models/PacketCaptureResultInner.java      |  2 +-
 .../network/models/PrivateEndpointInner.java  |  2 +-
 .../models/PrivateLinkServiceInner.java       |  2 +-
 .../network/models/PublicIPAddressInner.java  |  2 +-
 .../network/models/PublicIPPrefixInner.java   |  2 +-
 .../network/models/RouteFilterInner.java      |  2 +-
 .../network/models/RouteTableInner.java       |  2 +-
 .../models/ServiceEndpointPolicyInner.java    |  2 +-
 .../models/ServiceTagsListResultInner.java    |  2 +-
 .../network/models/TopologyInner.java         |  2 +-
 .../management/network/models/UsageInner.java |  2 +-
 .../network/models/VirtualHubInner.java       |  2 +-
 .../VirtualNetworkGatewayConnectionInner.java |  2 +-
 ...tworkGatewayConnectionListEntityInner.java |  2 +-
 .../models/VirtualNetworkGatewayInner.java    |  2 +-
 .../network/models/VirtualNetworkInner.java   |  2 +-
 .../models/VirtualNetworkTapInner.java        |  2 +-
 .../models/VirtualNetworkUsageInner.java      |  2 +-
 .../network/models/VirtualWANInner.java       |  2 +-
 .../network/models/VpnGatewayInner.java       |  2 +-
 .../network/models/VpnSiteInner.java          |  2 +-
 .../WebApplicationFirewallPolicyInner.java    |  2 +-
 .../management/resources/BasicDependency.java |  2 +-
 .../management/resources/Dependency.java      |  2 +-
 .../management/resources/TargetResource.java  |  2 +-
 .../IndependentChildResourceImpl.java         | 28 +++----
 .../models/implementation/ResourceImpl.java   | 32 ++++----
 .../implementation/DeploymentImpl.java        |  6 +-
 .../DeploymentOperationImpl.java              |  4 +-
 .../implementation/DeploymentsImpl.java       |  6 +-
 .../implementation/GenericResourceImpl.java   | 10 +--
 .../implementation/GenericResourcesImpl.java  | 10 +--
 .../implementation/PolicyAssignmentImpl.java  |  4 +-
 .../implementation/PolicyAssignmentsImpl.java |  2 +-
 .../implementation/PolicyDefinitionImpl.java  |  2 +-
 .../implementation/ResourceGroupImpl.java     | 24 +++---
 .../implementation/ResourceGroupsImpl.java    |  2 +-
 .../models/DeploymentOperationInner.java      |  2 +-
 .../resources/models/FeatureResultInner.java  |  2 +-
 .../resources/models/LocationInner.java       |  2 +-
 .../models/PolicyDefinitionInner.java         |  2 +-
 .../resources/models/ProviderInner.java       |  2 +-
 .../resources/models/SubscriptionInner.java   |  2 +-
 .../resources/models/TagDetailsInner.java     |  2 +-
 .../resources/models/TagValueInner.java       |  2 +-
 .../models/TenantIdDescriptionInner.java      |  2 +-
 .../core/ResourceGroupTaggingPolicy.java      |  4 +-
 .../com/azure/management/sql/PartnerInfo.java |  2 +-
 .../sql/PrivateEndpointProperty.java          |  2 +-
 .../sql/ResourceMoveDefinition.java           |  2 +-
 .../sql/ServerPrivateEndpointConnection.java  |  2 +-
 .../sql/ServiceObjectiveCapability.java       |  2 +-
 .../ElasticPoolActivityImpl.java              |  2 +-
 .../ElasticPoolDatabaseActivityImpl.java      |  6 +-
 .../RecommendedElasticPoolImpl.java           | 12 +--
 .../implementation/ReplicationLinkImpl.java   |  6 +-
 .../sql/implementation/RestorePointImpl.java  |  6 +-
 .../implementation/ServiceObjectiveImpl.java  |  4 +-
 .../ServiceTierAdvisorImpl.java               |  6 +-
 .../SqlDatabaseForElasticPoolImpl.java        |  2 +-
 .../sql/implementation/SqlDatabaseImpl.java   | 26 +++----
 .../SqlDatabaseImportExportResponseImpl.java  |  4 +-
 .../SqlDatabaseOperationsImpl.java            | 16 ++--
 .../SqlDatabaseThreatDetectionPolicyImpl.java |  4 +-
 .../implementation/SqlElasticPoolImpl.java    | 20 ++---
 .../SqlElasticPoolOperationsImpl.java         | 16 ++--
 .../SqlEncryptionProtectorImpl.java           | 20 ++---
 .../implementation/SqlFailoverGroupImpl.java  | 10 +--
 .../SqlFailoverGroupOperationsImpl.java       | 24 +++---
 .../implementation/SqlFirewallRuleImpl.java   |  2 +-
 .../SqlFirewallRuleOperationsImpl.java        | 14 ++--
 .../SqlRestorableDroppedDatabaseImpl.java     |  6 +-
 .../implementation/SqlServerDnsAliasImpl.java |  8 +-
 .../SqlServerDnsAliasOperationsImpl.java      |  8 +-
 .../sql/implementation/SqlServerImpl.java     |  2 +-
 .../sql/implementation/SqlServerKeyImpl.java  | 20 ++---
 .../SqlServerKeyOperationsImpl.java           |  8 +-
 .../SqlServerSecurityAlertPolicyImpl.java     |  8 +-
 .../sql/implementation/SqlServersImpl.java    |  2 +-
 .../SqlSubscriptionUsageMetricImpl.java       |  6 +-
 .../sql/implementation/SqlSyncGroupImpl.java  |  8 +-
 .../SqlSyncGroupOperationsImpl.java           |  8 +-
 .../sql/implementation/SqlSyncMemberImpl.java |  8 +-
 .../SqlSyncMemberOperationsImpl.java          |  4 +-
 .../SqlVirtualNetworkRuleImpl.java            |  2 +-
 .../SqlVirtualNetworkRuleOperationsImpl.java  | 16 ++--
 ...TransparentDataEncryptionActivityImpl.java |  2 +-
 .../TransparentDataEncryptionImpl.java        |  6 +-
 .../models/SyncDatabaseIdPropertiesInner.java |  2 +-
 .../management/sql/models/UsageInner.java     |  2 +-
 .../sql/SqlServerOperationsTests.java         |  6 +-
 .../management/storage/PrivateEndpoint.java   |  2 +-
 .../implementation/BlobContainerImpl.java     | 18 ++---
 .../BlobServicePropertiesImpl.java            | 16 ++--
 .../ImmutabilityPolicyImpl.java               | 18 ++---
 .../implementation/ManagementPolicyImpl.java  | 16 ++--
 .../implementation/StorageAccountImpl.java    |  4 +-
 .../implementation/StorageAccountsImpl.java   |  2 +-
 368 files changed, 933 insertions(+), 933 deletions(-)

diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java
index b90e5bc19a18..8a65c85c89e0 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java
@@ -21,7 +21,7 @@ public final class ApiManagementConfig {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java
index e93ba466aedc..65e9f1bd86bb 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java
@@ -21,7 +21,7 @@ public final class ArmIdWrapper {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java
index 3f098a4aeea1..1957e719e2f2 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java
@@ -184,7 +184,7 @@ public ContainerInfo withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java
index c18bff1665ad..34dda75edc33 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java
@@ -33,7 +33,7 @@ public final class HostingEnvironmentProfile {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java
index c8367b8a0f50..c8b9aed395d0 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java
@@ -39,7 +39,7 @@ public final class PrivateLinkResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java
index 683278fd7f6b..219a4fd7f42c 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java
@@ -57,7 +57,7 @@ public SnapshotRecoverySource withLocation(String location) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java
index baaa1c264d38..56047b8b4ea9 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java
@@ -58,7 +58,7 @@ public final class Solution {
      *
      * @return the id value.
      */
-    public Double getId() {
+    public Double id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java
index 938763bc9d63..f47ab37cec29 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java
@@ -39,7 +39,7 @@ public final class VirtualNetworkProfile {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
index 879f67f2c2bb..24678dee88fd 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
@@ -25,13 +25,13 @@ class AppServiceCertificateKeyVaultBindingImpl
 
     AppServiceCertificateKeyVaultBindingImpl(
         AppServiceCertificateResourceInner innerObject, AppServiceCertificateOrderImpl parent) {
-        super(innerObject.getName(), innerObject, (parent != null) ? parent.manager() : null);
+        super(innerObject.name(), innerObject, (parent != null) ? parent.manager() : null);
         this.parent = parent;
     }
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
index 82044d379f85..8c659fa58b55 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
@@ -152,7 +152,7 @@ public AppServiceCertificateKeyVaultBinding createKeyVaultBinding(String certifi
     @Override
     public Mono<AppServiceCertificateKeyVaultBinding> createKeyVaultBindingAsync(String certificateName, Vault vault) {
         AppServiceCertificateResourceInner certInner = new AppServiceCertificateResourceInner();
-        certInner.setLocation(vault.regionName());
+        certInner.withLocation(vault.regionName());
         certInner.withKeyVaultId(vault.id());
         certInner.withKeyVaultSecretName(certificateName);
         return this
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
index 4f5a870e86a9..c0d98486630a 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
@@ -34,7 +34,7 @@ protected AppServiceCertificateOrderImpl wrapModel(AppServiceCertificateOrderInn
         if (inner == null) {
             return null;
         }
-        return new AppServiceCertificateOrderImpl(inner.getName(), inner, this.manager());
+        return new AppServiceCertificateOrderImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java
index 622e831941e5..e4b322d21ea5 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java
@@ -52,7 +52,7 @@ protected AppServiceCertificateImpl wrapModel(CertificateInner inner) {
         if (inner == null) {
             return null;
         }
-        return new AppServiceCertificateImpl(inner.getName(), inner, this.manager());
+        return new AppServiceCertificateImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java
index 76797561a5ad..178ac1dfd671 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java
@@ -34,7 +34,7 @@ class AppServiceDomainImpl
 
     AppServiceDomainImpl(String name, DomainInner innerObject, AppServiceManager manager) {
         super(name, innerObject, manager);
-        inner().setLocation("global");
+        inner().withLocation("global");
         if (inner().managedHostNames() != null) {
             this.hostNameMap =
                 inner().managedHostNames().stream().collect(Collectors.toMap(HostName::name, Function.identity()));
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java
index 93005685a36e..4169bac6bb60 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java
@@ -32,7 +32,7 @@ protected AppServiceDomainImpl wrapModel(DomainInner inner) {
         if (inner == null) {
             return null;
         }
-        return new AppServiceDomainImpl(inner.getName(), inner, this.manager());
+        return new AppServiceDomainImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java
index 5089d2648b0f..727727ecbb2d 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java
@@ -29,7 +29,7 @@ protected AppServicePlanImpl wrapModel(AppServicePlanInner inner) {
         if (inner == null) {
             return null;
         }
-        return new AppServicePlanImpl(inner.getName(), inner, this.manager());
+        return new AppServicePlanImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java
index f3eff551370a..9f85665ea1f9 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java
@@ -54,7 +54,7 @@ abstract class DeploymentSlotBaseImpl<
         this.name = name.replaceAll(".*/", "");
         this.parent = parent;
         inner().withServerFarmId(parent.appServicePlanId());
-        inner().setLocation(regionName());
+        inner().withLocation(regionName());
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java
index 3624c2ac8062..204a1fd5bc32 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java
@@ -53,11 +53,11 @@ protected PagedFlux<DeploymentSlot> wrapPageAsync(PagedFlux<SiteInner> innerPage
                             this
                                 .inner()
                                 .getConfigurationSlotAsync(
-                                    siteInner.resourceGroup(), parent.name(), siteInner.getName()),
+                                    siteInner.resourceGroup(), parent.name(), siteInner.name()),
                             this
                                 .inner()
                                 .getDiagnosticLogsConfigurationSlotAsync(
-                                    siteInner.resourceGroup(), parent.name(), siteInner.getName()),
+                                    siteInner.resourceGroup(), parent.name(), siteInner.name()),
                             (siteConfigResourceInner, logsConfigInner) ->
                                 this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner)));
     }
@@ -132,6 +132,6 @@ private DeploymentSlotImpl wrapModel(
         if (inner == null) {
             return null;
         }
-        return new DeploymentSlotImpl(inner.getName(), inner, siteConfig, logConfig, parent);
+        return new DeploymentSlotImpl(inner.name(), inner, siteConfig, logConfig, parent);
     }
 }
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java
index c9424c46eb7c..698e2cf85559 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java
@@ -87,7 +87,7 @@ private FunctionAppImpl wrapModel(
         if (inner == null) {
             return null;
         }
-        return new FunctionAppImpl(inner.getName(), inner, siteConfig, logConfig, this.manager());
+        return new FunctionAppImpl(inner.name(), inner, siteConfig, logConfig, this.manager());
     }
 
     @Override
@@ -100,11 +100,11 @@ protected PagedFlux<FunctionApp> wrapPageAsync(PagedFlux<SiteInner> innerPage) {
                         && Arrays.asList(siteInner.kind().split(",")).contains("functionapp")) {
                         return Mono
                             .zip(
-                                this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.getName()),
+                                this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.name()),
                                 this
                                     .inner()
                                     .getDiagnosticLogsConfigurationAsync(
-                                        siteInner.resourceGroup(), siteInner.getName()),
+                                        siteInner.resourceGroup(), siteInner.name()),
                                 (siteConfigResourceInner, logsConfigInner) ->
                                     this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner));
                     } else {
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java
index 78d7dcd0bf81..d7cc051a52df 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java
@@ -56,11 +56,11 @@ protected PagedFlux<FunctionDeploymentSlot> wrapPageAsync(PagedFlux<SiteInner> i
                             this
                                 .inner()
                                 .getConfigurationSlotAsync(
-                                    siteInner.resourceGroup(), parent.name(), siteInner.getName()),
+                                    siteInner.resourceGroup(), parent.name(), siteInner.name()),
                             this
                                 .inner()
                                 .getDiagnosticLogsConfigurationSlotAsync(
-                                    siteInner.resourceGroup(), parent.name(), siteInner.getName()),
+                                    siteInner.resourceGroup(), parent.name(), siteInner.name()),
                             (siteConfigResourceInner, logsConfigInner) ->
                                 this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner)));
     }
@@ -135,6 +135,6 @@ private FunctionDeploymentSlotImpl wrapModel(
         if (inner == null) {
             return null;
         }
-        return new FunctionDeploymentSlotImpl(inner.getName(), inner, siteConfig, logConfig, parent);
+        return new FunctionDeploymentSlotImpl(inner.name(), inner, siteConfig, logConfig, parent);
     }
 }
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java
index 54bd9f35e882..04c4ea16ec15 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java
@@ -45,7 +45,7 @@ class HostNameBindingImpl<FluentT extends WebAppBase, FluentImplT extends WebApp
     HostNameBindingImpl(HostNameBindingInner innerObject, FluentImplT parent) {
         super(innerObject);
         this.parent = parent;
-        this.name = innerObject.getName();
+        this.name = innerObject.name();
         if (name != null && name.contains("/")) {
             this.name = name.replace(parent.name() + "/", "");
         }
@@ -53,12 +53,12 @@ class HostNameBindingImpl<FluentT extends WebAppBase, FluentImplT extends WebApp
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
     public String type() {
-        return inner().getType();
+        return inner().type();
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppBaseImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppBaseImpl.java
index 0f27a8bec103..8b46b9908bfb 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppBaseImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppBaseImpl.java
@@ -152,7 +152,7 @@ abstract class WebAppBaseImpl<FluentT extends WebAppBase, FluentImplT extends We
 
         webAppMsiHandler = new WebAppMsiHandler(manager.rbacManager(), this);
         normalizeProperties();
-        isInCreateMode = inner() == null || inner().getId() == null;
+        isInCreateMode = inner() == null || inner().id() == null;
         if (!isInCreateMode) {
             initializeKuduClient();
         }
@@ -190,7 +190,7 @@ public String principalId() {
             @Override
             public String resourceId() {
                 if (inner() != null) {
-                    return inner().getId();
+                    return inner().id();
                 } else {
                     return null;
                 }
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppSourceControlImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppSourceControlImpl.java
index 6d4f66f9de7c..997909eaaf49 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppSourceControlImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppSourceControlImpl.java
@@ -33,7 +33,7 @@ class WebAppSourceControlImpl<FluentT extends WebAppBase, FluentImplT extends We
 
     @Override
     public String name() {
-        return inner().getName();
+        return inner().name();
     }
 
     @Override
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppsImpl.java
index dc25c698af4e..aee2d472a9a8 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppsImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/WebAppsImpl.java
@@ -49,7 +49,7 @@ protected WebAppImpl wrapModel(SiteInner inner, SiteConfigResourceInner siteConf
         if (inner == null) {
             return null;
         }
-        return new WebAppImpl(inner.getName(), inner, siteConfig, logConfig, this.manager());
+        return new WebAppImpl(inner.name(), inner, siteConfig, logConfig, this.manager());
     }
 
     @Override
@@ -66,11 +66,11 @@ protected PagedFlux<WebApp> wrapPageAsync(PagedFlux<SiteInner> innerPage) {
                     if (siteInner.kind() == null || Arrays.asList(siteInner.kind().split(",")).contains("app")) {
                         return Mono
                             .zip(
-                                this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.getName()),
+                                this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.name()),
                                 this
                                     .inner()
                                     .getDiagnosticLogsConfigurationAsync(
-                                        siteInner.resourceGroup(), siteInner.getName()),
+                                        siteInner.resourceGroup(), siteInner.name()),
                                 (siteConfigResourceInner, logsConfigInner) ->
                                     this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner));
                     } else {
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java
index 93c0313b9ff5..1b536baa2ee9 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java
@@ -68,7 +68,7 @@ public final class OperationInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java
index 1eac9d20969a..cb7849fc6248 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java
@@ -60,7 +60,7 @@ public final class AppRole {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java
index 87d7d27c6543..b9e0ef828f30 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java
@@ -117,7 +117,7 @@ public OAuth2Permission withAdminConsentDisplayName(String adminConsentDisplayNa
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java
index 98c5386a895a..94a44ac8a28d 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java
@@ -39,7 +39,7 @@ public final class ResourceAccess {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java
index 3fabf6493164..c20c4402d853 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java
@@ -43,7 +43,7 @@ class RoleAssignmentImpl extends CreatableImpl<RoleAssignment, RoleAssignmentInn
 
     @Override
     public boolean isInCreateMode() {
-        return inner().getId() == null;
+        return inner().id() == null;
     }
 
     @Override
@@ -207,7 +207,7 @@ public RoleAssignmentImpl withSubscriptionScope(String subscriptionId) {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleDefinitionImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleDefinitionImpl.java
index eb6d764ecde3..581f20160231 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleDefinitionImpl.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleDefinitionImpl.java
@@ -59,7 +59,7 @@ public Set<String> assignableScopes() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java
index ca4ddc100323..5bd8224a2e79 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java
@@ -47,7 +47,7 @@ public class ClassicAdministratorInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java
index 255dbbc36f31..9f3d6e3f028c 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java
@@ -54,7 +54,7 @@ public final class ProviderOperationsMetadataInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java
index 8973dd009461..d937ab343863 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java
@@ -59,7 +59,7 @@ public class RoleAssignmentInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java
index 13c8d2129d49..bbcf499d88f4 100644
--- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java
+++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java
@@ -66,7 +66,7 @@ public class RoleDefinitionInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java
index 2c370feaf941..1fd2afbe0bd7 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java
@@ -23,7 +23,7 @@ public final class ApiEntityReference {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java
index 9f28cf6a8e4b..478bf8b866b0 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java
@@ -63,7 +63,7 @@ public CreationSourceType type() {
     public String sourceId() {
         if (this.type() == CreationSourceType.FROM_OS_DISK_IMAGE
             || this.type() == CreationSourceType.FROM_DATA_DISK_IMAGE) {
-            return this.creationData.imageReference().getId();
+            return this.creationData.imageReference().id();
         }
         if (this.type() == CreationSourceType.IMPORTED_FROM_VHD) {
             return this.creationData.sourceUri();
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java
index dc0880a77ccb..c3e464fc5800 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java
@@ -30,7 +30,7 @@ public final class ImageDiskReference {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java
index aca452a7754f..f163ad897e4b 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java
@@ -21,7 +21,7 @@ public final class ManagedArtifact {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java
index c5026e106650..9a0e3d72958a 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java
@@ -21,7 +21,7 @@ public final class SourceVault {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java
index 1953b621b139..f86bdf81a475 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java
@@ -21,7 +21,7 @@ public class SubResourceReadOnly {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java
index e2ac377cef81..e33cde28bf68 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java
@@ -63,7 +63,7 @@ public Set<String> virtualMachineIds() {
         if (idOfVMsInSet == null) {
             idOfVMsInSet = new HashSet<>();
             for (SubResource resource : this.inner().virtualMachines()) {
-                idOfVMsInSet.add(resource.getId());
+                idOfVMsInSet.add(resource.id());
             }
         }
         return Collections.unmodifiableSet(idOfVMsInSet);
@@ -71,7 +71,7 @@ public Set<String> virtualMachineIds() {
 
     @Override
     public ProximityPlacementGroup proximityPlacementGroup() {
-        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId());
+        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id());
         ProximityPlacementGroupInner plgInner =
             manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name());
         if (plgInner == null) {
@@ -135,7 +135,7 @@ public AvailabilitySetImpl withSku(AvailabilitySetSkuTypes skuType) {
 
     @Override
     public AvailabilitySetImpl withProximityPlacementGroup(String proximityPlacementGroupId) {
-        this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId));
+        this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId));
         this.newProximityPlacementGroupType = null;
         this.newProximityPlacementGroupName = null;
         return this;
@@ -190,7 +190,7 @@ private Mono<AvailabilitySetImpl> createNewProximityPlacementGroupAsync() {
             if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) {
                 ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner();
                 plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType);
-                plgInner.setLocation(this.inner().getLocation());
+                plgInner.withLocation(this.inner().location());
                 return this
                     .manager()
                     .inner()
@@ -198,7 +198,7 @@ private Mono<AvailabilitySetImpl> createNewProximityPlacementGroupAsync() {
                     .createOrUpdateAsync(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner)
                     .map(
                         createdPlgInner -> {
-                            this.inner().withProximityPlacementGroup(new SubResource().setId(createdPlgInner.getId()));
+                            this.inner().withProximityPlacementGroup(new SubResource().withId(createdPlgInner.id()));
                             return this;
                         });
             }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java
index 0b2af4512a4a..5a9382b768c1 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java
@@ -71,6 +71,6 @@ protected AvailabilitySetImpl wrapModel(AvailabilitySetInner availabilitySetInne
         if (availabilitySetInner == null) {
             return null;
         }
-        return new AvailabilitySetImpl(availabilitySetInner.getName(), availabilitySetInner, this.manager());
+        return new AvailabilitySetImpl(availabilitySetInner.name(), availabilitySetInner, this.manager());
     }
 }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java
index c50f690976bd..d2cd4a7fa8f1 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java
@@ -47,19 +47,19 @@ public CustomImageDataDiskImpl fromVhd(String sourceVhdUrl) {
 
     @Override
     public CustomImageDataDiskImpl fromSnapshot(String sourceSnapshotId) {
-        this.inner().withSnapshot(new SubResource().setId(sourceSnapshotId));
+        this.inner().withSnapshot(new SubResource().withId(sourceSnapshotId));
         return this;
     }
 
     @Override
     public CustomImageDataDiskImpl fromManagedDisk(String sourceManagedDiskId) {
-        this.inner().withManagedDisk(new SubResource().setId(sourceManagedDiskId));
+        this.inner().withManagedDisk(new SubResource().withId(sourceManagedDiskId));
         return this;
     }
 
     @Override
     public CustomImageDataDiskImpl fromManagedDisk(Disk sourceManagedDisk) {
-        this.inner().withManagedDisk(new SubResource().setId(sourceManagedDisk.id()));
+        this.inner().withManagedDisk(new SubResource().withId(sourceManagedDisk.id()));
         return this;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java
index 5ca4bb40aaf4..2bd5f52307f6 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java
@@ -56,7 +56,7 @@ protected DiskImpl wrapModel(DiskInner inner) {
         if (inner == null) {
             return null;
         }
-        return new DiskImpl(inner.getName(), inner, this.manager());
+        return new DiskImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java
index f902922d9f53..e4a7a9aabbdd 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java
@@ -64,7 +64,7 @@ DiskEncryptionSettings storageProfileEncryptionSettings() {
                 keyEncryptionKey = new KeyVaultKeyReference();
                 keyEncryptionKey.withKeyUrl(config.keyEncryptionKeyUrl());
                 if (config.keyEncryptionKeyVaultId() != null) {
-                    keyEncryptionKey.withSourceVault(new SubResource().setId(config.keyEncryptionKeyVaultId()));
+                    keyEncryptionKey.withSourceVault(new SubResource().withId(config.keyEncryptionKeyVaultId()));
                 }
             }
             DiskEncryptionSettings diskEncryptionSettings = new DiskEncryptionSettings();
@@ -73,7 +73,7 @@ DiskEncryptionSettings storageProfileEncryptionSettings() {
                 .withKeyEncryptionKey(keyEncryptionKey)
                 .withDiskEncryptionKey(new KeyVaultSecretReference())
                 .diskEncryptionKey()
-                .withSourceVault(new SubResource().setId(config.keyVaultId()));
+                .withSourceVault(new SubResource().withId(config.keyVaultId()));
             return diskEncryptionSettings;
         }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java
index 08b8bd99653c..ad25e03324d2 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java
@@ -97,7 +97,7 @@ public GalleryImpl define(String name) {
 
     @Override
     protected GalleryImpl wrapModel(GalleryInner inner) {
-        return new GalleryImpl(inner.getName(), inner, manager());
+        return new GalleryImpl(inner.name(), inner, manager());
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java
index e77a97c40d60..73234fdf4bd1 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java
@@ -47,14 +47,14 @@ class GalleryImageImpl extends CreatableUpdatableImpl<GalleryImage, GalleryImage
     }
 
     GalleryImageImpl(GalleryImageInner inner, ComputeManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.galleryImageName = inner.getName();
+        this.galleryImageName = inner.name();
         // resource ancestor names
-        this.resourceGroupName = getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.galleryName = getValueFromIdByName(inner.getId(), "galleries");
-        this.galleryImageName = getValueFromIdByName(inner.getId(), "images");
+        this.resourceGroupName = getValueFromIdByName(inner.id(), "resourceGroups");
+        this.galleryName = getValueFromIdByName(inner.id(), "galleries");
+        this.galleryImageName = getValueFromIdByName(inner.id(), "images");
         //
     }
 
@@ -123,7 +123,7 @@ protected Mono<GalleryImageInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -161,7 +161,7 @@ public String eula() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -171,12 +171,12 @@ public GalleryImageIdentifier identifier() {
 
     @Override
     public String location() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -216,12 +216,12 @@ public String releaseNoteUri() {
 
     @Override
     public Map<String, String> tags() {
-        return this.inner().getTags();
+        return this.inner().tags();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
@@ -240,13 +240,13 @@ public GalleryImageImpl withExistingGallery(Gallery gallery) {
 
     @Override
     public GalleryImageImpl withLocation(String location) {
-        this.inner().setLocation(location);
+        this.inner().withLocation(location);
         return this;
     }
 
     @Override
     public GalleryImageImpl withLocation(Region location) {
-        this.inner().setLocation(location.toString());
+        this.inner().withLocation(location.toString());
         return this;
     }
 
@@ -473,7 +473,7 @@ public GalleryImageImpl withReleaseNoteUri(String releaseNoteUri) {
 
     @Override
     public GalleryImageImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(tags);
+        this.inner().withTags(tags);
         return this;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java
index bf82f8b0e2c9..fd0a538a061c 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java
@@ -42,15 +42,15 @@ class GalleryImageVersionImpl
     }
 
     GalleryImageVersionImpl(GalleryImageVersionInner inner, ComputeManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.galleryImageVersionName = inner.getName();
+        this.galleryImageVersionName = inner.name();
         // resource ancestor names
-        this.resourceGroupName = getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.galleryName = getValueFromIdByName(inner.getId(), "galleries");
-        this.galleryImageName = getValueFromIdByName(inner.getId(), "images");
-        this.galleryImageVersionName = getValueFromIdByName(inner.getId(), "versions");
+        this.resourceGroupName = getValueFromIdByName(inner.id(), "resourceGroups");
+        this.galleryName = getValueFromIdByName(inner.id(), "galleries");
+        this.galleryImageName = getValueFromIdByName(inner.id(), "images");
+        this.galleryImageVersionName = getValueFromIdByName(inner.id(), "versions");
         //
     }
 
@@ -97,22 +97,22 @@ protected Mono<GalleryImageVersionInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String location() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -170,12 +170,12 @@ public GalleryImageVersionStorageProfile storageProfile() {
 
     @Override
     public Map<String, String> tags() {
-        return this.inner().getTags();
+        return this.inner().tags();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
@@ -189,13 +189,13 @@ public GalleryImageVersionImpl withExistingImage(
 
     @Override
     public GalleryImageVersionImpl withLocation(String location) {
-        this.inner().setLocation(location);
+        this.inner().withLocation(location);
         return this;
     }
 
     @Override
     public DefinitionStages.WithSource withLocation(Region location) {
-        this.inner().setLocation(location.toString());
+        this.inner().withLocation(location.toString());
         return this;
     }
 
@@ -349,7 +349,7 @@ public GalleryImageVersionImpl withoutExcludedFromLatest() {
 
     @Override
     public GalleryImageVersionImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(tags);
+        this.inner().withTags(tags);
         return this;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java
index 29329753a469..7e79c6c46b0e 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java
@@ -43,7 +43,7 @@ protected Mono<GalleryInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java
index fb89a06f1ffd..33fd0bb3d49b 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java
@@ -116,7 +116,7 @@ private Mono<VirtualMachineExtensionInner> retrieveExtensionWithInstanceViewAsyn
         return computeManager
             .inner()
             .virtualMachineExtensions()
-            .getAsync(rgName, vmName, extension.getName(), "instanceView")
+            .getAsync(rgName, vmName, extension.name(), "instanceView")
             .onErrorResume(e -> Mono.empty());
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java
index 95ea67146c66..861cc12918a1 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java
@@ -43,7 +43,7 @@ public List<String> availabilitySetIds() {
 
     @Override
     public String location() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -53,7 +53,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -68,7 +68,7 @@ private List<String> getStringListFromSubResourceList(List<SubResource> subList)
             stringList = new ArrayList<>();
             Iterator<SubResource> iter = subList.iterator();
             while (iter.hasNext()) {
-                stringList.add(iter.next().getId());
+                stringList.add(iter.next().id());
             }
         }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java
index aaa6b5b280a3..86e941e0678d 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java
@@ -86,16 +86,16 @@ public Mono<DiskVolumeEncryptionMonitor> refreshAsync() {
                             self.resolvedEncryptionMonitor =
                                 (osType() == OperatingSystemTypes.LINUX)
                                     ? new LinuxDiskVolumeNoAADEncryptionMonitorImpl(
-                                        virtualMachine.getId(), computeManager)
+                                        virtualMachine.id(), computeManager)
                                     : new WindowsVolumeNoAADEncryptionMonitorImpl(
-                                        virtualMachine.getId(), computeManager);
+                                        virtualMachine.id(), computeManager);
                         } else {
                             self.resolvedEncryptionMonitor =
                                 (osType() == OperatingSystemTypes.LINUX)
                                     ? new LinuxDiskVolumeLegacyEncryptionMonitorImpl(
-                                        virtualMachine.getId(), computeManager)
+                                        virtualMachine.id(), computeManager)
                                     : new WindowsVolumeLegacyEncryptionMonitorImpl(
-                                        virtualMachine.getId(), computeManager);
+                                        virtualMachine.id(), computeManager);
                         }
                         return self.resolvedEncryptionMonitor.refreshAsync();
                     })
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java
index 2aec864b7110..36cc5d90e4d9 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java
@@ -58,7 +58,7 @@ protected SnapshotImpl wrapModel(SnapshotInner inner) {
         if (inner == null) {
             return null;
         }
-        return new SnapshotImpl(inner.getName(), inner, this.manager());
+        return new SnapshotImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java
index 8b9c50b385cf..3ed371b9cef9 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java
@@ -27,7 +27,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s
         updateParameter.withPlan(scaleSet.inner().plan());
         updateParameter.withSinglePlacementGroup(scaleSet.inner().singlePlacementGroup());
         updateParameter.withSku(scaleSet.inner().sku());
-        updateParameter.withTags(scaleSet.inner().getTags());
+        updateParameter.withTags(scaleSet.inner().tags());
         updateParameter.withUpgradePolicy(scaleSet.inner().upgradePolicy());
         updateParameter.withAdditionalCapabilities(scaleSet.inner().additionalCapabilities());
         //
@@ -103,7 +103,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s
                         nicPatchConfig.withName(nicConfig.name());
                         nicPatchConfig.withNetworkSecurityGroup(nicConfig.networkSecurityGroup());
                         nicPatchConfig.withPrimary(nicConfig.primary());
-                        nicPatchConfig.setId(nicConfig.getId());
+                        nicPatchConfig.withId(nicConfig.id());
                         if (nicConfig.ipConfigurations() != null) {
                             nicPatchConfig
                                 .withIpConfigurations(new ArrayList<VirtualMachineScaleSetUpdateIPConfiguration>());
@@ -120,7 +120,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s
                                 patchIpConfig.withPrimary(ipConfig.primary());
                                 patchIpConfig.withPrivateIPAddressVersion(ipConfig.privateIPAddressVersion());
                                 patchIpConfig.withSubnet(ipConfig.subnet());
-                                patchIpConfig.setId(ipConfig.getId());
+                                patchIpConfig.withId(ipConfig.id());
                                 if (ipConfig.publicIPAddressConfiguration() != null) {
                                     patchIpConfig
                                         .withPublicIPAddressConfiguration(
@@ -141,7 +141,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s
                                     for (SubResource asg : ipConfig.applicationSecurityGroups()) {
                                         patchIpConfig
                                             .applicationSecurityGroups()
-                                            .add(new SubResource().setId(asg.getId()));
+                                            .add(new SubResource().withId(asg.id()));
                                     }
                                 }
                                 nicPatchConfig.ipConfigurations().add(patchIpConfig);
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java
index 7c78629bec8d..2e0d9b76d281 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java
@@ -51,7 +51,7 @@ public String sourceVirtualMachineId() {
         if (this.inner().sourceVirtualMachine() == null) {
             return null;
         }
-        return this.inner().sourceVirtualMachine().getId();
+        return this.inner().sourceVirtualMachine().id();
     }
 
     @Override
@@ -76,7 +76,7 @@ public Map<Integer, ImageDataDisk> dataDiskImages() {
 
     @Override
     public VirtualMachineCustomImageImpl fromVirtualMachine(String virtualMachineId) {
-        this.inner().withSourceVirtualMachine(new SubResource().setId(virtualMachineId));
+        this.inner().withSourceVirtualMachine(new SubResource().withId(virtualMachineId));
         return this;
     }
 
@@ -108,7 +108,7 @@ public VirtualMachineCustomImageImpl withWindowsFromSnapshot(
             .ensureOsDiskImage()
             .withOsState(osState)
             .withOsType(OperatingSystemTypes.WINDOWS)
-            .withSnapshot(new SubResource().setId(sourceSnapshotId));
+            .withSnapshot(new SubResource().withId(sourceSnapshotId));
         return this;
     }
 
@@ -119,7 +119,7 @@ public VirtualMachineCustomImageImpl withLinuxFromSnapshot(
             .ensureOsDiskImage()
             .withOsState(osState)
             .withOsType(OperatingSystemTypes.LINUX)
-            .withSnapshot(new SubResource().setId(sourceSnapshotId));
+            .withSnapshot(new SubResource().withId(sourceSnapshotId));
 
         return this;
     }
@@ -143,7 +143,7 @@ public VirtualMachineCustomImageImpl withWindowsFromDisk(
             .ensureOsDiskImage()
             .withOsState(osState)
             .withOsType(OperatingSystemTypes.WINDOWS)
-            .withManagedDisk(new SubResource().setId(sourceManagedDiskId));
+            .withManagedDisk(new SubResource().withId(sourceManagedDiskId));
         return this;
     }
 
@@ -154,7 +154,7 @@ public VirtualMachineCustomImageImpl withLinuxFromDisk(
             .ensureOsDiskImage()
             .withOsState(osState)
             .withOsType(OperatingSystemTypes.LINUX)
-            .withManagedDisk(new SubResource().setId(sourceManagedDiskId));
+            .withManagedDisk(new SubResource().withId(sourceManagedDiskId));
         return this;
     }
 
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java
index 23f95d694ae8..265d366bfaee 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java
@@ -29,7 +29,7 @@ protected VirtualMachineCustomImageImpl wrapModel(ImageInner inner) {
         if (inner == null) {
             return null;
         }
-        return new VirtualMachineCustomImageImpl(inner.getName(), inner, this.manager());
+        return new VirtualMachineCustomImageImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java
index d2a7a3dbaf6e..1cbd302fe4e0 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java
@@ -51,7 +51,7 @@ public String id() {
         if (this.inner().managedDisk() == null) {
             return null;
         }
-        return this.inner().managedDisk().getId();
+        return this.inner().managedDisk().id();
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
index 7bab06f80ac5..27eb6a92b08d 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
@@ -22,12 +22,12 @@ class VirtualMachineExtensionImageImpl extends WrapperImpl<VirtualMachineExtensi
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
index ff901cf1f95f..4569b9bd99bd 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
@@ -26,17 +26,17 @@ class VirtualMachineExtensionImageTypeImpl extends WrapperImpl<VirtualMachineExt
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
index 4516128f1f9e..5ea538d57b0c 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
@@ -27,17 +27,17 @@ class VirtualMachineExtensionImageVersionImpl extends WrapperImpl<VirtualMachine
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImpl.java
index 8365dec45532..59fee07e1816 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImpl.java
@@ -42,14 +42,14 @@ class VirtualMachineExtensionImpl
     protected static VirtualMachineExtensionImpl newVirtualMachineExtension(
         String name, VirtualMachineImpl parent, VirtualMachineExtensionsInner client) {
         VirtualMachineExtensionInner inner = new VirtualMachineExtensionInner();
-        inner.setLocation(parent.regionName());
+        inner.withLocation(parent.regionName());
         VirtualMachineExtensionImpl extension = new VirtualMachineExtensionImpl(name, parent, inner, client);
         return extension;
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -98,7 +98,7 @@ public Mono<VirtualMachineExtensionInstanceView> getInstanceViewAsync() {
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new TreeMap<>();
         }
@@ -178,23 +178,23 @@ public VirtualMachineExtensionImpl withVersion(String extensionImageVersionName)
 
     @Override
     public final VirtualMachineExtensionImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return this;
     }
 
     @Override
     public final VirtualMachineExtensionImpl withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return this;
     }
 
     @Override
     public final VirtualMachineExtensionImpl withoutTag(String key) {
-        if (this.inner().getTags() != null) {
-            this.inner().getTags().remove(key);
+        if (this.inner().tags() != null) {
+            this.inner().tags().remove(key);
         }
         return this;
     }
@@ -209,9 +209,9 @@ public VirtualMachineImpl attach() {
     protected Mono<VirtualMachineExtensionInner> getInnerAsync() {
         String name;
         if (this.isReference()) {
-            name = ResourceUtils.nameFromResourceId(this.inner().getId());
+            name = ResourceUtils.nameFromResourceId(this.inner().id());
         } else {
-            name = this.inner().getName();
+            name = this.inner().name();
         }
         return this.client.getAsync(this.parent().resourceGroupName(), this.parent().name(), name);
     }
@@ -235,7 +235,7 @@ public Mono<VirtualMachineExtension> createResourceAsync() {
     public Mono<VirtualMachineExtension> updateResourceAsync() {
         this.nullifySettingsIfEmpty();
         if (this.isReference()) {
-            String extensionName = ResourceUtils.nameFromResourceId(this.inner().getId());
+            String extensionName = ResourceUtils.nameFromResourceId(this.inner().id());
             return this
                 .client
                 .getAsync(this.parent().resourceGroupName(), this.parent().name(), extensionName)
@@ -281,7 +281,7 @@ public Mono<Void> deleteResourceAsync() {
      *     on a specific VM will return fully expanded extension details.
      */
     public boolean isReference() {
-        return this.inner().getName() == null;
+        return this.inner().name() == null;
     }
 
     // Helper methods
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java
index 79bcb3bd7d18..fc5c5da3b070 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java
@@ -116,17 +116,17 @@ protected List<VirtualMachineExtensionImpl> listChildResources() {
         List<VirtualMachineExtensionImpl> childResources = new ArrayList<>();
         if (getParent().inner().resources() != null) {
             for (VirtualMachineExtensionInner inner : getParent().inner().resources()) {
-                if (inner.getName() == null) {
+                if (inner.name() == null) {
                     // This extension exists in the parent VM extension collection as a reference id.
-                    inner.setLocation(getParent().regionName());
+                    inner.withLocation(getParent().regionName());
                     childResources
                         .add(
                             new VirtualMachineExtensionImpl(
-                                ResourceUtils.nameFromResourceId(inner.getId()), this.getParent(), inner, this.client));
+                                ResourceUtils.nameFromResourceId(inner.id()), this.getParent(), inner, this.client));
                 } else {
                     // This extension exists in the parent VM as a fully blown object
                     childResources
-                        .add(new VirtualMachineExtensionImpl(inner.getName(), this.getParent(), inner, this.client));
+                        .add(new VirtualMachineExtensionImpl(inner.name(), this.getParent(), inner, this.client));
                 }
             }
         }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java
index d61088a9809c..0e6cb0f61e5e 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java
@@ -50,7 +50,7 @@ public String id() {
         if (this.inner() == null) {
             return null;
         }
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
index 83939d07ba78..ab623fcc926d 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
@@ -606,7 +606,7 @@ public VirtualMachineImpl withLatestLinuxImage(String publisher, String offer, S
     @Override
     public VirtualMachineImpl withWindowsCustomImage(String customImageId) {
         ImageReference imageReferenceInner = new ImageReference();
-        imageReferenceInner.setId(customImageId);
+        imageReferenceInner.withId(customImageId);
         this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.FROM_IMAGE);
         this.inner().storageProfile().withImageReference(imageReferenceInner);
         this.inner().osProfile().withWindowsConfiguration(new WindowsConfiguration());
@@ -624,7 +624,7 @@ public VirtualMachineImpl withWindowsGalleryImageVersion(String galleryImageVers
     @Override
     public VirtualMachineImpl withLinuxCustomImage(String customImageId) {
         ImageReference imageReferenceInner = new ImageReference();
-        imageReferenceInner.setId(customImageId);
+        imageReferenceInner.withId(customImageId);
         this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.FROM_IMAGE);
         this.inner().storageProfile().withImageReference(imageReferenceInner);
         this.inner().osProfile().withLinuxConfiguration(new LinuxConfiguration());
@@ -651,7 +651,7 @@ public VirtualMachineImpl withSpecializedOSUnmanagedDisk(String osDiskUrl, Opera
     @Override
     public VirtualMachineImpl withSpecializedOSDisk(Disk disk, OperatingSystemTypes osType) {
         ManagedDiskParameters diskParametersInner = new ManagedDiskParameters();
-        diskParametersInner.setId(disk.id());
+        diskParametersInner.withId(disk.id());
         this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.ATTACH);
         this.inner().storageProfile().osDisk().withManagedDisk(diskParametersInner);
         this.inner().storageProfile().osDisk().withOsType(osType);
@@ -967,7 +967,7 @@ public VirtualMachineImpl withNewDataDisk(
     public VirtualMachineImpl withExistingDataDisk(Disk disk) {
         throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED);
         ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters();
-        managedDiskParameters.setId(disk.id());
+        managedDiskParameters.withId(disk.id());
         this
             .managedDataDisks
             .existingDisksToAttach
@@ -979,7 +979,7 @@ public VirtualMachineImpl withExistingDataDisk(Disk disk) {
     public VirtualMachineImpl withExistingDataDisk(Disk disk, int lun, CachingTypes cachingType) {
         throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED);
         ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters();
-        managedDiskParameters.setId(disk.id());
+        managedDiskParameters.withId(disk.id());
         this
             .managedDataDisks
             .existingDisksToAttach
@@ -991,7 +991,7 @@ public VirtualMachineImpl withExistingDataDisk(Disk disk, int lun, CachingTypes
     public VirtualMachineImpl withExistingDataDisk(Disk disk, int newSizeInGB, int lun, CachingTypes cachingType) {
         throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED);
         ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters();
-        managedDiskParameters.setId(disk.id());
+        managedDiskParameters.withId(disk.id());
         this
             .managedDataDisks
             .existingDisksToAttach
@@ -1086,7 +1086,7 @@ public VirtualMachineImpl withNewAvailabilitySet(Creatable<AvailabilitySet> crea
 
     @Override
     public VirtualMachineImpl withProximityPlacementGroup(String proximityPlacementGroupId) {
-        this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId));
+        this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId));
         // clear the new setting
         newProximityPlacementGroupName = null;
         return this;
@@ -1158,7 +1158,7 @@ public VirtualMachineImpl withoutSecondaryNetworkInterface(String name) {
             for (NetworkInterfaceReference nicReference : this.inner().networkProfile().networkInterfaces()) {
                 idx++;
                 if (!nicReference.primary()
-                    && name.equalsIgnoreCase(ResourceUtils.nameFromResourceId(nicReference.getId()))) {
+                    && name.equalsIgnoreCase(ResourceUtils.nameFromResourceId(nicReference.id()))) {
                     this.inner().networkProfile().networkInterfaces().remove(idx);
                     break;
                 }
@@ -1401,7 +1401,7 @@ public String osDiskId() {
         if (!isManagedDiskEnabled()) {
             return null;
         }
-        return this.storageProfile().osDisk().managedDisk().getId();
+        return this.storageProfile().osDisk().managedDisk().id();
     }
 
     @Override
@@ -1448,7 +1448,7 @@ public String getPrimaryPublicIPAddressId() {
     public List<String> networkInterfaceIds() {
         List<String> nicIds = new ArrayList<>();
         for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) {
-            nicIds.add(nicRef.getId());
+            nicIds.add(nicRef.id());
         }
         return nicIds;
     }
@@ -1459,7 +1459,7 @@ public String primaryNetworkInterfaceId() {
         String primaryNicRefId = null;
         if (nicRefs.size() == 1) {
             // One NIC so assume it to be primary
-            primaryNicRefId = nicRefs.get(0).getId();
+            primaryNicRefId = nicRefs.get(0).id();
         } else if (nicRefs.size() == 0) {
             // No NICs so null
             primaryNicRefId = null;
@@ -1467,13 +1467,13 @@ public String primaryNetworkInterfaceId() {
             // Find primary interface as flagged by Azure
             for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) {
                 if (nicRef.primary() != null && nicRef.primary()) {
-                    primaryNicRefId = nicRef.getId();
+                    primaryNicRefId = nicRef.id();
                     break;
                 }
             }
             // If Azure didn't flag any NIC as primary then assume the first one
             if (primaryNicRefId == null) {
-                primaryNicRefId = nicRefs.get(0).getId();
+                primaryNicRefId = nicRefs.get(0).id();
             }
         }
         return primaryNicRefId;
@@ -1482,7 +1482,7 @@ public String primaryNetworkInterfaceId() {
     @Override
     public String availabilitySetId() {
         if (inner().availabilitySet() != null) {
-            return inner().availabilitySet().getId();
+            return inner().availabilitySet().id();
         }
         return null;
     }
@@ -1499,7 +1499,7 @@ public String licenseType() {
 
     @Override
     public ProximityPlacementGroup proximityPlacementGroup() {
-        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId());
+        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id());
         ProximityPlacementGroupInner plgInner =
             manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name());
         if (plgInner == null) {
@@ -1723,7 +1723,7 @@ public Mono<VirtualMachine> updateResourceAsync() {
         updateParameter.withAvailabilitySet(this.inner().availabilitySet());
         updateParameter.withLicenseType(this.inner().licenseType());
         updateParameter.withZones(this.inner().zones());
-        updateParameter.withTags(this.inner().getTags());
+        updateParameter.withTags(this.inner().tags());
         updateParameter.withProximityPlacementGroup(this.inner().proximityPlacementGroup());
         updateParameter.withPriority(this.inner().priority());
         this.virtualMachineMsiHandler.handleExternalIdentities(updateParameter);
@@ -1945,7 +1945,7 @@ private Mono<VirtualMachineImpl> createNewProximityPlacementGroupAsync() {
             if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) {
                 ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner();
                 plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType);
-                plgInner.setLocation(this.inner().getLocation());
+                plgInner.withLocation(this.inner().location());
                 return this
                     .manager()
                     .inner()
@@ -1953,7 +1953,7 @@ private Mono<VirtualMachineImpl> createNewProximityPlacementGroupAsync() {
                     .createOrUpdateAsync(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner)
                     .map(
                         createdPlgInner -> {
-                            this.inner().withProximityPlacementGroup(new SubResource().setId(createdPlgInner.getId()));
+                            this.inner().withProximityPlacementGroup(new SubResource().withId(createdPlgInner.id()));
                             return this;
                         });
             }
@@ -1973,7 +1973,7 @@ private void handleNetworkSettings() {
             if (primaryNetworkInterface != null) {
                 NetworkInterfaceReference nicReference = new NetworkInterfaceReference();
                 nicReference.withPrimary(true);
-                nicReference.setId(primaryNetworkInterface.id());
+                nicReference.withId(primaryNetworkInterface.id());
                 this.inner().networkProfile().networkInterfaces().add(nicReference);
             }
         }
@@ -1985,14 +1985,14 @@ private void handleNetworkSettings() {
                 this.taskResult(creatableSecondaryNetworkInterfaceKey);
             NetworkInterfaceReference nicReference = new NetworkInterfaceReference();
             nicReference.withPrimary(false);
-            nicReference.setId(secondaryNetworkInterface.id());
+            nicReference.withId(secondaryNetworkInterface.id());
             this.inner().networkProfile().networkInterfaces().add(nicReference);
         }
 
         for (NetworkInterface secondaryNetworkInterface : this.existingSecondaryNetworkInterfacesToAssociate) {
             NetworkInterfaceReference nicReference = new NetworkInterfaceReference();
             nicReference.withPrimary(false);
-            nicReference.setId(secondaryNetworkInterface.id());
+            nicReference.withId(secondaryNetworkInterface.id());
             this.inner().networkProfile().networkInterfaces().add(nicReference);
         }
     }
@@ -2014,7 +2014,7 @@ private void handleAvailabilitySettings() {
                 this.inner().withAvailabilitySet(new SubResource());
             }
 
-            this.inner().availabilitySet().setId(availabilitySet.id());
+            this.inner().availabilitySet().withId(availabilitySet.id());
         }
     }
 
@@ -2086,7 +2086,7 @@ private boolean isOSDiskAttachedUnmanaged(OSDisk osDisk) {
     private boolean isOSDiskAttachedManaged(OSDisk osDisk) {
         return osDisk.createOption() == DiskCreateOptionTypes.ATTACH
             && osDisk.managedDisk() != null
-            && osDisk.managedDisk().getId() != null;
+            && osDisk.managedDisk().id() != null;
     }
 
     /**
@@ -2125,7 +2125,7 @@ private boolean isOSDiskFromPlatformImage(StorageProfile storageProfile) {
      */
     private boolean isOsDiskFromCustomImage(StorageProfile storageProfile) {
         ImageReference imageReference = storageProfile.imageReference();
-        return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.getId() != null;
+        return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.id() != null;
     }
 
     /**
@@ -2218,7 +2218,7 @@ public String principalId() {
             @Override
             public String resourceId() {
                 if (inner() != null) {
-                    return inner().getId();
+                    return inner().id();
                 } else {
                     return null;
                 }
@@ -2340,7 +2340,7 @@ private void setAttachableNewDataDisks(Callable<Integer> nextLun) throws Excepti
                     dataDisk.withLun(nextLun.call());
                 }
                 dataDisk.withManagedDisk(new ManagedDiskParameters());
-                dataDisk.managedDisk().setId(managedDisk.id());
+                dataDisk.managedDisk().withId(managedDisk.id());
                 if (dataDisk.caching() == null) {
                     dataDisk.withCaching(getDefaultCachingType());
                 }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
index c0d465643607..79777d02e29f 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
@@ -366,7 +366,7 @@ public int capacity() {
 
     @Override
     public Network getPrimaryNetwork() throws IOException {
-        String subnetId = primaryNicDefaultIPConfiguration().subnet().getId();
+        String subnetId = primaryNicDefaultIPConfiguration().subnet().id();
         String virtualNetworkId = ResourceUtils.parentResourceIdFromResourceId(subnetId);
         return this.networkManager.networks().getById(virtualNetworkId);
     }
@@ -515,7 +515,7 @@ public boolean isAcceleratedNetworkingEnabled() {
     public String networkSecurityGroupId() {
         VirtualMachineScaleSetNetworkConfiguration nicConfig = primaryNicConfiguration();
         if (nicConfig.networkSecurityGroup() != null) {
-            return nicConfig.networkSecurityGroup().getId();
+            return nicConfig.networkSecurityGroup().id();
         } else {
             return null;
         }
@@ -537,7 +537,7 @@ public List<String> applicationGatewayBackendAddressPoolsIds() {
         List<String> result = new ArrayList<>();
         if (backendPools != null) {
             for (SubResource backendPool : backendPools) {
-                result.add(backendPool.getId());
+                result.add(backendPool.id());
             }
         }
         return result;
@@ -549,7 +549,7 @@ public List<String> applicationSecurityGroupIds() {
         List<String> asgIds = new ArrayList<>();
         if (nicIpConfig.applicationSecurityGroups() != null) {
             for (SubResource asg : nicIpConfig.applicationSecurityGroups()) {
-                asgIds.add(asg.getId());
+                asgIds.add(asg.id());
             }
         }
         return asgIds;
@@ -562,7 +562,7 @@ public Boolean doNotRunExtensionsOnOverprovisionedVMs() {
 
     @Override
     public ProximityPlacementGroup proximityPlacementGroup() {
-        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId());
+        ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id());
         ProximityPlacementGroupInner plgInner =
             manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name());
         if (plgInner == null) {
@@ -713,7 +713,7 @@ public VirtualMachineScaleSetImpl withExistingPrimaryInternalLoadBalancer(LoadBa
                 this.primaryInternalLoadBalancer, this.primaryNicDefaultIPConfiguration());
         } else {
             String vmNicVnetId =
-                ResourceUtils.parentResourceIdFromResourceId(primaryNicDefaultIPConfiguration().subnet().getId());
+                ResourceUtils.parentResourceIdFromResourceId(primaryNicDefaultIPConfiguration().subnet().id());
             if (!vmNicVnetId.equalsIgnoreCase(lbNetworkId)) {
                 throw logger.logExceptionAsError(new IllegalArgumentException(
                     "Virtual network associated with scale set virtual machines"
@@ -827,7 +827,7 @@ public VirtualMachineScaleSetImpl withSpecificWindowsImageVersion(ImageReference
     @Override
     public VirtualMachineScaleSetImpl withWindowsCustomImage(String customImageId) {
         ImageReference imageReferenceInner = new ImageReference();
-        imageReferenceInner.setId(customImageId);
+        imageReferenceInner.withId(customImageId);
         this
             .inner()
             .virtualMachineProfile()
@@ -891,7 +891,7 @@ public VirtualMachineScaleSetImpl withSpecificLinuxImageVersion(ImageReference i
     @Override
     public VirtualMachineScaleSetImpl withLinuxCustomImage(String customImageId) {
         ImageReference imageReferenceInner = new ImageReference();
-        imageReferenceInner.setId(customImageId);
+        imageReferenceInner.withId(customImageId);
         this
             .inner()
             .virtualMachineProfile()
@@ -1907,12 +1907,12 @@ private Mono<VirtualMachineScaleSetImpl> loadCurrentPrimaryLoadBalancersIfAvaila
         VirtualMachineScaleSetIPConfiguration ipConfig = primaryNicDefaultIPConfiguration();
         if (!ipConfig.loadBalancerBackendAddressPools().isEmpty()) {
             firstLoadBalancerId =
-                ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerBackendAddressPools().get(0).getId());
+                ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerBackendAddressPools().get(0).id());
         }
 
         if (firstLoadBalancerId == null && !ipConfig.loadBalancerInboundNatPools().isEmpty()) {
             firstLoadBalancerId =
-                ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerInboundNatPools().get(0).getId());
+                ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerInboundNatPools().get(0).id());
         }
 
         if (firstLoadBalancerId == null) {
@@ -1944,18 +1944,18 @@ private Mono<VirtualMachineScaleSetImpl> loadCurrentPrimaryLoadBalancersIfAvaila
 
         String secondLoadBalancerId = null;
         for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) {
-            if (!subResource.getId().toLowerCase(Locale.ROOT)
+            if (!subResource.id().toLowerCase(Locale.ROOT)
                     .startsWith(firstLoadBalancerId.toLowerCase(Locale.ROOT))) {
-                secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.getId());
+                secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.id());
                 break;
             }
         }
 
         if (secondLoadBalancerId == null) {
             for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) {
-                if (!subResource.getId().toLowerCase(Locale.ROOT)
+                if (!subResource.id().toLowerCase(Locale.ROOT)
                         .startsWith(firstLoadBalancerId.toLowerCase(Locale.ROOT))) {
-                    secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.getId());
+                    secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.id());
                     break;
                 }
             }
@@ -2028,13 +2028,13 @@ private static void associateBackEndsToIpConfiguration(
             String backendPoolId = mergePath(loadBalancerId, "backendAddressPools", backendName);
             boolean found = false;
             for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) {
-                if (subResource.getId().equalsIgnoreCase(backendPoolId)) {
+                if (subResource.id().equalsIgnoreCase(backendPoolId)) {
                     found = true;
                     break;
                 }
             }
             if (!found) {
-                backendSubResourcesToAssociate.add(new SubResource().setId(backendPoolId));
+                backendSubResourcesToAssociate.add(new SubResource().withId(backendPoolId));
             }
         }
 
@@ -2050,13 +2050,13 @@ private static void associateInboundNATPoolsToIpConfiguration(
             String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", inboundNatPool);
             boolean found = false;
             for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) {
-                if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) {
+                if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) {
                     found = true;
                     break;
                 }
             }
             if (!found) {
-                inboundNatPoolSubResourcesToAssociate.add(new SubResource().setId(inboundNatPoolId));
+                inboundNatPoolSubResourcesToAssociate.add(new SubResource().withId(inboundNatPoolId));
             }
         }
 
@@ -2073,7 +2073,7 @@ private static Map<String, LoadBalancerBackend> getBackendsAssociatedWithIpConfi
         for (LoadBalancerBackend lbBackend : lbBackends.values()) {
             String backendId = mergePath(loadBalancerId, "backendAddressPools", lbBackend.name());
             for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) {
-                if (subResource.getId().equalsIgnoreCase(backendId)) {
+                if (subResource.id().equalsIgnoreCase(backendId)) {
                     attachedBackends.put(lbBackend.name(), lbBackend);
                 }
             }
@@ -2089,7 +2089,7 @@ private static Map<String, LoadBalancerInboundNatPool> getInboundNatPoolsAssocia
         for (LoadBalancerInboundNatPool lbInboundNatPool : lbInboundNatPools.values()) {
             String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", lbInboundNatPool.name());
             for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) {
-                if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) {
+                if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) {
                     attachedInboundNatPools.put(lbInboundNatPool.name(), lbInboundNatPool);
                 }
             }
@@ -2130,7 +2130,7 @@ private static void removeAllBackendAssociationFromIpConfiguration(
         LoadBalancer loadBalancer, VirtualMachineScaleSetIPConfiguration ipConfig) {
         List<SubResource> toRemove = new ArrayList<>();
         for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) {
-            if (subResource.getId().toLowerCase(Locale.ROOT)
+            if (subResource.id().toLowerCase(Locale.ROOT)
                     .startsWith(loadBalancer.id().toLowerCase(Locale.ROOT) + "/")) {
                 toRemove.add(subResource);
             }
@@ -2145,7 +2145,7 @@ private static void removeAllInboundNatPoolAssociationFromIpConfiguration(
         LoadBalancer loadBalancer, VirtualMachineScaleSetIPConfiguration ipConfig) {
         List<SubResource> toRemove = new ArrayList<>();
         for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) {
-            if (subResource.getId().toLowerCase(Locale.ROOT)
+            if (subResource.id().toLowerCase(Locale.ROOT)
                     .startsWith(loadBalancer.id().toLowerCase(Locale.ROOT) + "/")) {
                 toRemove.add(subResource);
             }
@@ -2162,7 +2162,7 @@ private static void removeBackendsFromIpConfiguration(
         for (String backendName : backendNames) {
             String backendPoolId = mergePath(loadBalancerId, "backendAddressPools", backendName);
             for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) {
-                if (subResource.getId().equalsIgnoreCase(backendPoolId)) {
+                if (subResource.id().equalsIgnoreCase(backendPoolId)) {
                     toRemove.add(subResource);
                     break;
                 }
@@ -2180,7 +2180,7 @@ private static void removeInboundNatPoolsFromIpConfiguration(
         for (String natPoolName : inboundNatPoolNames) {
             String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", natPoolName);
             for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) {
-                if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) {
+                if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) {
                     toRemove.add(subResource);
                     break;
                 }
@@ -2232,7 +2232,7 @@ public String principalId() {
             @Override
             public String resourceId() {
                 if (inner() != null) {
-                    return inner().getId();
+                    return inner().id();
                 } else {
                     return null;
                 }
@@ -2288,7 +2288,7 @@ private boolean isOSDiskFromImage(VirtualMachineScaleSetOSDisk osDisk) {
      */
     private boolean isOsDiskFromCustomImage(VirtualMachineScaleSetStorageProfile storageProfile) {
         ImageReference imageReference = storageProfile.imageReference();
-        return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.getId() != null;
+        return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.id() != null;
     }
 
     /**
@@ -2458,14 +2458,14 @@ public VirtualMachineScaleSetImpl withoutIpForwarding() {
     @Override
     public VirtualMachineScaleSetImpl withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup) {
         VirtualMachineScaleSetNetworkConfiguration nicConfig = this.primaryNicConfiguration();
-        nicConfig.withNetworkSecurityGroup(new SubResource().setId(networkSecurityGroup.id()));
+        nicConfig.withNetworkSecurityGroup(new SubResource().withId(networkSecurityGroup.id()));
         return this;
     }
 
     @Override
     public VirtualMachineScaleSetImpl withExistingNetworkSecurityGroupId(String networkSecurityGroupId) {
         VirtualMachineScaleSetNetworkConfiguration nicConfig = this.primaryNicConfiguration();
-        nicConfig.withNetworkSecurityGroup(new SubResource().setId(networkSecurityGroupId));
+        nicConfig.withNetworkSecurityGroup(new SubResource().withId(networkSecurityGroupId));
         return this;
     }
 
@@ -2496,13 +2496,13 @@ public VirtualMachineScaleSetImpl withExistingApplicationGatewayBackendPool(Stri
         }
         boolean found = false;
         for (SubResource backendPool : nicIpConfig.applicationGatewayBackendAddressPools()) {
-            if (backendPool.getId().equalsIgnoreCase(backendPoolId)) {
+            if (backendPool.id().equalsIgnoreCase(backendPoolId)) {
                 found = true;
                 break;
             }
         }
         if (!found) {
-            nicIpConfig.applicationGatewayBackendAddressPools().add(new SubResource().setId(backendPoolId));
+            nicIpConfig.applicationGatewayBackendAddressPools().add(new SubResource().withId(backendPoolId));
         }
         return this;
     }
@@ -2517,7 +2517,7 @@ public VirtualMachineScaleSetImpl withoutApplicationGatewayBackendPool(String ba
             int index = -1;
             for (SubResource backendPool : nicIpConfig.applicationGatewayBackendAddressPools()) {
                 index = index + 1;
-                if (backendPool.getId().equalsIgnoreCase(backendPoolId)) {
+                if (backendPool.id().equalsIgnoreCase(backendPoolId)) {
                     foundIndex = index;
                     break;
                 }
@@ -2543,13 +2543,13 @@ public VirtualMachineScaleSetImpl withExistingApplicationSecurityGroupId(String
         }
         boolean found = false;
         for (SubResource asg : nicIpConfig.applicationSecurityGroups()) {
-            if (asg.getId().equalsIgnoreCase(applicationSecurityGroupId)) {
+            if (asg.id().equalsIgnoreCase(applicationSecurityGroupId)) {
                 found = true;
                 break;
             }
         }
         if (!found) {
-            nicIpConfig.applicationSecurityGroups().add(new SubResource().setId(applicationSecurityGroupId));
+            nicIpConfig.applicationSecurityGroups().add(new SubResource().withId(applicationSecurityGroupId));
         }
         return this;
     }
@@ -2564,7 +2564,7 @@ public VirtualMachineScaleSetImpl withoutApplicationSecurityGroup(String applica
             int index = -1;
             for (SubResource asg : nicIpConfig.applicationSecurityGroups()) {
                 index = index + 1;
-                if (asg.getId().equalsIgnoreCase(applicationSecurityGroupId)) {
+                if (asg.id().equalsIgnoreCase(applicationSecurityGroupId)) {
                     foundIndex = index;
                     break;
                 }
@@ -2578,7 +2578,7 @@ public VirtualMachineScaleSetImpl withoutApplicationSecurityGroup(String applica
 
     @Override
     public VirtualMachineScaleSetImpl withProximityPlacementGroup(String proximityPlacementGroupId) {
-        this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId));
+        this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId));
         this.newProximityPlacementGroupName = null;
         return this;
     }
@@ -2612,7 +2612,7 @@ private void createNewProximityPlacementGroup() {
             if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) {
                 ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner();
                 plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType);
-                plgInner.setLocation(this.inner().getLocation());
+                plgInner.withLocation(this.inner().location());
                 plgInner =
                     this
                         .manager()
@@ -2620,7 +2620,7 @@ private void createNewProximityPlacementGroup() {
                         .proximityPlacementGroups()
                         .createOrUpdate(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner);
 
-                this.inner().withProximityPlacementGroup((new SubResource().setId(plgInner.getId())));
+                this.inner().withProximityPlacementGroup((new SubResource().withId(plgInner.id())));
             }
         }
     }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java
index c8cd3bb7d045..548dd01fd40d 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java
@@ -91,17 +91,17 @@ class VirtualMachineScaleSetVMImpl
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -111,15 +111,15 @@ public Region region() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
     public Map<String, String> tags() {
-        if (this.inner().getTags() == null) {
+        if (this.inner().tags() == null) {
             return Collections.unmodifiableMap(new LinkedHashMap<>());
         }
-        return Collections.unmodifiableMap(this.inner().getTags());
+        return Collections.unmodifiableMap(this.inner().tags());
     }
 
     @Override
@@ -164,7 +164,7 @@ public boolean isOSBasedOnPlatformImage() {
     @Override
     public boolean isOSBasedOnCustomImage() {
         ImageReference imageReference = this.inner().storageProfile().imageReference();
-        if (imageReference != null && imageReference.getId() != null) {
+        if (imageReference != null && imageReference.id() != null) {
             return true;
         }
         return false;
@@ -207,7 +207,7 @@ public VirtualMachineImage getOSPlatformImage() {
     public VirtualMachineCustomImage getOSCustomImage() {
         if (this.isOSBasedOnCustomImage()) {
             ImageReference imageReference = this.inner().storageProfile().imageReference();
-            return this.computeManager.virtualMachineCustomImages().getById(imageReference.getId());
+            return this.computeManager.virtualMachineCustomImages().getById(imageReference.id());
         }
         return null;
     }
@@ -236,7 +236,7 @@ public String osUnmanagedDiskVhdUri() {
     @Override
     public String osDiskId() {
         if (this.storageProfile().osDisk().managedDisk() != null) {
-            return this.storageProfile().osDisk().managedDisk().getId();
+            return this.storageProfile().osDisk().managedDisk().id();
         }
         return null;
     }
@@ -346,7 +346,7 @@ public String bootDiagnosticStorageAccountUri() {
     @Override
     public String availabilitySetId() {
         if (this.inner().availabilitySet() != null) {
-            return this.inner().availabilitySet().getId();
+            return this.inner().availabilitySet().id();
         }
         return null;
     }
@@ -355,7 +355,7 @@ public String availabilitySetId() {
     public List<String> networkInterfaceIds() {
         List<String> resourceIds = new ArrayList<>();
         for (NetworkInterfaceReference reference : this.inner().networkProfile().networkInterfaces()) {
-            resourceIds.add(reference.getId());
+            resourceIds.add(reference.id());
         }
         return Collections.unmodifiableList(resourceIds);
     }
@@ -364,7 +364,7 @@ public List<String> networkInterfaceIds() {
     public String primaryNetworkInterfaceId() {
         for (NetworkInterfaceReference reference : this.inner().networkProfile().networkInterfaces()) {
             if (reference.primary() != null && reference.primary()) {
-                return reference.getId();
+                return reference.id();
             }
         }
         return null;
@@ -377,7 +377,7 @@ public Map<String, VirtualMachineScaleSetVMInstanceExtension> extensions() {
             for (VirtualMachineExtensionInner extensionInner : this.inner().resources()) {
                 extensions
                     .put(
-                        extensionInner.getName(),
+                        extensionInner.name(),
                         new VirtualMachineScaleSetVMInstanceExtensionImpl(extensionInner, this));
             }
         }
@@ -594,7 +594,7 @@ public Update withExistingDataDisk(
 
         ManagedDiskParameters managedDiskParameters =
             new ManagedDiskParameters().withStorageAccountType(storageAccountTypes);
-        managedDiskParameters.setId(dataDisk.id());
+        managedDiskParameters.withId(dataDisk.id());
 
         DataDisk attachDataDisk =
             new DataDisk()
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java
index 0ae1ec81d947..93272d6c30f5 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java
@@ -28,7 +28,7 @@ class VirtualMachineScaleSetVMInstanceExtensionImpl
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -38,7 +38,7 @@ public String publisherName() {
 
     @Override
     public String typeName() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
@@ -73,10 +73,10 @@ public VirtualMachineExtensionInstanceView instanceView() {
 
     @Override
     public Map<String, String> tags() {
-        if (this.inner().getTags() == null) {
+        if (this.inner().tags() == null) {
             return Collections.unmodifiableMap(new LinkedHashMap<String, String>());
         }
-        return Collections.unmodifiableMap(this.inner().getTags());
+        return Collections.unmodifiableMap(this.inner().tags());
     }
 
     private void initializeSettings() {
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java
index 3d96554fef50..cb7ea815f11e 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java
@@ -216,6 +216,6 @@ protected VirtualMachineScaleSetImpl wrapModel(VirtualMachineScaleSetInner inner
             return null;
         }
         return new VirtualMachineScaleSetImpl(
-            inner.getName(), inner, this.manager(), this.storageManager, this.networkManager, this.rbacManager);
+            inner.name(), inner, this.manager(), this.storageManager, this.networkManager, this.rbacManager);
     }
 }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java
index 94d02d9cc112..671427cc1b1f 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java
@@ -221,7 +221,7 @@ protected VirtualMachineImpl wrapModel(VirtualMachineInner virtualMachineInner)
             return null;
         }
         return new VirtualMachineImpl(
-            virtualMachineInner.getName(),
+            virtualMachineInner.name(),
             virtualMachineInner,
             this.manager(),
             this.storageManager,
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java
index 8fe6c4402fbe..b3e6b5c11524 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java
@@ -66,7 +66,7 @@ public RunCommandDocumentBaseInner withSchema(String schema) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java
index cf6b61dd9172..d7def390e163 100644
--- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java
+++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java
@@ -319,8 +319,8 @@ public void canCreateImageFromManagedDisk() {
             Assertions.assertNotNull(diskImage.managedDisk());
             Assertions
                 .assertTrue(
-                    diskImage.managedDisk().getId().equalsIgnoreCase(managedDataDisk1.id())
-                        || diskImage.managedDisk().getId().equalsIgnoreCase(managedDataDisk2.id()));
+                    diskImage.managedDisk().id().equalsIgnoreCase(managedDataDisk1.id())
+                        || diskImage.managedDisk().id().equalsIgnoreCase(managedDataDisk2.id()));
         }
         computeManager.disks().deleteById(managedOsDisk.id());
         computeManager.disks().deleteById(managedDataDisk1.id());
diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java
index c3714a38dfb6..bbc63e625f64 100644
--- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java
+++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java
@@ -327,7 +327,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() {
         Assertions.assertEquals(customImage.dataDiskImages().size(), 5);
         for (ImageDataDisk imageDataDisk : customImage.dataDiskImages().values()) {
             Assertions.assertNull(imageDataDisk.blobUri());
-            Assertions.assertNotNull(imageDataDisk.managedDisk().getId());
+            Assertions.assertNotNull(imageDataDisk.managedDisk().id());
         }
 
         // Create virtual machine from the custom image
diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java
index b6fbd1a33133..e4ff23004460 100644
--- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java
+++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java
@@ -694,13 +694,13 @@ public void canUpdateTagsOnVM() {
 
         // checking to see if withTag correctly update
         virtualMachine.update().withTag("test", "testValue").apply();
-        Assertions.assertEquals("testValue", virtualMachine.inner().getTags().get("test"));
+        Assertions.assertEquals("testValue", virtualMachine.inner().tags().get("test"));
 
         // checking to see if withTags correctly updates
         Map<String, String> testTags = new HashMap<String, String>();
         testTags.put("testTag", "testValue");
         virtualMachine.update().withTags(testTags).apply();
-        Assertions.assertEquals(testTags, virtualMachine.inner().getTags());
+        Assertions.assertEquals(testTags, virtualMachine.inner().tags());
     }
 
     @Test
diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java
index 4666017bc830..58331207f86c 100644
--- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java
+++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java
@@ -464,7 +464,7 @@ public void canCreateVirtualMachineScaleSetWithSecret() throws Exception {
         group
             .add(
                 new VaultSecretGroup()
-                    .withSourceVault(new SubResource().setId(vault.id()))
+                    .withSourceVault(new SubResource().withId(vault.id()))
                     .withVaultCertificates(certs));
 
         VirtualMachineScaleSet virtualMachineScaleSet =
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java
index 7bc28a9c7237..92391bc7a873 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java
@@ -60,7 +60,7 @@ public final class EventContent {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java
index 963b55bf6375..e11944327f73 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java
@@ -35,7 +35,7 @@ public final class ImageUpdateTrigger {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java
index 3fc6fd0a3124..33cc41487fe4 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java
@@ -48,7 +48,7 @@ public final class Request {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java
index 62eed4c80397..c23e1a4c5d75 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java
@@ -57,7 +57,7 @@ public final class SourceTriggerDescriptor {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java
index b63a84dbe63d..cc02d34456da 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java
@@ -21,7 +21,7 @@ public final class StorageAccountProperties {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java
index dd900ebbe96f..5cd90baa498e 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java
@@ -45,7 +45,7 @@ public PagedFlux<Registry> listAsync() {
         return this
             .inner()
             .listAsync()
-            .mapPage(inner -> new RegistryImpl(inner.getName(), inner, this.manager(), this.storageManager));
+            .mapPage(inner -> new RegistryImpl(inner.name(), inner, this.manager(), this.storageManager));
     }
 
     @Override
@@ -89,7 +89,7 @@ protected RegistryImpl wrapModel(RegistryInner containerServiceInner) {
         }
 
         return new RegistryImpl(
-            containerServiceInner.getName(), containerServiceInner, this.manager(), this.storageManager);
+            containerServiceInner.name(), containerServiceInner, this.manager(), this.storageManager);
     }
 
     @Override
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java
index 5725f0437f41..0e23d3345111 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java
@@ -178,7 +178,7 @@ public DockerTaskStep inner() {
     }
 
     private boolean isInCreateMode() {
-        if (this.taskImpl.inner().getId() == null) {
+        if (this.taskImpl.inner().id() == null) {
             return true;
         }
         return false;
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java
index 5c6907d23385..883582f3b0bf 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java
@@ -143,7 +143,7 @@ public EncodedTaskStep inner() {
     }
 
     private boolean isInCreateMode() {
-        if (this.taskImpl.inner().getId() == null) {
+        if (this.taskImpl.inner().id() == null) {
             return true;
         }
         return false;
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java
index 4de000d9ee32..085a5223e849 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java
@@ -143,7 +143,7 @@ public FileTaskStep inner() {
     }
 
     private boolean isInCreateMode() {
-        if (this.taskImpl.inner().getId() == null) {
+        if (this.taskImpl.inner().id() == null) {
             return true;
         }
         return false;
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java
index c56772440db1..0a3f8b7ac1ca 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java
@@ -75,7 +75,7 @@ public Mono<Registry> createResourceAsync() {
                 .createAsync(self.resourceGroupName(), self.name(), self.inner())
                 .map(innerToFluentMap(this));
         } else {
-            updateParameters.withTags(inner().getTags());
+            updateParameters.withTags(inner().tags());
             return manager()
                 .inner()
                 .registries()
@@ -116,7 +116,7 @@ public String storageAccountName() {
             return null;
         }
 
-        return ResourceUtils.nameFromResourceId(this.inner().storageAccount().getId());
+        return ResourceUtils.nameFromResourceId(this.inner().storageAccount().id());
     }
 
     @Override
@@ -125,7 +125,7 @@ public String storageAccountId() {
             return null;
         }
 
-        return this.inner().storageAccount().getId();
+        return this.inner().storageAccount().id();
     }
 
     @Override
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java
index b2b303948061..5abc6813d426 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java
@@ -31,7 +31,7 @@ class RegistrySourceTriggerImpl
     RegistrySourceTriggerImpl(String sourceTriggerName, RegistryTaskImpl registryTaskImpl, boolean creation) {
         if (creation) {
             this.registryTaskImpl = registryTaskImpl;
-            if (registryTaskImpl.inner().getId() == null) {
+            if (registryTaskImpl.inner().id() == null) {
                 this.inner = new SourceTrigger();
                 this.inner.withSourceRepository(new SourceProperties());
                 this.inner.withName(sourceTriggerName);
@@ -263,7 +263,7 @@ public SourceTrigger inner() {
     }
 
     private boolean isInCreateMode() {
-        if (this.registryTaskImpl.inner().getId() == null) {
+        if (this.registryTaskImpl.inner().id() == null) {
             return true;
         }
         return false;
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java
index 5b2f3f42859a..6b04e2a142c5 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java
@@ -64,22 +64,22 @@ class RegistryTaskImpl implements RegistryTask, RegistryTask.Definition, Registr
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -89,7 +89,7 @@ public Region region() {
 
     @Override
     public Map<String, String> tags() {
-        return this.inner().getTags();
+        return this.inner().tags();
     }
 
     @Override
@@ -184,11 +184,11 @@ public Map<String, RegistrySourceTrigger> sourceTriggers() {
 
     RegistryTaskImpl(ContainerRegistryManager registryManager, TaskInner inner) {
         this.tasksInner = registryManager.inner().tasks();
-        this.taskName = inner.getName();
+        this.taskName = inner.name();
         this.inner = inner;
-        this.resourceGroupName = ResourceUtils.groupFromResourceId(this.inner.getId());
+        this.resourceGroupName = ResourceUtils.groupFromResourceId(this.inner.id());
         this.registryName =
-            ResourceUtils.nameFromResourceId(ResourceUtils.parentResourceIdFromResourceId(this.inner.getId()));
+            ResourceUtils.nameFromResourceId(ResourceUtils.parentResourceIdFromResourceId(this.inner.id()));
         this.taskUpdateParameters = new TaskUpdateParameters();
         setTaskUpdateParameterTriggers();
     }
@@ -217,13 +217,13 @@ public RegistryDockerTaskStep.DefinitionStages.Blank defineDockerTaskStep() {
 
     @Override
     public DefinitionStages.Platform withLocation(String location) {
-        this.inner.setLocation(location);
+        this.inner.withLocation(location);
         return this;
     }
 
     @Override
     public DefinitionStages.Platform withLocation(Region location) {
-        this.inner.setLocation(location.toString());
+        this.inner.withLocation(location.toString());
         return this;
     }
 
@@ -541,7 +541,7 @@ public Mono<RegistryTask> applyAsync() {
     }
 
     private boolean isInCreateMode() {
-        if (this.inner().getId() == null) {
+        if (this.inner().id() == null) {
             return true;
         }
         return false;
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java
index 005b21612ab2..5d03d29927ac 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java
@@ -97,17 +97,17 @@ private void initCreateUpdateParams() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -117,7 +117,7 @@ public Region region() {
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new TreeMap<>();
         }
@@ -186,7 +186,7 @@ public String ping() {
             .inner()
             .webhooks()
             .ping(this.resourceGroupName, this.registryName, name())
-            .getId();
+            .id();
     }
 
     @Override
@@ -196,7 +196,7 @@ public Mono<String> pingAsync() {
             .inner()
             .webhooks()
             .pingAsync(this.resourceGroupName, this.registryName, name())
-            .map(eventInfoInner -> eventInfoInner.getId());
+            .map(eventInfoInner -> eventInfoInner.id());
     }
 
     @Override
@@ -344,7 +344,7 @@ public WebhookImpl withTags(Map<String, String> tags) {
         if (tags != null) {
             this.tags = null;
             ensureValidTags();
-            for (Map.Entry<String, String> entry : inner().getTags().entrySet()) {
+            for (Map.Entry<String, String> entry : inner().tags().entrySet()) {
                 this.tags.put(entry.getKey(), entry.getValue());
             }
         }
@@ -404,7 +404,7 @@ public WebhookImpl withCustomHeaders(Map<String, String> customHeaders) {
         if (customHeaders != null) {
             this.customHeaders = null;
             ensureValidCustomHeaders();
-            for (Map.Entry<String, String> entry : inner().getTags().entrySet()) {
+            for (Map.Entry<String, String> entry : inner().tags().entrySet()) {
                 this.customHeaders.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java
index cccaff707455..277451833d40 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java
@@ -77,12 +77,12 @@ public PagedFlux<Webhook> listAsync(final String resourceGroupName, final String
                         inner -> {
                             if (self.containerRegistry != null) {
                                 return new WebhookImpl(
-                                    inner.getName(), self.containerRegistry, inner, self.containerRegistryManager);
+                                    inner.name(), self.containerRegistry, inner, self.containerRegistryManager);
                             } else {
                                 return new WebhookImpl(
                                     resourceGroupName,
                                     registryName,
-                                    inner.getName(),
+                                    inner.name(),
                                     inner,
                                     self.containerRegistryManager);
                             }
diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java
index 9aa1c24f1084..324e68030612 100644
--- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java
+++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java
@@ -21,7 +21,7 @@ public class EventInfoInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java
index 0fc40365bb67..11d13661395e 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java
@@ -21,7 +21,7 @@ public final class ResourceReference {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java
index 06c20a40e579..d7d602baa992 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java
@@ -38,7 +38,7 @@ public PagedIterable<KubernetesCluster> list() {
 
     @Override
     public PagedFlux<KubernetesCluster> listAsync() {
-        return this.inner().listAsync().mapPage(inner -> new KubernetesClusterImpl(inner.getName(), inner, manager()));
+        return this.inner().listAsync().mapPage(inner -> new KubernetesClusterImpl(inner.name(), inner, manager()));
     }
 
     @Override
@@ -76,7 +76,7 @@ protected KubernetesClusterImpl wrapModel(ManagedClusterInner inner) {
             return null;
         }
 
-        return new KubernetesClusterImpl(inner.getName(), inner, this.manager());
+        return new KubernetesClusterImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java
index 287806cfbc64..027a9dc115fe 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java
@@ -43,7 +43,7 @@ public class AgentPoolAvailableVersionsInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java
index 288bedd6c9c6..dc4ee7d1a5a1 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java
@@ -57,7 +57,7 @@ public class AgentPoolUpgradeProfileInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java
index 98bc9aab5a21..67cc47a9be10 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java
@@ -49,7 +49,7 @@ public class ManagedClusterUpgradeProfileInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java
index 7a226cdeab55..b3e273979030 100644
--- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java
+++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java
@@ -43,7 +43,7 @@ public class OrchestratorVersionProfileListResultInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java
index 87ec1e1b9eb2..4a241df47564 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java
@@ -21,7 +21,7 @@ public class CassandraKeyspaceResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java
index e5cc7347aeb4..3d038a2d050b 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java
@@ -33,7 +33,7 @@ public class CassandraTableResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java
index 7576fb818683..e68d39963554 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java
@@ -38,7 +38,7 @@ public final class FailoverPolicy {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java
index 539defbacbf8..c44f7680c506 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java
@@ -21,7 +21,7 @@ public class GremlinDatabaseResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java
index e63ffa241fcb..3331c9213fb6 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java
@@ -55,7 +55,7 @@ public class GremlinGraphResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java
index fe250b9d70b3..c2fae3d758da 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java
@@ -66,7 +66,7 @@ public final class Location {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java
index 82af5b494984..4e858fd88557 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java
@@ -35,7 +35,7 @@ public class MongoDBCollectionResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java
index 562f02637bff..4f9a945bc1ca 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java
@@ -21,7 +21,7 @@ public class MongoDBDatabaseResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java
index f256a91303b4..02c85c1bbbb8 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java
@@ -21,7 +21,7 @@ public final class PrivateEndpointProperty {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java
index fb2a9a808360..ae613526a70b 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java
@@ -55,7 +55,7 @@ public class SqlContainerResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java
index b46ddc9b7c8b..87da722cf4d0 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java
@@ -21,7 +21,7 @@ public class SqlDatabaseResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java
index b1407ba08244..1f68ba968806 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java
@@ -27,7 +27,7 @@ public class SqlStoredProcedureResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java
index bc89b7f6ea7c..04b125729729 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java
@@ -39,7 +39,7 @@ public class SqlTriggerResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java
index ab6b5fd588f9..63044fb55c66 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java
@@ -27,7 +27,7 @@ public class SqlUserDefinedFunctionResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java
index 3a8394c448ad..c6597e3c0e9a 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java
@@ -21,7 +21,7 @@ public class TableResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java
index 92a5f9058dd2..55e4e1b5b557 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java
@@ -30,7 +30,7 @@ public final class VirtualNetworkRule {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java
index 701463b00c1c..899b5a7768df 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java
@@ -452,14 +452,14 @@ public Mono<CosmosDBAccount> createResourceAsync() {
     private DatabaseAccountCreateUpdateParameters createUpdateParametersInner(DatabaseAccountGetResultsInner inner) {
         this.ensureFailoverIsInitialized();
         DatabaseAccountCreateUpdateParameters createUpdateParametersInner = new DatabaseAccountCreateUpdateParameters();
-        createUpdateParametersInner.setLocation(this.regionName().toLowerCase(Locale.ROOT));
+        createUpdateParametersInner.withLocation(this.regionName().toLowerCase(Locale.ROOT));
         createUpdateParametersInner.withConsistencyPolicy(inner.consistencyPolicy());
         //        createUpdateParametersInner.withDatabaseAccountOfferType(
         //                DatabaseAccountOfferType.STANDARD.toString()); // Enum to Constant
         createUpdateParametersInner.withIpRangeFilter(inner.ipRangeFilter());
         createUpdateParametersInner.withKind(inner.kind());
         createUpdateParametersInner.withCapabilities(inner.capabilities());
-        createUpdateParametersInner.setTags(inner.getTags());
+        createUpdateParametersInner.withTags(inner.tags());
         createUpdateParametersInner.withEnableMultipleWriteLocations(inner.enableMultipleWriteLocations());
         this
             .addLocationsForParameters(
@@ -480,7 +480,7 @@ private DatabaseAccountCreateUpdateParameters createUpdateParametersInner(Databa
     private DatabaseAccountUpdateParameters updateParametersInner(DatabaseAccountGetResultsInner inner) {
         this.ensureFailoverIsInitialized();
         DatabaseAccountUpdateParameters updateParameters = new DatabaseAccountUpdateParameters();
-        updateParameters.withTags(inner.getTags());
+        updateParameters.withTags(inner.tags());
         updateParameters.withLocation(this.regionName().toLowerCase(Locale.ROOT));
         updateParameters.withConsistencyPolicy(inner.consistencyPolicy());
         updateParameters.withIpRangeFilter(inner.ipRangeFilter());
@@ -649,7 +649,7 @@ private Map<String, VirtualNetworkRule> ensureVirtualNetworkRules() {
             this.virtualNetworkRulesMap = new HashMap<>();
             if (this.inner() != null && this.inner().virtualNetworkRules() != null) {
                 for (VirtualNetworkRule virtualNetworkRule : this.inner().virtualNetworkRules()) {
-                    this.virtualNetworkRulesMap.put(virtualNetworkRule.getId(), virtualNetworkRule);
+                    this.virtualNetworkRulesMap.put(virtualNetworkRule.id(), virtualNetworkRule);
                 }
             }
         }
@@ -685,7 +685,7 @@ public CosmosDBAccountImpl withVirtualNetworkRules(List<VirtualNetworkRule> virt
         }
         this.inner().withIsVirtualNetworkFilterEnabled(true);
         for (VirtualNetworkRule vnetRule : virtualNetworkRules) {
-            this.virtualNetworkRulesMap.put(vnetRule.getId(), vnetRule);
+            this.virtualNetworkRulesMap.put(vnetRule.id(), vnetRule);
         }
 
         return this;
@@ -734,7 +734,7 @@ static class CreateUpdateLocationParameters implements HasLocations {
 
         @Override
         public String location() {
-            return parameters.getLocation();
+            return parameters.location();
         }
 
         @Override
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java
index a82f4c72104e..aacedda42d9e 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java
@@ -40,7 +40,7 @@ public PagedFlux<CosmosDBAccount> listAsync() {
         return this
             .inner()
             .listAsync()
-            .mapPage(inner -> new CosmosDBAccountImpl(inner.getName(), inner, this.manager()));
+            .mapPage(inner -> new CosmosDBAccountImpl(inner.name(), inner, this.manager()));
     }
 
     @Override
@@ -83,7 +83,7 @@ protected CosmosDBAccountImpl wrapModel(DatabaseAccountGetResultsInner container
             return null;
         }
 
-        return new CosmosDBAccountImpl(containerServiceInner.getName(), containerServiceInner, this.manager());
+        return new CosmosDBAccountImpl(containerServiceInner.name(), containerServiceInner, this.manager());
     }
 
     @Override
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java
index 7e6495d1744c..05a50d285d75 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java
@@ -32,7 +32,7 @@ public class PrivateEndpointConnectionImpl
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java
index f91935717abc..683b835263da 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java
@@ -71,7 +71,7 @@ public PagedFlux<PrivateEndpointConnectionImpl> listAsync() {
             .mapPage(
                 inner -> {
                     PrivateEndpointConnectionImpl childResource =
-                        new PrivateEndpointConnectionImpl(inner.getName(), self.getParent(), inner, client);
+                        new PrivateEndpointConnectionImpl(inner.name(), self.getParent(), inner, client);
                     self.addPrivateEndpointConnection(childResource);
                     return childResource;
                 });
@@ -85,7 +85,7 @@ public Mono<PrivateEndpointConnectionImpl> getImplAsync(String name) {
             .map(
                 inner -> {
                     PrivateEndpointConnectionImpl childResource =
-                        new PrivateEndpointConnectionImpl(inner.getName(), getParent(), inner, client);
+                        new PrivateEndpointConnectionImpl(inner.name(), getParent(), inner, client);
                     self.addPrivateEndpointConnection(childResource);
                     return childResource;
                 });
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java
index 0d2e546ddae4..acbafb106d69 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java
@@ -16,17 +16,17 @@ public class PrivateLinkResourceImpl extends WrapperImpl<PrivateLinkResourceInne
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
     public String name() {
-        return inner().getName();
+        return inner().name();
     }
 
     @Override
     public String type() {
-        return inner().getType();
+        return inner().type();
     }
 
     @Override
diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/SqlDatabaseImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/SqlDatabaseImpl.java
index 8459497903c0..424d84d49baf 100644
--- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/SqlDatabaseImpl.java
+++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/SqlDatabaseImpl.java
@@ -15,7 +15,7 @@ public class SqlDatabaseImpl extends WrapperImpl<SqlDatabaseGetResultsInner> imp
 
     @Override
     public String sqlDatabaseId() {
-        return this.inner().resource().getId();
+        return this.inner().resource().id();
     }
 
     @Override
diff --git a/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java b/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java
index 8ed60e0b3170..61472efc3fec 100644
--- a/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java
+++ b/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java
@@ -131,7 +131,7 @@ public void canCreateSqlPrivateEndpoint() {
                 .withPrivateLinkServiceConnections(Arrays.asList(privateLinkServiceConnection))
                 .withSubnet(network.subnets().get(subnetName).inner());
 
-        privateEndpoint.setLocation(region.toString());
+        privateEndpoint.withLocation(region.toString());
         privateEndpoint = networkManager.inner().privateEndpoints().createOrUpdate(rgName, pedName, privateEndpoint);
 
         cosmosDBAccount
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java
index 549c62039225..df08f53739e4 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java
@@ -64,6 +64,6 @@ protected PagedFlux<ARecordSet> listInternAsync(String recordSetNameSuffix, Inte
 
     @Override
     protected ARecordSetImpl wrapModel(RecordSetInner inner) {
-        return new ARecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new ARecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java
index 7efce959c930..3cf58b8ff8e4 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java
@@ -60,6 +60,6 @@ protected AaaaRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new AaaaRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new AaaaRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java
index c1763cead4fa..110504008c32 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected CNameRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new CNameRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new CNameRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java
index 08314ac8f2ef..2bf5bc840987 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected CaaRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new CaaRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new CaaRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java
index 9ae13011bac8..765cbc12677a 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java
@@ -53,7 +53,7 @@ protected DnsRecordSetImpl(String name, String type, final DnsZoneImpl parent, f
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
@@ -399,6 +399,6 @@ DnsRecordSetImpl withETagOnDelete(String eTagValue) {
     }
 
     private boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java
index 20e8308acc21..7e4eb38559a4 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java
@@ -80,7 +80,7 @@ public List<String> registrationVirtualNetworkIds() {
         List<String> list = new ArrayList<>();
         if (this.inner().registrationVirtualNetworks() != null) {
             for (SubResource sb : this.inner().registrationVirtualNetworks()) {
-                list.add(sb.getId());
+                list.add(sb.id());
             }
         }
         return list;
@@ -91,7 +91,7 @@ public List<String> resolutionVirtualNetworkIds() {
         List<String> list = new ArrayList<>();
         if (this.inner().resolutionVirtualNetworks() != null) {
             for (SubResource sb : this.inner().resolutionVirtualNetworks()) {
-                list.add(sb.getId());
+                list.add(sb.id());
             }
         }
         return list;
@@ -177,7 +177,7 @@ public SoaRecordSet getSoaRecordSet() {
         if (inner == null) {
             return null;
         }
-        return new SoaRecordSetImpl(inner.getName(), this, inner);
+        return new SoaRecordSetImpl(inner.name(), this, inner);
     }
 
     // Setters
@@ -471,28 +471,28 @@ private PagedIterable<DnsRecordSet> listRecordSetsIntern(String recordSetSuffix,
                         .recordSets()
                         .listByDnsZoneAsync(this.resourceGroupName(), this.name(), pageSize, recordSetSuffix),
                     inner -> {
-                        DnsRecordSet recordSet = new DnsRecordSetImpl(inner.getName(), inner.getType(), self, inner);
+                        DnsRecordSet recordSet = new DnsRecordSetImpl(inner.name(), inner.type(), self, inner);
                         switch (recordSet.recordType()) {
                             case A:
-                                return Mono.just(new ARecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new ARecordSetImpl(inner.name(), self, inner));
                             case AAAA:
-                                return Mono.just(new AaaaRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new AaaaRecordSetImpl(inner.name(), self, inner));
                             case CAA:
-                                return Mono.just(new CaaRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new CaaRecordSetImpl(inner.name(), self, inner));
                             case CNAME:
-                                return Mono.just(new CNameRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new CNameRecordSetImpl(inner.name(), self, inner));
                             case MX:
-                                return Mono.just(new MXRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new MXRecordSetImpl(inner.name(), self, inner));
                             case NS:
-                                return Mono.just(new NSRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new NSRecordSetImpl(inner.name(), self, inner));
                             case PTR:
-                                return Mono.just(new PtrRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new PtrRecordSetImpl(inner.name(), self, inner));
                             case SOA:
-                                return Mono.just(new SoaRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new SoaRecordSetImpl(inner.name(), self, inner));
                             case SRV:
-                                return Mono.just(new SrvRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new SrvRecordSetImpl(inner.name(), self, inner));
                             case TXT:
-                                return Mono.just(new TxtRecordSetImpl(inner.getName(), self, inner));
+                                return Mono.just(new TxtRecordSetImpl(inner.name(), self, inner));
                             default:
                                 return Mono.just(recordSet);
                         }
@@ -524,12 +524,12 @@ public DnsZoneImpl withPrivateAccess(
         this.inner().withResolutionVirtualNetworks(new ArrayList<>());
         for (String rvnId : registrationVirtualNetworkIds) {
             SubResource sb = new SubResource();
-            sb.setId(rvnId);
+            sb.withId(rvnId);
             this.inner().registrationVirtualNetworks().add(sb);
         }
         for (String rvnId : resolutionVirtualNetworkIds) {
             SubResource sb = new SubResource();
-            sb.setId(rvnId);
+            sb.withId(rvnId);
             this.inner().resolutionVirtualNetworks().add(sb);
         }
         return this;
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java
index 46613c162410..28bdba3d5949 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java
@@ -33,12 +33,12 @@ protected DnsZoneImpl wrapModel(ZoneInner inner) {
         if (inner == null) {
             return null;
         }
-        return new DnsZoneImpl(inner.getName(), inner, this.manager());
+        return new DnsZoneImpl(inner.name(), inner, this.manager());
     }
 
     private DnsZoneImpl setDefaults(DnsZoneImpl dnsZone) {
         // Zone location must be 'global' irrespective of region of the resource group it resides.
-        dnsZone.inner().setLocation("global");
+        dnsZone.inner().withLocation("global");
         return dnsZone;
     }
 
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java
index 9d67b1ddf85c..ab112979f7df 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java
@@ -79,6 +79,6 @@ protected MXRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new MXRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new MXRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java
index c902c67ab29e..f7d4760904cb 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected NSRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new NSRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new NSRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java
index a101d69f1345..0d304872be86 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected PtrRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new PtrRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new PtrRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java
index a932de0b0151..9de6bc7f4a72 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected SrvRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new SrvRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new SrvRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java
index 8b42bff465de..5684f0401766 100644
--- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java
+++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java
@@ -67,6 +67,6 @@ protected TxtRecordSetImpl wrapModel(RecordSetInner inner) {
         if (inner == null) {
             return null;
         }
-        return new TxtRecordSetImpl(inner.getName(), this.dnsZone, inner);
+        return new TxtRecordSetImpl(inner.name(), this.dnsZone, inner);
     }
 }
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java
index 1f9795b0de54..499ad395d957 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java
@@ -21,7 +21,7 @@ public final class PrivateEndpoint {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java
index 6f6b146dcec1..d13bf02f4065 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java
@@ -23,7 +23,7 @@ public final class VirtualNetworkRule {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java
index e4e8fc560b2c..dda4da1166e2 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java
@@ -23,7 +23,7 @@ public String name() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java
index 668e74608b07..328802b04196 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java
@@ -348,7 +348,7 @@ public Mono<Vault> createResourceAsync() {
                             VaultCreateOrUpdateParameters parameters = new VaultCreateOrUpdateParameters();
                             parameters.withLocation(regionName());
                             parameters.withProperties(inner().properties());
-                            parameters.withTags(inner().getTags());
+                            parameters.withTags(inner().tags());
                             parameters.properties().withAccessPolicies(new ArrayList<>());
                             for (AccessPolicy accessPolicy : accessPolicies) {
                                 parameters.properties().accessPolicies().add(accessPolicy.inner());
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java
index 2fd9b3f07537..ac39cc8de0af 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java
@@ -76,7 +76,7 @@ protected VaultImpl wrapModel(VaultInner vaultInner) {
         if (vaultInner == null) {
             return null;
         }
-        return new VaultImpl(vaultInner.getName(), vaultInner, this.manager(), graphRbacManager);
+        return new VaultImpl(vaultInner.name(), vaultInner, this.manager(), graphRbacManager);
     }
 
     @Override
@@ -148,7 +148,7 @@ public Mono<Vault> recoverSoftDeletedVaultAsync(
                                 .withTenantId(UUID.fromString(tenantId)));
                     return inner()
                         .createOrUpdateAsync(resourceGroupName, vaultName, parameters)
-                        .map(inner -> (Vault) new VaultImpl(inner.getId(), inner, manager, graphRbacManager));
+                        .map(inner -> (Vault) new VaultImpl(inner.id(), inner, manager, graphRbacManager));
                 });
     }
 }
diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java
index c7e60f408fe5..36568c80826b 100644
--- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java
+++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java
@@ -40,7 +40,7 @@ public final class DeletedVaultInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java
index c0d984ed403d..c3b2a428872c 100644
--- a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java
+++ b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java
@@ -34,7 +34,7 @@ protected IdentityImpl wrapModel(IdentityInner inner) {
         if (inner == null) {
             return null;
         } else {
-            return new IdentityImpl(inner.getName(), inner, this.manager());
+            return new IdentityImpl(inner.name(), inner, this.manager());
         }
     }
 
diff --git a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java
index 479487263bfc..1959ab45d286 100644
--- a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java
+++ b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java
@@ -136,8 +136,8 @@ public String principalId() {
             @Override
             public String resourceId() {
                 Objects.requireNonNull(inner());
-                Objects.requireNonNull(inner().getId());
-                return inner().getId();
+                Objects.requireNonNull(inner().id());
+                return inner().id();
             }
         };
     }
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java b/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java
index 360b59a1b5e6..735dea496d8b 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java
@@ -72,7 +72,7 @@ public static void print(VirtualMachine resource) {
                 storageProfile.append("\n\t\t\tLun: ").append(disk.lun());
                 if (resource.isManagedDiskEnabled()) {
                     if (disk.managedDisk() != null) {
-                        storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().getId());
+                        storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().id());
                     }
                 } else {
                     if (disk.vhd().uri() != null) {
diff --git a/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java b/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java
index c9bb68fed106..b1cfb13d91ab 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java
@@ -86,7 +86,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("CosmosDB Virtual Network Rules:");
             for (VirtualNetworkRule vnetRule : vnetRules) {
-                System.out.println("\t" + vnetRule.getId());
+                System.out.println("\t" + vnetRule.id());
             }
 
 
@@ -105,7 +105,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("CosmosDB Virtual Network Rules:");
             for (VirtualNetworkRule vnetRule : vnetRules) {
-                System.out.println("\t" + vnetRule.getId());
+                System.out.println("\t" + vnetRule.id());
             }
 
             cosmosDBAccount.update()
diff --git a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java
index eefb3eb4352b..d7e83951e007 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java
@@ -85,7 +85,7 @@ public static boolean runSample(Azure azure) {
                 for (DeploymentOperation operation : operations) {
                     if (operation.targetResource() != null) {
                         String operationTxt = String.format("id:%s name:%s type: %s provisioning-state:%s code: %s msg: %s",
-                                operation.targetResource().getId(),
+                                operation.targetResource().id(),
                                 operation.targetResource().resourceName(),
                                 operation.targetResource().resourceType(),
                                 operation.provisioningState(),
diff --git a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java
index 7e53a33182c2..e57d14946b06 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java
@@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) {
             // Getting created resources
             for (DeploymentOperation operation : operations) {
                 if (operation.targetResource() != null) {
-                    genericResources.add(azure.genericResources().getById(operation.targetResource().getId()));
+                    genericResources.add(azure.genericResources().getById(operation.targetResource().id()));
                 }
             }
 
diff --git a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
index 2c496ef72eca..8f9fff292bb2 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
@@ -271,7 +271,7 @@ public static void print(VirtualMachine resource) {
                 storageProfile.append("\n\t\t\tLun: ").append(disk.lun());
                 if (resource.isManagedDiskEnabled()) {
                     if (disk.managedDisk() != null) {
-                        storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().getId());
+                        storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().id());
                     }
                 } else {
                     if (disk.vhd().uri() != null) {
@@ -1591,7 +1591,7 @@ public static void print(SqlFailoverGroup failoverGroup) {
         builder.append("\n\tPartner Servers: ");
         for (PartnerInfo item : failoverGroup.partnerServers()) {
             builder
-                    .append("\n\t\tId: ").append(item.getId())
+                    .append("\n\t\tId: ").append(item.id())
                     .append("\n\t\tLocation: ").append(item.location())
                     .append("\n\t\tReplication role: ").append(item.replicationRole());
         }
@@ -1914,10 +1914,10 @@ public static void print(VirtualMachineCustomImage image) {
             builder.append("\n\t\tSource virtual machine: ").append(image.sourceVirtualMachineId());
         }
         if (image.osDiskImage().managedDisk() != null) {
-            builder.append("\n\t\tSource managed disk: ").append(image.osDiskImage().managedDisk().getId());
+            builder.append("\n\t\tSource managed disk: ").append(image.osDiskImage().managedDisk().id());
         }
         if (image.osDiskImage().snapshot() != null) {
-            builder.append("\n\t\tSource snapshot: ").append(image.osDiskImage().snapshot().getId());
+            builder.append("\n\t\tSource snapshot: ").append(image.osDiskImage().snapshot().id());
         }
         if (image.osDiskImage().blobUri() != null) {
             builder.append("\n\t\tSource un-managed vhd: ").append(image.osDiskImage().blobUri());
@@ -1931,10 +1931,10 @@ public static void print(VirtualMachineCustomImage image) {
                     builder.append("\n\t\tSource virtual machine: ").append(image.sourceVirtualMachineId());
                 }
                 if (diskImage.managedDisk() != null) {
-                    builder.append("\n\t\tSource managed disk: ").append(diskImage.managedDisk().getId());
+                    builder.append("\n\t\tSource managed disk: ").append(diskImage.managedDisk().id());
                 }
                 if (diskImage.snapshot() != null) {
-                    builder.append("\n\t\tSource snapshot: ").append(diskImage.snapshot().getId());
+                    builder.append("\n\t\tSource snapshot: ").append(diskImage.snapshot().id());
                 }
                 if (diskImage.blobUri() != null) {
                     builder.append("\n\t\tSource un-managed vhd: ").append(diskImage.blobUri());
@@ -2484,12 +2484,12 @@ public static void print(Topology resource) {
         StringBuilder sb = new StringBuilder().append("Topology: ").append(resource.id())
                 .append("\n\tTopology parameters: ")
                 .append("\n\t\tResource group: ").append(resource.topologyParameters().targetResourceGroupName())
-                .append("\n\t\tVirtual network: ").append(resource.topologyParameters().targetVirtualNetwork() == null ? "" : resource.topologyParameters().targetVirtualNetwork().getId())
-                .append("\n\t\tSubnet id: ").append(resource.topologyParameters().targetSubnet() == null ? "" : resource.topologyParameters().targetSubnet().getId())
+                .append("\n\t\tVirtual network: ").append(resource.topologyParameters().targetVirtualNetwork() == null ? "" : resource.topologyParameters().targetVirtualNetwork().id())
+                .append("\n\t\tSubnet id: ").append(resource.topologyParameters().targetSubnet() == null ? "" : resource.topologyParameters().targetSubnet().id())
                 .append("\n\tCreated time: ").append(resource.createdTime())
                 .append("\n\tLast modified time: ").append(resource.lastModifiedTime());
         for (TopologyResource tr : resource.resources().values()) {
-            sb.append("\n\tTopology resource: ").append(tr.getId())
+            sb.append("\n\tTopology resource: ").append(tr.id())
                     .append("\n\t\tName: ").append(tr.name())
                     .append("\n\t\tLocation: ").append(tr.location())
                     .append("\n\t\tAssociations:");
@@ -2526,7 +2526,7 @@ public static void print(SecurityGroupView resource) {
         StringBuilder sb = new StringBuilder().append("Security group view: ")
                 .append("\n\tVirtual machine id: ").append(resource.vmId());
         for (SecurityGroupNetworkInterface sgni : resource.networkInterfaces().values()) {
-            sb.append("\n\tSecurity group network interface:").append(sgni.getId())
+            sb.append("\n\tSecurity group network interface:").append(sgni.id())
                     .append("\n\t\tSecurity group network interface:")
                     .append("\n\t\tEffective security rules:");
             for (EffectiveNetworkSecurityRule rule : sgni.securityRuleAssociations().effectiveSecurityRules()) {
@@ -2540,10 +2540,10 @@ public static void print(SecurityGroupView resource) {
                         .append("\n\t\t\tDestination port range: ").append(rule.destinationPortRange())
                         .append("\n\t\t\tProtocol: ").append(rule.protocol());
             }
-            sb.append("\n\t\tSubnet:").append(sgni.securityRuleAssociations().subnetAssociation().getId());
+            sb.append("\n\t\tSubnet:").append(sgni.securityRuleAssociations().subnetAssociation().id());
             printSecurityRule(sb, sgni.securityRuleAssociations().subnetAssociation().securityRules());
             if (sgni.securityRuleAssociations().networkInterfaceAssociation() != null) {
-                sb.append("\n\t\tNetwork interface:").append(sgni.securityRuleAssociations().networkInterfaceAssociation().getId());
+                sb.append("\n\t\tNetwork interface:").append(sgni.securityRuleAssociations().networkInterfaceAssociation().id());
                 printSecurityRule(sb, sgni.securityRuleAssociations().networkInterfaceAssociation().securityRules());
             }
             sb.append("\n\t\tDefault security rules:");
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java
index a59738f3457a..a75ad434657d 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java
@@ -59,7 +59,7 @@ public MetricAlertStatus withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java
index 3fc7187dea30..04d2324ec642 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java
@@ -35,7 +35,7 @@ public class WorkspaceInfo {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java
index 48c4e695f455..971b20f2d43e 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java
@@ -219,7 +219,7 @@ public ActionGroupImpl withShortName(String shortName) {
 
     @Override
     public Mono<ActionGroup> createResourceAsync() {
-        this.inner().setLocation("global");
+        this.inner().withLocation("global");
         return this
             .manager()
             .inner()
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java
index 7ef366c1c035..9cd2e378293a 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java
@@ -30,7 +30,7 @@ protected ActionGroupImpl wrapModel(ActionGroupResourceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new ActionGroupImpl(inner.getName(), inner, this.manager());
+        return new ActionGroupImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java
index 37013a82ec6c..bf50906ab693 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java
@@ -74,7 +74,7 @@ public String description() {
 
     @Override
     public Mono<ActivityLogAlert> createResourceAsync() {
-        this.inner().setLocation("global");
+        this.inner().withLocation("global");
         ActivityLogAlertAllOfCondition condition = new ActivityLogAlertAllOfCondition();
         condition.withAllOf(new ArrayList<ActivityLogAlertLeafCondition>());
         for (Map.Entry<String, String> cds : conditions.entrySet()) {
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java
index e4eebfc5b79b..5bdd998918e5 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java
@@ -29,7 +29,7 @@ protected ActivityLogAlertImpl wrapModel(ActivityLogAlertResourceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new ActivityLogAlertImpl(inner.getName(), inner, this.manager());
+        return new ActivityLogAlertImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java
index 008ced1effd1..50f7c73ef022 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java
@@ -29,7 +29,7 @@ protected AutoscaleSettingImpl wrapModel(AutoscaleSettingResourceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new AutoscaleSettingImpl(inner.getName(), inner, this.manager());
+        return new AutoscaleSettingImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java
index 2d31e7b7cfb7..af59325dc9f0 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java
@@ -161,7 +161,7 @@ public DiagnosticSettingImpl withoutMetrics() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -212,7 +212,7 @@ public MonitorManager manager() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -241,11 +241,11 @@ public void setInner(DiagnosticSettingsResourceInner inner) {
         if (!isInCreateMode()) {
             this.resourceId =
                 inner
-                    .getId()
+                    .id()
                     .substring(
                         0,
-                        this.inner().getId().length()
-                            - (DiagnosticSettingImpl.DIAGNOSTIC_SETTINGS_URI + this.inner().getName()).length());
+                        this.inner().id().length()
+                            - (DiagnosticSettingImpl.DIAGNOSTIC_SETTINGS_URI + this.inner().name()).length());
             for (MetricSettings ms : this.inner().metrics()) {
                 this.metricSet.put(ms.category(), ms);
             }
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java
index efd24cf7c1a0..b21ae17eb3bd 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java
@@ -18,7 +18,7 @@ class DiagnosticSettingsCategoryImpl extends WrapperImpl<DiagnosticSettingsCateg
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsImpl.java
index 39ef29ec73a6..f4d649fdf2ff 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsImpl.java
@@ -56,7 +56,7 @@ protected DiagnosticSettingImpl wrapModel(DiagnosticSettingsResourceInner inner)
         if (inner == null) {
             return null;
         }
-        return new DiagnosticSettingImpl(inner.getName(), inner, this.manager());
+        return new DiagnosticSettingImpl(inner.name(), inner, this.manager());
     }
 
     @Override
@@ -126,7 +126,7 @@ public PagedFlux<DiagnosticSetting> listByResourceAsync(String resourceId) {
                     .diagnosticSettings()
                     .listAsync(resourceId)
                     .map(DiagnosticSettingsResourceCollectionInner::value))
-            .mapPage(inner -> new DiagnosticSettingImpl(inner.getName(), inner, this.manager()));
+            .mapPage(inner -> new DiagnosticSettingImpl(inner.name(), inner, this.manager()));
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java
index 4557b9b25a7a..1cb605f19c41 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java
@@ -58,7 +58,7 @@ public String description() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java
index 6316d7cb6aa8..35078dc29e74 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java
@@ -101,7 +101,7 @@ public Mono<MetricAlert> createResourceAsync() {
                 new IllegalArgumentException("Static condition and dynamic condition cannot co-exist"));
         }
 
-        this.inner().setLocation("global");
+        this.inner().withLocation("global");
         if (!this.conditions.isEmpty()) {
             if (!multipleResource) {
                 MetricAlertSingleResourceMultipleMetricCriteria crit =
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java
index 0a2da869df80..aef7e374cca4 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java
@@ -32,7 +32,7 @@ protected MetricAlertImpl wrapModel(MetricAlertResourceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new MetricAlertImpl(inner.getName(), inner, this.manager());
+        return new MetricAlertImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java
index 97ef35b8fd51..2f897ce58922 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java
@@ -99,7 +99,7 @@ public List<MetricAvailability> metricAvailabilities() {
     }
 
     public String id() {
-        return this.inner.getId();
+        return this.inner.id();
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java
index 6f4b8975b3dd..f40a60cedce1 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java
@@ -22,7 +22,7 @@ class MetricImpl extends WrapperImpl<MetricInner> implements Metric {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java
index 5f70473329ae..ca21e1fa6dc5 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java
@@ -81,7 +81,7 @@ public class BaselineResponseInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java
index 40808393d774..b78e8aca30c7 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java
@@ -224,7 +224,7 @@ public String description() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java
index f66e391aa295..28971f47342f 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java
@@ -245,7 +245,7 @@ public MetricDefinitionInner withMetricAvailabilities(List<MetricAvailability> m
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java
index 770c6b2dfb1d..198289668474 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java
@@ -49,7 +49,7 @@ public final class MetricInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java
index 7b662135df64..25e6eab34463 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java
@@ -40,7 +40,7 @@ public final class MetricNamespaceInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java
index 491d10cc0c44..096e87fc58e2 100644
--- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java
+++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java
@@ -67,7 +67,7 @@ public class SingleMetricBaselineInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java
index bf544faa65b3..c3bcdbce7a8a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java
@@ -129,7 +129,7 @@ public ApplicationGatewayFirewallRuleSet withRuleGroups(List<ApplicationGatewayF
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ConnectivityHop.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ConnectivityHop.java
index bf787dad29b3..61e96492d84f 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ConnectivityHop.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ConnectivityHop.java
@@ -61,7 +61,7 @@ public String type() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitPeeringId.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitPeeringId.java
index 1f21058f6a4c..71e1a4ff93e5 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitPeeringId.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitPeeringId.java
@@ -21,7 +21,7 @@ public final class ExpressRouteCircuitPeeringId {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitReference.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitReference.java
index baae9f092cd7..e2afe2496e98 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitReference.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteCircuitReference.java
@@ -21,7 +21,7 @@ public final class ExpressRouteCircuitReference {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteConnectionId.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteConnectionId.java
index 984e08b415c2..cf6845bca965 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteConnectionId.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ExpressRouteConnectionId.java
@@ -21,7 +21,7 @@ public final class ExpressRouteConnectionId {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkIntentPolicy.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkIntentPolicy.java
index 44a2ef32b1f8..b132a9893903 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkIntentPolicy.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkIntentPolicy.java
@@ -49,7 +49,7 @@ public NetworkIntentPolicy withEtag(String etag) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkInterfaceAssociation.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkInterfaceAssociation.java
index 621b3db369d7..506cdb27dc05 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkInterfaceAssociation.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/NetworkInterfaceAssociation.java
@@ -29,7 +29,7 @@ public final class NetworkInterfaceAssociation {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ReferencedPublicIpAddress.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ReferencedPublicIpAddress.java
index f82e72256e09..8925595bd8d1 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ReferencedPublicIpAddress.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ReferencedPublicIpAddress.java
@@ -21,7 +21,7 @@ public final class ReferencedPublicIpAddress {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ResourceNavigationLink.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ResourceNavigationLink.java
index e89171663fb2..3460870914f9 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ResourceNavigationLink.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ResourceNavigationLink.java
@@ -83,7 +83,7 @@ public ResourceNavigationLink withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/SecurityGroupNetworkInterface.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/SecurityGroupNetworkInterface.java
index a565bac850bc..3c98ef9d915f 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/SecurityGroupNetworkInterface.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/SecurityGroupNetworkInterface.java
@@ -27,7 +27,7 @@ public final class SecurityGroupNetworkInterface {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ServiceTagInformation.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ServiceTagInformation.java
index 91f46c93b42f..96a28b20dc6a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ServiceTagInformation.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ServiceTagInformation.java
@@ -51,7 +51,7 @@ public String name() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/SubnetAssociation.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/SubnetAssociation.java
index cebec82e1f84..56ddd70e008b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/SubnetAssociation.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/SubnetAssociation.java
@@ -29,7 +29,7 @@ public final class SubnetAssociation {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/TopologyResource.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/TopologyResource.java
index 5d8676668d2a..6db10ce61324 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/TopologyResource.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/TopologyResource.java
@@ -61,7 +61,7 @@ public TopologyResource withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/TroubleshootingDetails.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/TroubleshootingDetails.java
index a2d96f7e1693..23c6bb233e2b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/TroubleshootingDetails.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/TroubleshootingDetails.java
@@ -46,7 +46,7 @@ public final class TroubleshootingDetails {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualHubId.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualHubId.java
index 3bf0f8c35d52..e29b6f18aa0b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualHubId.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualHubId.java
@@ -24,7 +24,7 @@ public final class VirtualHubId {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualNetworkConnectionGatewayReference.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualNetworkConnectionGatewayReference.java
index 556c529abe16..7ddc8fe76d27 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualNetworkConnectionGatewayReference.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/VirtualNetworkConnectionGatewayReference.java
@@ -21,7 +21,7 @@ public final class VirtualNetworkConnectionGatewayReference {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHealthImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHealthImpl.java
index f604d344606d..a03a40caa3c3 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHealthImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHealthImpl.java
@@ -40,7 +40,7 @@ public ApplicationGatewayBackendHealthPool inner() {
     @Override
     public String name() {
         if (this.inner.backendAddressPool() != null) {
-            return ResourceUtils.nameFromResourceId(this.inner.backendAddressPool().getId());
+            return ResourceUtils.nameFromResourceId(this.inner.backendAddressPool().id());
         } else {
             return null;
         }
@@ -52,7 +52,7 @@ public ApplicationGatewayBackend backend() {
             return null;
         }
 
-        String backendName = ResourceUtils.nameFromResourceId(this.inner.backendAddressPool().getId());
+        String backendName = ResourceUtils.nameFromResourceId(this.inner.backendAddressPool().id());
         return this.appGateway.backends().get(backendName);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationHealthImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationHealthImpl.java
index c574995022ee..42f56d291576 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationHealthImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationHealthImpl.java
@@ -43,7 +43,7 @@ public ApplicationGatewayBackendHealthHttpSettings inner() {
     @Override
     public String name() {
         if (this.inner.backendHttpSettings() != null) {
-            return ResourceUtils.nameFromResourceId(this.inner.backendHttpSettings().getId());
+            return ResourceUtils.nameFromResourceId(this.inner.backendHttpSettings().id());
         } else {
             return null;
         }
@@ -55,7 +55,7 @@ public ApplicationGatewayBackendHttpConfiguration backendHttpConfiguration() {
             return null;
         }
 
-        String name = ResourceUtils.nameFromResourceId(this.inner.backendHttpSettings().getId());
+        String name = ResourceUtils.nameFromResourceId(this.inner.backendHttpSettings().id());
         return this.parent().parent().backendHttpConfigurations().get(name);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
index ab5e2a29933b..59451f86ba8a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
@@ -48,7 +48,7 @@ public Map<String, ApplicationGatewayAuthenticationCertificate> authenticationCe
         } else {
             for (SubResource ref : this.inner().authenticationCertificates()) {
                 ApplicationGatewayAuthenticationCertificate cert =
-                    this.parent().authenticationCertificates().get(ResourceUtils.nameFromResourceId(ref.getId()));
+                    this.parent().authenticationCertificates().get(ResourceUtils.nameFromResourceId(ref.id()));
                 if (cert != null) {
                     certs.put(cert.name(), cert);
                 }
@@ -65,7 +65,7 @@ public String name() {
     @Override
     public ApplicationGatewayProbe probe() {
         if (this.parent().probes() != null && this.inner().probe() != null) {
-            return this.parent().probes().get(ResourceUtils.nameFromResourceId(this.inner().probe().getId()));
+            return this.parent().probes().get(ResourceUtils.nameFromResourceId(this.inner().probe().id()));
         } else {
             return null;
         }
@@ -165,7 +165,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withProbe(String name) {
         if (name == null) {
             return this.withoutProbe();
         } else {
-            SubResource probeRef = new SubResource().setId(this.parent().futureResourceId() + "/probes/" + name);
+            SubResource probeRef = new SubResource().withId(this.parent().futureResourceId() + "/probes/" + name);
             this.inner().withProbe(probeRef);
             return this;
         }
@@ -230,14 +230,14 @@ public ApplicationGatewayBackendHttpConfigurationImpl withAuthenticationCertific
             return this;
         }
         SubResource certRef =
-            new SubResource().setId(this.parent().futureResourceId() + "/authenticationCertificates/" + name);
+            new SubResource().withId(this.parent().futureResourceId() + "/authenticationCertificates/" + name);
         List<SubResource> refs = this.inner().authenticationCertificates();
         if (refs == null) {
             refs = new ArrayList<>();
             this.inner().withAuthenticationCertificates(refs);
         }
         for (SubResource ref : refs) {
-            if (ref.getId().equalsIgnoreCase(certRef.getId())) {
+            if (ref.id().equalsIgnoreCase(certRef.id())) {
                 return this;
             }
         }
@@ -295,7 +295,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withoutAuthenticationCerti
             return this;
         }
         for (SubResource ref : this.inner().authenticationCertificates()) {
-            if (ResourceUtils.nameFromResourceId(ref.getId()).equalsIgnoreCase(name)) {
+            if (ResourceUtils.nameFromResourceId(ref.id()).equalsIgnoreCase(name)) {
                 this.inner().authenticationCertificates().remove(ref);
                 break;
             }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java
index 3f899870bada..f9e10bd9200a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java
@@ -53,8 +53,8 @@ public Map<String, String> backendNicIPConfigurationNames() {
         final Map<String, String> ipConfigNames = new TreeMap<>();
         if (this.inner().backendIPConfigurations() != null) {
             for (NetworkInterfaceIPConfigurationInner inner : this.inner().backendIPConfigurations()) {
-                String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.getId());
-                String ipConfigName = ResourceUtils.nameFromResourceId(inner.getId());
+                String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.id());
+                String ipConfigName = ResourceUtils.nameFromResourceId(inner.id());
                 ipConfigNames.put(nicId, ipConfigName);
             }
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java
index 868d360f0c96..8d0b59471672 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java
@@ -43,7 +43,7 @@ public NicIPConfiguration getNetworkInterfaceIPConfiguration() {
         if (this.inner().ipConfiguration() == null) {
             return null;
         }
-        String nicIPConfigId = this.inner().ipConfiguration().getId();
+        String nicIPConfigId = this.inner().ipConfiguration().id();
         if (nicIPConfigId == null) {
             return null;
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java
index 9669db6e0e5a..9350f5eee784 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java
@@ -31,7 +31,7 @@ class ApplicationGatewayFrontendImpl
     public String networkId() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -41,7 +41,7 @@ public String networkId() {
     public String subnetName() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.nameFromResourceId(subnetRef.getId());
+            return ResourceUtils.nameFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -65,7 +65,7 @@ public String name() {
     @Override
     public String publicIPAddressId() {
         if (this.inner().publicIPAddress() != null) {
-            return this.inner().publicIPAddress().getId();
+            return this.inner().publicIPAddress().id();
         } else {
             return null;
         }
@@ -90,7 +90,7 @@ public ApplicationGatewayFrontendImpl withExistingSubnet(Network network, String
 
     @Override
     public ApplicationGatewayFrontendImpl withExistingSubnet(String parentNetworkResourceId, String subnetName) {
-        SubResource subnetRef = new SubResource().setId(parentNetworkResourceId + "/subnets/" + subnetName);
+        SubResource subnetRef = new SubResource().withId(parentNetworkResourceId + "/subnets/" + subnetName);
         this.inner().withSubnet(subnetRef);
 
         // Ensure this frontend is not public
@@ -105,7 +105,7 @@ public ApplicationGatewayFrontendImpl withExistingPublicIPAddress(PublicIPAddres
 
     @Override
     public ApplicationGatewayFrontendImpl withExistingPublicIPAddress(String resourceId) {
-        SubResource pipRef = new SubResource().setId(resourceId);
+        SubResource pipRef = new SubResource().withId(resourceId);
         this.inner().withPublicIPAddress(pipRef);
         this.withoutSubnet(); // Ensure no conflicting public and private settings
         return this;
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java
index 8e4056553592..8c7b507523bc 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java
@@ -43,7 +43,7 @@ public ApplicationGatewayIPConfigurationImpl withExistingSubnet(Network network,
 
     @Override
     public ApplicationGatewayIPConfigurationImpl withExistingSubnet(String networkId, String subnetName) {
-        SubResource subnetRef = new SubResource().setId(networkId + "/subnets/" + subnetName);
+        SubResource subnetRef = new SubResource().withId(networkId + "/subnets/" + subnetName);
         this.inner().withSubnet(subnetRef);
         return this;
     }
@@ -59,7 +59,7 @@ public ApplicationGatewayImpl attach() {
     public String networkId() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -69,7 +69,7 @@ public String networkId() {
     public String subnetName() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.nameFromResourceId(subnetRef.getId());
+            return ResourceUtils.nameFromResourceId(subnetRef.id());
         } else {
             return null;
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
index f0fb7e065399..9392f5499df6 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
@@ -124,7 +124,7 @@ protected Mono<ApplicationGatewayInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .applicationGateways()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     // Helpers
@@ -310,7 +310,7 @@ protected void beforeCreating() {
 
             // Clear deleted probe references
             ref = config.inner().probe();
-            if (ref != null && !this.probes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.probes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 config.inner().withProbe(null);
             }
 
@@ -321,7 +321,7 @@ protected void beforeCreating() {
                 certRefs = new ArrayList<>(certRefs);
                 for (SubResource certRef : certRefs) {
                     if (certRef != null
-                        && !this.authCertificates.containsKey(ResourceUtils.nameFromResourceId(certRef.getId()))) {
+                        && !this.authCertificates.containsKey(ResourceUtils.nameFromResourceId(certRef.id()))) {
                         config.inner().authenticationCertificates().remove(certRef);
                     }
                 }
@@ -335,7 +335,7 @@ protected void beforeCreating() {
 
             // Clear deleted listener references
             ref = redirect.inner().targetListener();
-            if (ref != null && !this.listeners.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.listeners.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 redirect.inner().withTargetListener(null);
             }
         }
@@ -347,19 +347,19 @@ protected void beforeCreating() {
 
             // Clear deleted frontend references
             ref = listener.inner().frontendIPConfiguration();
-            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 listener.inner().withFrontendIPConfiguration(null);
             }
 
             // Clear deleted frontend port references
             ref = listener.inner().frontendPort();
-            if (ref != null && !this.frontendPorts().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.frontendPorts().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 listener.inner().withFrontendPort(null);
             }
 
             // Clear deleted SSL certificate references
             ref = listener.inner().sslCertificate();
-            if (ref != null && !this.sslCertificates().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.sslCertificates().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 listener.inner().withSslCertificate(null);
             }
         }
@@ -371,25 +371,25 @@ protected void beforeCreating() {
 
             // Clear deleted redirect configs
             ref = rule.inner().redirectConfiguration();
-            if (ref != null && !this.redirectConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.redirectConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 rule.inner().withRedirectConfiguration(null);
             }
 
             // Clear deleted backends
             ref = rule.inner().backendAddressPool();
-            if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 rule.inner().withBackendAddressPool(null);
             }
 
             // Clear deleted backend HTTP configs
             ref = rule.inner().backendHttpSettings();
-            if (ref != null && !this.backendConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.backendConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 rule.inner().withBackendHttpSettings(null);
             }
 
             // Clear deleted frontend HTTP listeners
             ref = rule.inner().httpListener();
-            if (ref != null && !this.listeners().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.listeners().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 rule.inner().withHttpListener(null);
             }
         }
@@ -406,7 +406,7 @@ protected SubResource ensureBackendRef(String name) {
         }
 
         // Return backend reference
-        return new SubResource().setId(this.futureResourceId() + "/backendAddressPools/" + backend.name());
+        return new SubResource().withId(this.futureResourceId() + "/backendAddressPools/" + backend.name());
     }
 
     protected ApplicationGatewayBackendImpl ensureUniqueBackend() {
@@ -919,7 +919,7 @@ public ApplicationGatewayUrlPathMapImpl definePathBasedRoutingRule(String name)
                 this.urlPathMaps,
                 ApplicationGatewayUrlPathMapInner.class,
                 ApplicationGatewayUrlPathMapImpl.class);
-        SubResource ref = new SubResource().setId(futureResourceId() + "/urlPathMaps/" + name);
+        SubResource ref = new SubResource().withId(futureResourceId() + "/urlPathMaps/" + name);
         // create corresponding request routing rule
         ApplicationGatewayRequestRoutingRuleInner inner =
             new ApplicationGatewayRequestRoutingRuleInner()
@@ -944,7 +944,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl defineBackendHttpConfigura
                 this.backendConfigs,
                 ApplicationGatewayBackendHttpSettings.class,
                 ApplicationGatewayBackendHttpConfigurationImpl.class);
-        if (config.inner().getId() == null) {
+        if (config.inner().id() == null) {
             return config.withPort(80); // Default port
         } else {
             return config;
@@ -1504,7 +1504,7 @@ public String networkId() {
         if (subnetRef == null) {
             return null;
         } else {
-            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
         }
     }
 
@@ -1514,7 +1514,7 @@ public String subnetName() {
         if (subnetRef == null) {
             return null;
         } else {
-            return ResourceUtils.nameFromResourceId(subnetRef.getId());
+            return ResourceUtils.nameFromResourceId(subnetRef.id());
         }
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
index 38ae3042ce8b..4a04b92c6950 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
@@ -94,7 +94,7 @@ public ApplicationGatewaySslCertificate sslCertificate() {
             return null;
         }
 
-        String name = ResourceUtils.nameFromResourceId(certRef.getId());
+        String name = ResourceUtils.nameFromResourceId(certRef.id());
         return this.parent().sslCertificates().get(name);
     }
 
@@ -118,7 +118,7 @@ public int frontendPortNumber() {
     @Override
     public String frontendPortName() {
         if (this.inner().frontendPort() != null) {
-            return ResourceUtils.nameFromResourceId(this.inner().frontendPort().getId());
+            return ResourceUtils.nameFromResourceId(this.inner().frontendPort().id());
         } else {
             return null;
         }
@@ -130,7 +130,7 @@ public ApplicationGatewayFrontend frontend() {
         if (frontendInner == null) {
             return null;
         } else {
-            final String frontendName = ResourceUtils.nameFromResourceId(frontendInner.getId());
+            final String frontendName = ResourceUtils.nameFromResourceId(frontendInner.id());
             return this.parent().frontends().get(frontendName);
         }
     }
@@ -147,7 +147,7 @@ public ApplicationGatewayImpl attach() {
 
     private ApplicationGatewayListenerImpl withFrontend(String name) {
         SubResource frontendRef =
-            new SubResource().setId(this.parent().futureResourceId() + "/frontendIPConfigurations/" + name);
+            new SubResource().withId(this.parent().futureResourceId() + "/frontendIPConfigurations/" + name);
         this.inner().withFrontendIPConfiguration(frontendRef);
         return this;
     }
@@ -156,7 +156,7 @@ private ApplicationGatewayListenerImpl withFrontend(String name) {
 
     @Override
     public ApplicationGatewayListenerImpl withFrontendPort(String name) {
-        SubResource portRef = new SubResource().setId(this.parent().futureResourceId() + "/frontendPorts/" + name);
+        SubResource portRef = new SubResource().withId(this.parent().futureResourceId() + "/frontendPorts/" + name);
         this.inner().withFrontendPort(portRef);
         return this;
     }
@@ -176,7 +176,7 @@ public ApplicationGatewayListenerImpl withFrontendPort(int portNumber) {
 
     @Override
     public ApplicationGatewayListenerImpl withSslCertificate(String name) {
-        SubResource certRef = new SubResource().setId(this.parent().futureResourceId() + "/sslCertificates/" + name);
+        SubResource certRef = new SubResource().withId(this.parent().futureResourceId() + "/sslCertificates/" + name);
         this.inner().withSslCertificate(certRef);
         return this;
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java
index 4fd99e46df85..10aba2b2f67e 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java
@@ -47,7 +47,7 @@ public ApplicationGatewayUrlPathMapImpl attach() {
     public ApplicationGatewayPathRuleImpl toBackendHttpConfiguration(String name) {
         SubResource httpConfigRef =
             new SubResource()
-                .setId(this.parent().parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
+                .withId(this.parent().parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
         this.inner().withBackendHttpSettings(httpConfigRef);
         return this;
     }
@@ -64,7 +64,7 @@ public ApplicationGatewayPathRuleImpl withRedirectConfiguration(String name) {
             this.inner().withRedirectConfiguration(null);
         } else {
             SubResource ref =
-                new SubResource().setId(this.parent().parent().futureResourceId() + "/redirectConfigurations/" + name);
+                new SubResource().withId(this.parent().parent().futureResourceId() + "/redirectConfigurations/" + name);
             this.inner().withRedirectConfiguration(ref);
         }
         return this;
@@ -74,7 +74,7 @@ public ApplicationGatewayPathRuleImpl withRedirectConfiguration(String name) {
     public ApplicationGatewayBackend backend() {
         SubResource backendRef = this.inner().backendAddressPool();
         if (backendRef != null) {
-            String backendName = ResourceUtils.nameFromResourceId(backendRef.getId());
+            String backendName = ResourceUtils.nameFromResourceId(backendRef.id());
             return this.parent().parent().backends().get(backendName);
         } else {
             return null;
@@ -85,7 +85,7 @@ public ApplicationGatewayBackend backend() {
     public ApplicationGatewayBackendHttpConfiguration backendHttpConfiguration() {
         SubResource configRef = this.inner().backendHttpSettings();
         if (configRef != null) {
-            String configName = ResourceUtils.nameFromResourceId(configRef.getId());
+            String configName = ResourceUtils.nameFromResourceId(configRef.id());
             return this.parent().parent().backendHttpConfigurations().get(configName);
         } else {
             return null;
@@ -98,7 +98,7 @@ public ApplicationGatewayRedirectConfiguration redirectConfiguration() {
         if (ref == null) {
             return null;
         } else {
-            return this.parent().parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.getId()));
+            return this.parent().parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.id()));
         }
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java
index a158adaadf49..467efdb43cd3 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java
@@ -47,7 +47,7 @@ public ApplicationGatewayListener targetListener() {
             return null;
         }
 
-        String name = ResourceUtils.nameFromResourceId(ref.getId());
+        String name = ResourceUtils.nameFromResourceId(ref.id());
         return this.parent().listeners().get(name);
     }
 
@@ -61,7 +61,7 @@ public Map<String, ApplicationGatewayRequestRoutingRule> requestRoutingRules() {
         Map<String, ApplicationGatewayRequestRoutingRule> rules = new TreeMap<>();
         if (null != this.inner().requestRoutingRules()) {
             for (SubResource ruleRef : this.inner().requestRoutingRules()) {
-                String ruleName = ResourceUtils.nameFromResourceId(ruleRef.getId());
+                String ruleName = ResourceUtils.nameFromResourceId(ruleRef.id());
                 ApplicationGatewayRequestRoutingRule rule = this.parent().requestRoutingRules().get(ruleName);
                 if (null != rule) {
                     rules.put(ruleName, rule);
@@ -104,7 +104,7 @@ public ApplicationGatewayRedirectConfigurationImpl withTargetListener(String nam
         if (name == null) {
             this.inner().withTargetListener(null);
         } else {
-            SubResource ref = new SubResource().setId(this.parent().futureResourceId() + "/httpListeners/" + name);
+            SubResource ref = new SubResource().withId(this.parent().futureResourceId() + "/httpListeners/" + name);
             this.inner().withTargetListener(ref).withTargetUrl(null);
         }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
index 37effeceddfe..fea4caec247d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
@@ -56,7 +56,7 @@ public Collection<ApplicationGatewayBackendAddress> backendAddresses() {
     public ApplicationGatewayUrlPathMap urlPathMap() {
         SubResource urlMapRef = this.inner().urlPathMap();
         if (urlMapRef != null) {
-            String urlMapName = ResourceUtils.nameFromResourceId(urlMapRef.getId());
+            String urlMapName = ResourceUtils.nameFromResourceId(urlMapRef.id());
             return this.parent().urlPathMaps().get(urlMapName);
         } else {
             return null;
@@ -131,7 +131,7 @@ public ApplicationGatewayRequestRoutingRuleType ruleType() {
     public ApplicationGatewayBackend backend() {
         SubResource backendRef = this.inner().backendAddressPool();
         if (backendRef != null) {
-            String backendName = ResourceUtils.nameFromResourceId(backendRef.getId());
+            String backendName = ResourceUtils.nameFromResourceId(backendRef.id());
             return this.parent().backends().get(backendName);
         } else {
             return null;
@@ -142,7 +142,7 @@ public ApplicationGatewayBackend backend() {
     public ApplicationGatewayBackendHttpConfigurationImpl backendHttpConfiguration() {
         SubResource configRef = this.inner().backendHttpSettings();
         if (configRef != null) {
-            String configName = ResourceUtils.nameFromResourceId(configRef.getId());
+            String configName = ResourceUtils.nameFromResourceId(configRef.id());
             return (ApplicationGatewayBackendHttpConfigurationImpl)
                 this.parent().backendHttpConfigurations().get(configName);
         } else {
@@ -154,7 +154,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl backendHttpConfiguration()
     public ApplicationGatewayListenerImpl listener() {
         SubResource listenerRef = this.inner().httpListener();
         if (listenerRef != null) {
-            String listenerName = ResourceUtils.nameFromResourceId(listenerRef.getId());
+            String listenerName = ResourceUtils.nameFromResourceId(listenerRef.id());
             return (ApplicationGatewayListenerImpl) this.parent().listeners().get(listenerName);
         } else {
             return null;
@@ -167,7 +167,7 @@ public ApplicationGatewayRedirectConfiguration redirectConfiguration() {
         if (ref == null) {
             return null;
         } else {
-            return this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.getId()));
+            return this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.id()));
         }
     }
 
@@ -209,7 +209,7 @@ public ApplicationGatewayRequestRoutingRuleImpl fromFrontendHttpsPort(int portNu
     @Override
     public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpConfiguration(String name) {
         SubResource httpConfigRef =
-            new SubResource().setId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
+            new SubResource().withId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
         this.inner().withBackendHttpSettings(httpConfigRef);
         return this;
     }
@@ -248,7 +248,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withoutCookieBasedAffinity() {
 
     @Override
     public ApplicationGatewayRequestRoutingRuleImpl fromListener(String name) {
-        SubResource listenerRef = new SubResource().setId(this.parent().futureResourceId() + "/HTTPListeners/" + name);
+        SubResource listenerRef = new SubResource().withId(this.parent().futureResourceId() + "/HTTPListeners/" + name);
         this.inner().withHttpListener(listenerRef);
         return this;
     }
@@ -396,7 +396,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withRedirectConfiguration(String
             this.inner().withRedirectConfiguration(null);
         } else {
             SubResource ref =
-                new SubResource().setId(this.parent().futureResourceId() + "/redirectConfigurations/" + name);
+                new SubResource().withId(this.parent().futureResourceId() + "/redirectConfigurations/" + name);
             this.inner().withRedirectConfiguration(ref).withBackendAddressPool(null).withBackendHttpSettings(null);
         }
         return this;
@@ -415,7 +415,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withoutRedirectConfiguration() {
             this.inner().withUrlPathMap(null);
         } else {
             SubResource ref =
-                new SubResource().setId(this.parent().futureResourceId() + "/urlPathMaps/" + urlPathMapName);
+                new SubResource().withId(this.parent().futureResourceId() + "/urlPathMaps/" + urlPathMapName);
             this.inner().withUrlPathMap(ref);
         }
         return this;
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
index f4233a17ab27..e791f7c24d37 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
@@ -56,7 +56,7 @@ public Map<String, ApplicationGatewayPathRule> pathRules() {
     public ApplicationGatewayBackend defaultBackend() {
         SubResource backendRef = this.inner().defaultBackendAddressPool();
         return (backendRef != null)
-            ? this.parent().backends().get(ResourceUtils.nameFromResourceId(backendRef.getId()))
+            ? this.parent().backends().get(ResourceUtils.nameFromResourceId(backendRef.id()))
             : null;
     }
 
@@ -67,7 +67,7 @@ public ApplicationGatewayBackendHttpConfiguration defaultBackendHttpConfiguratio
             ? this
                 .parent()
                 .backendHttpConfigurations()
-                .get(ResourceUtils.nameFromResourceId(backendHttpConfigRef.getId()))
+                .get(ResourceUtils.nameFromResourceId(backendHttpConfigRef.id()))
             : null;
     }
 
@@ -75,7 +75,7 @@ public ApplicationGatewayBackendHttpConfiguration defaultBackendHttpConfiguratio
     public ApplicationGatewayRedirectConfiguration defaultRedirectConfiguration() {
         SubResource redirectRef = this.inner().defaultRedirectConfiguration();
         return (redirectRef != null)
-            ? this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(redirectRef.getId()))
+            ? this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(redirectRef.id()))
             : null;
     }
 
@@ -89,7 +89,7 @@ public ApplicationGatewayImpl attach() {
     @Override
     public ApplicationGatewayUrlPathMapImpl toBackendHttpConfiguration(String name) {
         SubResource httpConfigRef =
-            new SubResource().setId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
+            new SubResource().withId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name);
         this.inner().withDefaultBackendHttpSettings(httpConfigRef);
         return this;
     }
@@ -113,7 +113,7 @@ public ApplicationGatewayUrlPathMapImpl withRedirectConfiguration(String name) {
             this.inner().withDefaultRedirectConfiguration(null);
         } else {
             SubResource ref =
-                new SubResource().setId(this.parent().futureResourceId() + "/redirectConfigurations/" + name);
+                new SubResource().withId(this.parent().futureResourceId() + "/redirectConfigurations/" + name);
             this
                 .inner()
                 .withDefaultRedirectConfiguration(ref)
@@ -140,7 +140,7 @@ ApplicationGatewayUrlPathMapImpl withPathRule(ApplicationGatewayPathRuleImpl pat
 
     @Override
     public ApplicationGatewayUrlPathMapImpl fromListener(String name) {
-        SubResource listenerRef = new SubResource().setId(this.parent().futureResourceId() + "/HTTPListeners/" + name);
+        SubResource listenerRef = new SubResource().withId(this.parent().futureResourceId() + "/HTTPListeners/" + name);
         parent().requestRoutingRules().get(this.name()).inner().withHttpListener(listenerRef);
         return this;
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java
index d3337f05cfd0..d867fa906967 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java
@@ -41,7 +41,7 @@ protected ApplicationGatewayImpl wrapModel(String name) {
 
     @Override
     protected ApplicationGatewayImpl wrapModel(ApplicationGatewayInner inner) {
-        return (inner == null) ? null : new ApplicationGatewayImpl(inner.getName(), inner, this.manager());
+        return (inner == null) ? null : new ApplicationGatewayImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java
index 9799910669ee..9376e0eb70f4 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java
@@ -38,6 +38,6 @@ protected ApplicationSecurityGroupImpl wrapModel(ApplicationSecurityGroupInner i
         if (inner == null) {
             return null;
         }
-        return new ApplicationSecurityGroupImpl(inner.getName(), inner, this.manager());
+        return new ApplicationSecurityGroupImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java
index 70afd087c86b..2b8652959751 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java
@@ -47,12 +47,12 @@ protected Mono<ConnectionMonitorResultInner> getInnerAsync() {
 
     @Override
     public String location() {
-        return inner().getLocation();
+        return inner().location();
     }
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new TreeMap<>();
         }
@@ -137,7 +137,7 @@ public Mono<ConnectionMonitorQueryResult> queryAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -150,7 +150,7 @@ public Mono<ConnectionMonitor> createResourceAsync() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java
index 913ad524d5fc..c9cdb80cc1dc 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java
@@ -46,7 +46,7 @@ protected ConnectionMonitorImpl wrapModel(String name) {
     }
 
     protected ConnectionMonitorImpl wrapModel(ConnectionMonitorResultInner inner) {
-        return (inner == null) ? null : new ConnectionMonitorImpl(inner.getName(), parent, inner, inner());
+        return (inner == null) ? null : new ConnectionMonitorImpl(inner.name(), parent, inner, inner());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java
index 1f7c95ddd576..1125e542b928 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java
@@ -34,6 +34,6 @@ protected DdosProtectionPlanImpl wrapModel(DdosProtectionPlanInner inner) {
         if (inner == null) {
             return null;
         }
-        return new DdosProtectionPlanImpl(inner.getName(), inner, this.manager());
+        return new DdosProtectionPlanImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java
index afab4b6366bd..9c3ea2b8c7ab 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java
@@ -137,7 +137,7 @@ protected Mono<ExpressRouteCircuitInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .expressRouteCircuits()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     // Getters
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java
index 6de9146ce80d..e4cb45cd78e4 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java
@@ -84,7 +84,7 @@ protected Mono<ExpressRouteCircuitPeeringInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -104,7 +104,7 @@ public Mono<ExpressRouteCircuitPeering> createResourceAsync() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java
index 71f8f54ea198..9b03133c37ae 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java
@@ -33,7 +33,7 @@ protected ExpressRouteCircuitImpl wrapModel(ExpressRouteCircuitInner inner) {
         if (inner == null) {
             return null;
         }
-        return new ExpressRouteCircuitImpl(inner.getName(), inner, this.manager());
+        return new ExpressRouteCircuitImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java
index 8234083f77c4..106cab463dfc 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java
@@ -79,7 +79,7 @@ protected Mono<ExpressRouteCrossConnectionInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .expressRouteCrossConnections()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java
index fddea2687562..11d1e7a34ef1 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java
@@ -120,7 +120,7 @@ protected Mono<ExpressRouteCrossConnectionPeeringInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -140,7 +140,7 @@ public Mono<ExpressRouteCrossConnectionPeering> createResourceAsync() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java
index 3f1639daf5d8..a911080f3601 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java
@@ -27,7 +27,7 @@ protected ExpressRouteCrossConnectionImpl wrapModel(ExpressRouteCrossConnectionI
         if (inner == null) {
             return null;
         }
-        return new ExpressRouteCrossConnectionImpl(inner.getName(), inner, this.manager());
+        return new ExpressRouteCrossConnectionImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java
index c701802678ee..2bc5b0fc0ae5 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java
@@ -61,7 +61,7 @@ public Ipv6PeeringConfigImpl withCustomerASN(int customerASN) {
 
     @Override
     public Ipv6PeeringConfigImpl withRouteFilter(String routeFilterId) {
-        inner().withRouteFilter(new SubResource().setId(routeFilterId));
+        inner().withRouteFilter(new SubResource().withId(routeFilterId));
         return this;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java
index 467900533164..cc297223ef38 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java
@@ -41,8 +41,8 @@ public Map<String, String> backendNicIPConfigurationNames() {
         final Map<String, String> ipConfigNames = new TreeMap<>();
         if (this.inner().backendIPConfigurations() != null) {
             for (NetworkInterfaceIPConfigurationInner inner : this.inner().backendIPConfigurations()) {
-                String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.getId());
-                String ipConfigName = ResourceUtils.nameFromResourceId(inner.getId());
+                String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.id());
+                String ipConfigName = ResourceUtils.nameFromResourceId(inner.id());
                 ipConfigNames.put(nicId, ipConfigName);
             }
         }
@@ -55,7 +55,7 @@ public Map<String, LoadBalancingRule> loadBalancingRules() {
         final Map<String, LoadBalancingRule> rules = new TreeMap<>();
         if (this.inner().loadBalancingRules() != null) {
             for (SubResource inner : this.inner().loadBalancingRules()) {
-                String name = ResourceUtils.nameFromResourceId(inner.getId());
+                String name = ResourceUtils.nameFromResourceId(inner.id());
                 LoadBalancingRule rule = this.parent().loadBalancingRules().get(name);
                 if (rule != null) {
                     rules.put(name, rule);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
index 862236bc794d..c8180e56c20a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
@@ -50,7 +50,7 @@ class LoadBalancerFrontendImpl extends ChildResourceImpl<FrontendIPConfiguration
     public String networkId() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -60,7 +60,7 @@ public String networkId() {
     public String subnetName() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.nameFromResourceId(subnetRef.getId());
+            return ResourceUtils.nameFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -83,7 +83,7 @@ public String name() {
 
     @Override
     public String publicIPAddressId() {
-        return this.inner().publicIPAddress().getId();
+        return this.inner().publicIPAddress().id();
     }
 
     @Override
@@ -96,7 +96,7 @@ public Map<String, LoadBalancingRule> loadBalancingRules() {
         final Map<String, LoadBalancingRule> rules = new TreeMap<>();
         if (this.inner().loadBalancingRules() != null) {
             for (SubResource innerRef : this.inner().loadBalancingRules()) {
-                String name = ResourceUtils.nameFromResourceId(innerRef.getId());
+                String name = ResourceUtils.nameFromResourceId(innerRef.id());
                 LoadBalancingRule rule = this.parent().loadBalancingRules().get(name);
                 if (rule != null) {
                     rules.put(name, rule);
@@ -112,7 +112,7 @@ public Map<String, LoadBalancerInboundNatPool> inboundNatPools() {
         final Map<String, LoadBalancerInboundNatPool> pools = new TreeMap<>();
         if (this.inner().inboundNatPools() != null) {
             for (SubResource innerRef : this.inner().inboundNatPools()) {
-                String name = ResourceUtils.nameFromResourceId(innerRef.getId());
+                String name = ResourceUtils.nameFromResourceId(innerRef.id());
                 LoadBalancerInboundNatPool pool = this.parent().inboundNatPools().get(name);
                 if (pool != null) {
                     pools.put(name, pool);
@@ -128,7 +128,7 @@ public Map<String, LoadBalancerInboundNatRule> inboundNatRules() {
         final Map<String, LoadBalancerInboundNatRule> rules = new TreeMap<>();
         if (this.inner().inboundNatRules() != null) {
             for (SubResource innerRef : this.inner().inboundNatRules()) {
-                String name = ResourceUtils.nameFromResourceId(innerRef.getId());
+                String name = ResourceUtils.nameFromResourceId(innerRef.id());
                 LoadBalancerInboundNatRule rule = this.parent().inboundNatRules().get(name);
                 if (rule != null) {
                     rules.put(name, rule);
@@ -149,7 +149,7 @@ public LoadBalancerFrontendImpl withExistingSubnet(Network network, String subne
     @Override
     public LoadBalancerFrontendImpl withExistingSubnet(String parentNetworkResourceId, String subnetName) {
         SubnetInner subnetRef = new SubnetInner();
-        subnetRef.setId(parentNetworkResourceId + "/subnets/" + subnetName);
+        subnetRef.withId(parentNetworkResourceId + "/subnets/" + subnetName);
         this
             .inner()
             .withSubnet(subnetRef)
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
index a1224be5b9c4..be81dba026ee 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
@@ -89,7 +89,7 @@ protected Mono<LoadBalancerInner> getInnerAsync() {
 
     @Override
     protected Mono<LoadBalancerInner> applyTagsToInnerAsync() {
-        return this.manager().inner().loadBalancers().updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+        return this.manager().inner().loadBalancers().updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     // Helpers
@@ -122,7 +122,7 @@ protected SubResource ensureFrontendRef(String name) {
         }
 
         // Return frontend reference
-        return new SubResource().setId(this.futureResourceId() + "/frontendIPConfigurations/" + frontend.name());
+        return new SubResource().withId(this.futureResourceId() + "/frontendIPConfigurations/" + frontend.name());
     }
 
     protected LoadBalancerFrontendImpl ensureUniqueFrontend() {
@@ -225,7 +225,7 @@ protected void beforeCreating() {
         for (LoadBalancerInboundNatRule natRule : this.inboundNatRules.values()) {
             // Clear deleted frontend references
             SubResource ref = natRule.inner().frontendIPConfiguration();
-            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 natRule.inner().withFrontendIPConfiguration(null);
             }
         }
@@ -239,7 +239,7 @@ protected void beforeCreating() {
         for (LoadBalancerInboundNatPool natPool : this.inboundNatPools.values()) {
             // Clear deleted frontend references
             SubResource ref = natPool.inner().frontendIPConfiguration();
-            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 natPool.inner().withFrontendIPConfiguration(null);
             }
         }
@@ -255,22 +255,22 @@ protected void beforeCreating() {
 
             // Clear deleted frontend references
             ref = lbRule.inner().frontendIPConfiguration();
-            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 lbRule.inner().withFrontendIPConfiguration(null);
             }
 
             // Clear deleted backend references
             ref = lbRule.inner().backendAddressPool();
-            if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+            if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 lbRule.inner().withBackendAddressPool(null);
             }
 
             // Clear deleted probe references
             ref = lbRule.inner().probe();
             if (ref != null
-                && !this.httpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))
-                && !this.httpsProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))
-                && !this.tcpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) {
+                && !this.httpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))
+                && !this.httpsProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))
+                && !this.tcpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) {
                 lbRule.inner().withProbe(null);
             }
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
index 6ac402483000..9ae579847a4b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
@@ -49,7 +49,7 @@ public LoadBalancerFrontend frontend() {
         return this
             .parent()
             .frontends()
-            .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().getId()));
+            .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().id()));
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
index 0e5ab428d9f8..5d9646e74cdc 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
@@ -39,7 +39,7 @@ public String backendNicIPConfigurationName() {
         if (this.inner().backendIPConfiguration() == null) {
             return null;
         } else {
-            return ResourceUtils.nameFromResourceId(this.inner().backendIPConfiguration().getId());
+            return ResourceUtils.nameFromResourceId(this.inner().backendIPConfiguration().id());
         }
     }
 
@@ -53,7 +53,7 @@ public String backendNetworkInterfaceId() {
         if (this.inner().backendIPConfiguration() == null) {
             return null;
         } else {
-            return ResourceUtils.parentResourceIdFromResourceId(this.inner().backendIPConfiguration().getId());
+            return ResourceUtils.parentResourceIdFromResourceId(this.inner().backendIPConfiguration().id());
         }
     }
 
@@ -77,7 +77,7 @@ public LoadBalancerFrontend frontend() {
         return this
             .parent()
             .frontends()
-            .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().getId()));
+            .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().id()));
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java
index e437a0321b62..854e9c449011 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java
@@ -68,7 +68,7 @@ public Map<String, LoadBalancingRule> loadBalancingRules() {
         final Map<String, LoadBalancingRule> rules = new TreeMap<>();
         if (this.inner().loadBalancingRules() != null) {
             for (SubResource inner : this.inner().loadBalancingRules()) {
-                String name = ResourceUtils.nameFromResourceId(inner.getId());
+                String name = ResourceUtils.nameFromResourceId(inner.id());
                 LoadBalancingRule rule = this.parent().loadBalancingRules().get(name);
                 if (rule != null) {
                     rules.put(name, rule);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java
index cb29950ab144..897593da77da 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java
@@ -36,6 +36,6 @@ protected LoadBalancerImpl wrapModel(LoadBalancerInner inner) {
         if (inner == null) {
             return null;
         }
-        return new LoadBalancerImpl(inner.getName(), inner, this.manager());
+        return new LoadBalancerImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
index 11961bb51023..7ef3f366ec69 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
@@ -76,7 +76,7 @@ public LoadBalancerFrontend frontend() {
         if (frontendRef == null) {
             return null;
         } else {
-            String frontendName = ResourceUtils.nameFromResourceId(frontendRef.getId());
+            String frontendName = ResourceUtils.nameFromResourceId(frontendRef.id());
             return this.parent().frontends().get(frontendName);
         }
     }
@@ -87,7 +87,7 @@ public LoadBalancerBackend backend() {
         if (backendRef == null) {
             return null;
         } else {
-            String backendName = ResourceUtils.nameFromResourceId(backendRef.getId());
+            String backendName = ResourceUtils.nameFromResourceId(backendRef.id());
             return this.parent().backends().get(backendName);
         }
     }
@@ -98,7 +98,7 @@ public LoadBalancerProbe probe() {
         if (probeRef == null) {
             return null;
         } else {
-            String probeName = ResourceUtils.nameFromResourceId(probeRef.getId());
+            String probeName = ResourceUtils.nameFromResourceId(probeRef.id());
             if (this.parent().httpProbes().containsKey(probeName)) {
                 return this.parent().httpProbes().get(probeName);
             } else if (this.parent().tcpProbes().containsKey(probeName)) {
@@ -241,14 +241,14 @@ public LoadBalancingRuleImpl toBackend(String backendName) {
         this.parent().defineBackend(backendName).attach();
 
         SubResource backendRef =
-            new SubResource().setId(this.parent().futureResourceId() + "/backendAddressPools/" + backendName);
+            new SubResource().withId(this.parent().futureResourceId() + "/backendAddressPools/" + backendName);
         this.inner().withBackendAddressPool(backendRef);
         return this;
     }
 
     @Override
     public LoadBalancingRuleImpl withProbe(String name) {
-        SubResource probeRef = new SubResource().setId(this.parent().futureResourceId() + "/probes/" + name);
+        SubResource probeRef = new SubResource().withId(this.parent().futureResourceId() + "/probes/" + name);
         this.inner().withProbe(probeRef);
         return this;
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java
index 6e9df90eb152..528699244d89 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java
@@ -136,7 +136,7 @@ public Mono<LocalNetworkGateway> applyTagsAsync() {
             .manager()
             .inner()
             .localNetworkGateways()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags())
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags())
             .flatMap(
                 inner -> {
                     setInner(inner);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java
index 70f820ba37f9..135201c7779a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java
@@ -96,6 +96,6 @@ protected LocalNetworkGatewayImpl wrapModel(LocalNetworkGatewayInner inner) {
         if (inner == null) {
             return null;
         }
-        return new LocalNetworkGatewayImpl(inner.getName(), inner, this.manager());
+        return new LocalNetworkGatewayImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
index d011c2ef5ba6..3a03cf742c65 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
@@ -78,7 +78,7 @@ protected Mono<VirtualNetworkInner> getInnerAsync() {
 
     @Override
     protected Mono<VirtualNetworkInner> applyTagsToInnerAsync() {
-        return this.manager().inner().virtualNetworks().updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+        return this.manager().inner().virtualNetworks().updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     @Override
@@ -276,7 +276,7 @@ public boolean isVmProtectionEnabled() {
 
     @Override
     public String ddosProtectionPlanId() {
-        return inner().ddosProtectionPlan() == null ? null : inner().ddosProtectionPlan().getId();
+        return inner().ddosProtectionPlan() == null ? null : inner().ddosProtectionPlan().id();
     }
 
     @Override
@@ -298,7 +298,7 @@ public NetworkImpl withNewDdosProtectionPlan() {
 
     @Override
     public NetworkImpl withExistingDdosProtectionPlan(String planId) {
-        inner().withEnableDdosProtection(true).withDdosProtectionPlan(new SubResource().setId(planId));
+        inner().withEnableDdosProtection(true).withDdosProtectionPlan(new SubResource().withId(planId));
         return this;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
index 701242cc857b..19eb4fbc2d4a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
@@ -82,7 +82,7 @@ protected Mono<NetworkInterfaceInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .networkInterfaces()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     // Setters (fluent)
@@ -282,7 +282,7 @@ public boolean isAcceleratedNetworkingEnabled() {
     @Override
     public String virtualMachineId() {
         if (this.inner().virtualMachine() != null) {
-            return this.inner().virtualMachine().getId();
+            return this.inner().virtualMachine().id();
         } else {
             return null;
         }
@@ -347,7 +347,7 @@ public Map<String, NicIPConfiguration> ipConfigurations() {
 
     @Override
     public String networkSecurityGroupId() {
-        return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().getId() : null;
+        return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().id() : null;
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java
index 8e80cd7b07ff..90b028d6bcb6 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java
@@ -82,6 +82,6 @@ protected NetworkInterfaceImpl wrapModel(NetworkInterfaceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new NetworkInterfaceImpl(inner.getName(), inner, this.manager());
+        return new NetworkInterfaceImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java
index 15fc5e1aa364..4408e5d57625 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java
@@ -266,8 +266,8 @@ Subnet getAssociatedSubnet(SubResource subnetRef) {
             return null;
         }
 
-        String vnetId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
-        String subnetName = ResourceUtils.nameFromResourceId(subnetRef.getId());
+        String vnetId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
+        String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id());
 
         if (vnetId == null || subnetName == null) {
             return null;
@@ -288,14 +288,14 @@ List<Subnet> listAssociatedSubnets(List<SubnetInner> subnetRefs) {
 
         if (subnetRefs != null) {
             for (SubnetInner subnetRef : subnetRefs) {
-                String networkId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+                String networkId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
                 Network network = networks.get(networkId.toLowerCase(Locale.ROOT));
                 if (network == null) {
                     network = this.networks().getById(networkId);
                     networks.put(networkId.toLowerCase(Locale.ROOT), network);
                 }
 
-                String subnetName = ResourceUtils.nameFromResourceId(subnetRef.getId());
+                String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id());
                 subnets.add(network.subnets().get(subnetName));
             }
         }
@@ -311,14 +311,14 @@ Collection<ApplicationGatewayBackend> listAssociatedApplicationGatewayBackends(
 
         if (backendRefs != null) {
             for (ApplicationGatewayBackendAddressPool backendRef : backendRefs) {
-                String appGatewayId = ResourceUtils.parentResourceIdFromResourceId(backendRef.getId());
+                String appGatewayId = ResourceUtils.parentResourceIdFromResourceId(backendRef.id());
                 ApplicationGateway appGateway = appGateways.get(appGatewayId.toLowerCase(Locale.ROOT));
                 if (appGateway == null) {
                     appGateway = this.applicationGateways().getById(appGatewayId);
                     appGateways.put(appGatewayId.toLowerCase(Locale.ROOT), appGateway);
                 }
 
-                String backendName = ResourceUtils.nameFromResourceId(backendRef.getId());
+                String backendName = ResourceUtils.nameFromResourceId(backendRef.id());
                 backends.add(appGateway.backends().get(backendName));
             }
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
index f3858609a5bb..83933c6b7e9a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
@@ -67,7 +67,7 @@ public String name() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -85,7 +85,7 @@ public List<String> remoteAddressSpaces() {
 
     @Override
     public String remoteNetworkId() {
-        return (this.inner().remoteVirtualNetwork() != null) ? this.inner().remoteVirtualNetwork().getId() : null;
+        return (this.inner().remoteVirtualNetwork() != null) ? this.inner().remoteVirtualNetwork().id() : null;
     }
 
     @Override
@@ -121,7 +121,7 @@ public NetworkPeeringImpl withoutAccessFromEitherNetwork() {
 
     @Override
     public NetworkPeeringImpl withRemoteNetwork(String resourceId) {
-        SubResource networkRef = new SubResource().setId(resourceId);
+        SubResource networkRef = new SubResource().withId(resourceId);
         this.inner().withRemoteVirtualNetwork(networkRef);
         return this;
     }
@@ -263,7 +263,7 @@ protected Mono<NetworkPeering> createChildResourceAsync() {
                     SubResource networkRef = inner.remoteVirtualNetwork();
                     if (localPeering.isSameSubscription()) {
                         // Update the remote network only if it is in the same subscription
-                        return localPeering.manager().networks().getByIdAsync(networkRef.getId());
+                        return localPeering.manager().networks().getByIdAsync(networkRef.id());
                     } else {
                         // Otherwise, skip this
                         return Mono.empty();
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java
index d4425a5b8add..efbfb9497388 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java
@@ -93,7 +93,7 @@ protected Mono<NetworkSecurityGroupInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .networkSecurityGroups()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     @Override
@@ -131,7 +131,7 @@ public Set<String> networkInterfaceIds() {
         Set<String> ids = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         if (this.inner().networkInterfaces() != null) {
             for (NetworkInterfaceInner inner : this.inner().networkInterfaces()) {
-                ids.add(inner.getId());
+                ids.add(inner.id());
             }
         }
         return Collections.unmodifiableSet(ids);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java
index 3d4f4866b479..419d96463b18 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java
@@ -62,6 +62,6 @@ protected NetworkSecurityGroupImpl wrapModel(NetworkSecurityGroupInner inner) {
         if (inner == null) {
             return null;
         }
-        return new NetworkSecurityGroupImpl(inner.getName(), inner, this.manager());
+        return new NetworkSecurityGroupImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java
index 4fad44f80f23..fa1c845785a4 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java
@@ -35,12 +35,12 @@ class NetworkSecurityRuleImpl
         super(inner, parent);
         if (inner.sourceApplicationSecurityGroups() != null) {
             for (ApplicationSecurityGroupInner asg : inner.sourceApplicationSecurityGroups()) {
-                sourceAsgs.put(asg.getId(), asg);
+                sourceAsgs.put(asg.id(), asg);
             }
         }
         if (inner.destinationApplicationSecurityGroups() != null) {
             for (ApplicationSecurityGroupInner asg : inner.destinationApplicationSecurityGroups()) {
-                destinationAsgs.put(asg.getId(), asg);
+                destinationAsgs.put(asg.id(), asg);
             }
         }
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java
index 14d3523d1a1b..748dd1547c46 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java
@@ -135,7 +135,7 @@ public Mono<NetworkWatcher> applyTagsAsync() {
             .manager()
             .inner()
             .networkWatchers()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags())
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags())
             .flatMap(
                 inner -> {
                     setInner(inner);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java
index 9570de97f077..407c68c24fb2 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java
@@ -35,6 +35,6 @@ protected NetworkWatcherImpl wrapModel(NetworkWatcherInner inner) {
         if (inner == null) {
             return null;
         }
-        return new NetworkWatcherImpl(inner.getName(), inner, this.manager());
+        return new NetworkWatcherImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java
index 76dca8c522a0..86d3ed37dd7d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java
@@ -68,6 +68,6 @@ protected NetworkImpl wrapModel(VirtualNetworkInner inner) {
         if (inner == null) {
             return null;
         }
-        return new NetworkImpl(inner.getName(), inner, this.manager());
+        return new NetworkImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java
index 01e7203be389..fea5125513b4 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java
@@ -95,7 +95,7 @@ public String networkId() {
         if (subnetRef == null) {
             return null;
         }
-        return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+        return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
     }
 
     public Network getNetwork() {
@@ -112,7 +112,7 @@ public String subnetName() {
         if (subnetRef == null) {
             return null;
         }
-        return ResourceUtils.nameFromResourceId(subnetRef.getId());
+        return ResourceUtils.nameFromResourceId(subnetRef.id());
     }
 
     @Override
@@ -132,13 +132,13 @@ public List<LoadBalancerBackend> listAssociatedLoadBalancerBackends() {
         final Map<String, LoadBalancer> loadBalancers = new HashMap<>();
         final List<LoadBalancerBackend> backends = new ArrayList<>();
         for (BackendAddressPoolInner backendRef : backendRefs) {
-            String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(backendRef.getId());
+            String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(backendRef.id());
             LoadBalancer loadBalancer = loadBalancers.get(loadBalancerId.toLowerCase(Locale.ROOT));
             if (loadBalancer == null) {
                 loadBalancer = this.networkManager.loadBalancers().getById(loadBalancerId);
                 loadBalancers.put(loadBalancerId.toLowerCase(Locale.ROOT), loadBalancer);
             }
-            String backendName = ResourceUtils.nameFromResourceId(backendRef.getId());
+            String backendName = ResourceUtils.nameFromResourceId(backendRef.id());
             backends.add(loadBalancer.backends().get(backendName));
         }
         return Collections.unmodifiableList(backends);
@@ -153,13 +153,13 @@ public List<LoadBalancerInboundNatRule> listAssociatedLoadBalancerInboundNatRule
         final Map<String, LoadBalancer> loadBalancers = new HashMap<>();
         final List<LoadBalancerInboundNatRule> rules = new ArrayList<>();
         for (InboundNatRuleInner ref : inboundNatPoolRefs) {
-            String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(ref.getId());
+            String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(ref.id());
             LoadBalancer loadBalancer = loadBalancers.get(loadBalancerId.toLowerCase(Locale.ROOT));
             if (loadBalancer == null) {
                 loadBalancer = this.networkManager.loadBalancers().getById(loadBalancerId);
                 loadBalancers.put(loadBalancerId.toLowerCase(Locale.ROOT), loadBalancer);
             }
-            String ruleName = ResourceUtils.nameFromResourceId(ref.getId());
+            String ruleName = ResourceUtils.nameFromResourceId(ref.id());
             rules.add(loadBalancer.inboundNatRules().get(ruleName));
         }
         return Collections.unmodifiableList(rules);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java
index 6a0356465266..7c251c369c6f 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java
@@ -70,7 +70,7 @@ public String publicIPAddressId() {
         if (this.inner().publicIPAddress() == null) {
             return null;
         }
-        return this.inner().publicIPAddress().getId();
+        return this.inner().publicIPAddress().id();
     }
 
     @Override
@@ -285,13 +285,13 @@ private SubnetInner subnetToAssociate() {
         if (this.isInCreateMode) {
             if (this.creatableVirtualNetworkKey != null) {
                 Network network = (Network) parent().createdDependencyResource(this.creatableVirtualNetworkKey);
-                subnetInner.setId(network.inner().subnets().get(0).getId());
+                subnetInner.withId(network.inner().subnets().get(0).id());
                 return subnetInner;
             }
 
             for (SubnetInner subnet : this.existingVirtualNetworkToAssociate.inner().subnets()) {
                 if (subnet.name().equalsIgnoreCase(this.subnetToAssociate)) {
-                    subnetInner.setId(subnet.getId());
+                    subnetInner.withId(subnet.id());
                     return subnetInner;
                 }
             }
@@ -305,10 +305,10 @@ private SubnetInner subnetToAssociate() {
 
         } else {
             if (subnetToAssociate != null) {
-                int idx = this.inner().subnet().getId().lastIndexOf('/');
-                subnetInner.setId(this.inner().subnet().getId().substring(0, idx + 1) + subnetToAssociate);
+                int idx = this.inner().subnet().id().lastIndexOf('/');
+                subnetInner.withId(this.inner().subnet().id().substring(0, idx + 1) + subnetToAssociate);
             } else {
-                subnetInner.setId(this.inner().subnet().getId());
+                subnetInner.withId(this.inner().subnet().id());
             }
             return subnetInner;
         }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java
index e577008f7758..15ce6fe4b922 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java
@@ -126,7 +126,7 @@ void attachPCFilter(PCFilterImpl pcFilter) {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -139,7 +139,7 @@ public Mono<PacketCapture> createResourceAsync() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java
index 9ee602f6ff9e..b203578ca8ac 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java
@@ -23,7 +23,7 @@ public String name() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java
index 4e3e9910be60..1d7830fe2dd2 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java
@@ -188,7 +188,7 @@ private boolean equalsResourceType(String resourceType) {
         if (ipConfig == null || resourceType == null) {
             return false;
         } else {
-            final String refId = this.inner().ipConfiguration().getId();
+            final String refId = this.inner().ipConfiguration().id();
             final String resourceType2 = ResourceUtils.resourceTypeFromResourceId(refId);
             return resourceType.equalsIgnoreCase(resourceType2);
         }
@@ -202,7 +202,7 @@ public boolean hasAssignedLoadBalancer() {
     @Override
     public LoadBalancerPublicFrontend getAssignedLoadBalancerFrontend() {
         if (this.hasAssignedLoadBalancer()) {
-            final String refId = this.inner().ipConfiguration().getId();
+            final String refId = this.inner().ipConfiguration().id();
             final String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(refId);
             final LoadBalancer lb = this.myManager.loadBalancers().getById(loadBalancerId);
             final String frontendName = ResourceUtils.nameFromResourceId(refId);
@@ -241,7 +241,7 @@ public List<IpTag> ipTags() {
     @Override
     public NicIPConfiguration getAssignedNetworkInterfaceIPConfiguration() {
         if (this.hasAssignedNetworkInterface()) {
-            final String refId = this.inner().ipConfiguration().getId();
+            final String refId = this.inner().ipConfiguration().id();
             final String parentId = ResourceUtils.parentResourceIdFromResourceId(refId);
             final NetworkInterface nic = this.myManager.networkInterfaces().getById(parentId);
             final String childName = ResourceUtils.nameFromResourceId(refId);
@@ -267,7 +267,7 @@ public Mono<PublicIPAddress> applyTagsAsync() {
             .manager()
             .inner()
             .publicIPAddresses()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags())
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags())
             .flatMap(
                 inner -> {
                     setInner(inner);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java
index 5282c177360e..924d77b57882 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java
@@ -42,6 +42,6 @@ protected PublicIPAddressImpl wrapModel(PublicIPAddressInner inner) {
         if (inner == null) {
             return null;
         }
-        return new PublicIPAddressImpl(inner.getId(), inner, this.manager());
+        return new PublicIPAddressImpl(inner.id(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java
index 03cdea3133e5..25bf55ea4684 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java
@@ -34,6 +34,6 @@ protected RouteFilterImpl wrapModel(RouteFilterInner inner) {
         if (inner == null) {
             return null;
         }
-        return new RouteFilterImpl(inner.getName(), inner, this.manager());
+        return new RouteFilterImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java
index 25377cdd13fb..1927f0f7f7ea 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java
@@ -29,7 +29,7 @@ class RouteTableImpl
 
     @Override
     protected Mono<RouteTableInner> applyTagsToInnerAsync() {
-        return this.manager().inner().routeTables().updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+        return this.manager().inner().routeTables().updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java
index d2cf68e79159..cecc7121328c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java
@@ -34,6 +34,6 @@ protected RouteTableImpl wrapModel(String name) {
 
     @Override
     protected RouteTableImpl wrapModel(RouteTableInner inner) {
-        return new RouteTableImpl(inner.getName(), inner, this.manager());
+        return new RouteTableImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java
index 8ba91fc52e25..47a8d6bcfd7b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java
@@ -32,7 +32,7 @@ private void initializeFromInner() {
         List<SecurityGroupNetworkInterface> securityGroupNetworkInterfaces = this.inner().networkInterfaces();
         if (securityGroupNetworkInterfaces != null) {
             for (SecurityGroupNetworkInterface networkInterface : securityGroupNetworkInterfaces) {
-                this.networkInterfaces.put(networkInterface.getId(), networkInterface);
+                this.networkInterfaces.put(networkInterface.id(), networkInterface);
             }
         }
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java
index 97e693d9d1e4..f3dbabed82ff 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java
@@ -63,12 +63,12 @@ public String name() {
 
     @Override
     public String networkSecurityGroupId() {
-        return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().getId() : null;
+        return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().id() : null;
     }
 
     @Override
     public String routeTableId() {
-        return (this.inner().routeTable() != null) ? this.inner().routeTable().getId() : null;
+        return (this.inner().routeTable() != null) ? this.inner().routeTable().id() : null;
     }
 
     @Override
@@ -216,8 +216,8 @@ public Collection<NicIPConfiguration> listNetworkInterfaceIPConfigurations() {
         }
 
         for (IPConfigurationInner ipConfigRef : ipConfigRefs) {
-            String nicID = ResourceUtils.parentResourceIdFromResourceId(ipConfigRef.getId());
-            String ipConfigName = ResourceUtils.nameFromResourceId(ipConfigRef.getId());
+            String nicID = ResourceUtils.parentResourceIdFromResourceId(ipConfigRef.id());
+            String ipConfigName = ResourceUtils.nameFromResourceId(ipConfigRef.id());
             // Check if NIC already cached
             NetworkInterface nic = nics.get(nicID.toLowerCase(Locale.ROOT));
             if (nic == null) {
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java
index 9770f3889b07..4ce8007422a2 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java
@@ -29,7 +29,7 @@ class TopologyImpl extends ExecutableImpl<Topology> implements Topology, Topolog
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
@@ -57,7 +57,7 @@ private void initializeResourcesFromInner() {
         List<TopologyResource> topologyResources = this.inner().resources();
         if (topologyResources != null) {
             for (TopologyResource resource : topologyResources) {
-                this.resources.put(resource.getId(), resource);
+                this.resources.put(resource.id(), resource);
             }
         }
     }
@@ -75,7 +75,7 @@ public TopologyImpl withTargetResourceGroup(String resourceGroupName) {
 
     @Override
     public TopologyImpl withTargetNetwork(String networkId) {
-        parameters.withTargetVirtualNetwork(new SubResource().setId(networkId));
+        parameters.withTargetVirtualNetwork(new SubResource().withId(networkId));
         return this;
     }
 
@@ -83,7 +83,7 @@ public TopologyImpl withTargetNetwork(String networkId) {
     public TopologyImpl withTargetSubnet(String subnetName) {
         parameters
             .withTargetSubnet(
-                new SubResource().setId(parameters.targetVirtualNetwork().getId() + "/subnets/" + subnetName));
+                new SubResource().withId(parameters.targetVirtualNetwork().id() + "/subnets/" + subnetName));
         return this;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java
index 8370b5ff3ec2..a3f5367fb941 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java
@@ -145,7 +145,7 @@ public String networkSecurityGroupId() {
         if (this.inner().networkSecurityGroup() == null) {
             return null;
         }
-        return this.inner().networkSecurityGroup().getId();
+        return this.inner().networkSecurityGroup().id();
     }
 
     @Override
@@ -165,7 +165,7 @@ public String virtualMachineId() {
         if (this.inner().virtualMachine() == null) {
             return null;
         }
-        return this.inner().virtualMachine().getId();
+        return this.inner().virtualMachine().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java
index 0c2d2b903060..f67fd0c4d4d9 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java
@@ -43,7 +43,7 @@ protected VirtualMachineScaleSetNetworkInterfaceImpl wrapModel(NetworkInterfaceI
             return null;
         }
         return new VirtualMachineScaleSetNetworkInterfaceImpl(
-            inner.getName(), this.scaleSetName, this.resourceGroupName, inner, this.manager());
+            inner.name(), this.scaleSetName, this.resourceGroupName, inner, this.manager());
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java
index 9bc335d62b9b..157e72a67ecf 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java
@@ -53,7 +53,7 @@ public String virtualNetworkGateway1Id() {
         if (inner().virtualNetworkGateway1() == null) {
             return null;
         }
-        return inner().virtualNetworkGateway1().getId();
+        return inner().virtualNetworkGateway1().id();
     }
 
     @Override
@@ -61,7 +61,7 @@ public String virtualNetworkGateway2Id() {
         if (inner().virtualNetworkGateway2() == null) {
             return null;
         }
-        return inner().virtualNetworkGateway2().getId();
+        return inner().virtualNetworkGateway2().id();
     }
 
     @Override
@@ -69,7 +69,7 @@ public String localNetworkGateway2Id() {
         if (inner().localNetworkGateway2() == null) {
             return null;
         }
-        return inner().localNetworkGateway2().getId();
+        return inner().localNetworkGateway2().id();
     }
 
     @Override
@@ -109,7 +109,7 @@ public long ingressBytesTransferred() {
 
     @Override
     public String peerId() {
-        return inner().peer() == null ? null : inner().peer().getId();
+        return inner().peer() == null ? null : inner().peer().id();
     }
 
     @Override
@@ -147,7 +147,7 @@ public VirtualNetworkGatewayConnectionImpl withVNetToVNet() {
     @Override
     public VirtualNetworkGatewayConnectionImpl withExpressRoute(String circuitId) {
         inner().withConnectionType(VirtualNetworkGatewayConnectionType.EXPRESS_ROUTE);
-        inner().withPeer(new SubResource().setId(circuitId));
+        inner().withPeer(new SubResource().withId(circuitId));
         return this;
     }
 
@@ -231,7 +231,7 @@ public Mono<VirtualNetworkGatewayConnection> applyTagsAsync() {
             .manager()
             .inner()
             .virtualNetworkGatewayConnections()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags())
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags())
             .flatMap(inner -> refreshAsync());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java
index f6eac50f91a6..6f1bfb55f425 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java
@@ -46,7 +46,7 @@ protected VirtualNetworkGatewayConnectionImpl wrapModel(VirtualNetworkGatewayCon
         if (inner == null) {
             return null;
         }
-        return new VirtualNetworkGatewayConnectionImpl(inner.getName(), parent, inner);
+        return new VirtualNetworkGatewayConnectionImpl(inner.name(), parent, inner);
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java
index 8c1906cc9aa8..b890c3ca041a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java
@@ -35,7 +35,7 @@ public String name() {
     @Override
     public String publicIPAddressId() {
         if (this.inner().publicIPAddress() != null) {
-            return this.inner().publicIPAddress().getId();
+            return this.inner().publicIPAddress().id();
         } else {
             return null;
         }
@@ -45,7 +45,7 @@ public String publicIPAddressId() {
     public String networkId() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId());
+            return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -55,7 +55,7 @@ public String networkId() {
     public String subnetName() {
         SubResource subnetRef = this.inner().subnet();
         if (subnetRef != null) {
-            return ResourceUtils.nameFromResourceId(subnetRef.getId());
+            return ResourceUtils.nameFromResourceId(subnetRef.id());
         } else {
             return null;
         }
@@ -73,7 +73,7 @@ public Subnet getSubnet() {
 
     @Override
     public VirtualNetworkGatewayIPConfigurationImpl withExistingSubnet(String networkId, String subnetName) {
-        SubResource subnetRef = new SubResource().setId(networkId + "/subnets/" + subnetName);
+        SubResource subnetRef = new SubResource().withId(networkId + "/subnets/" + subnetName);
         this.inner().withSubnet(subnetRef);
         return this;
     }
@@ -100,7 +100,7 @@ public VirtualNetworkGatewayIPConfigurationImpl withExistingPublicIPAddress(Publ
 
     @Override
     public VirtualNetworkGatewayIPConfigurationImpl withExistingPublicIPAddress(String resourceId) {
-        SubResource pipRef = new SubResource().setId(resourceId);
+        SubResource pipRef = new SubResource().withId(resourceId);
         this.inner().withPublicIPAddress(pipRef);
         return this;
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
index 7dc501ac7a4b..bf26fbe74694 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
@@ -200,7 +200,7 @@ public PagedFlux<VirtualNetworkGatewayConnection> listConnectionsAsync() {
         PagedFlux<VirtualNetworkGatewayConnectionListEntityInner> connectionInners =
             this.manager().inner().virtualNetworkGateways().listConnectionsAsync(this.resourceGroupName(), this.name());
         return PagedConverter
-            .flatMapPage(connectionInners, connectionInner -> connections().getByIdAsync(connectionInner.getId()));
+            .flatMapPage(connectionInners, connectionInner -> connections().getByIdAsync(connectionInner.id()));
     }
 
     @Override
@@ -227,7 +227,7 @@ protected Mono<VirtualNetworkGatewayInner> applyTagsToInnerAsync() {
             .manager()
             .inner()
             .virtualNetworkGateways()
-            .updateTagsAsync(resourceGroupName(), name(), inner().getTags());
+            .updateTagsAsync(resourceGroupName(), name(), inner().tags());
     }
 
     @Override
@@ -260,7 +260,7 @@ public boolean activeActive() {
 
     @Override
     public String gatewayDefaultSiteResourceId() {
-        return inner().gatewayDefaultSite() == null ? null : inner().gatewayDefaultSite().getId();
+        return inner().gatewayDefaultSite() == null ? null : inner().gatewayDefaultSite().id();
     }
 
     @Override
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java
index 24923e8f85f3..2772b1270440 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java
@@ -97,6 +97,6 @@ protected VirtualNetworkGatewayImpl wrapModel(VirtualNetworkGatewayInner inner)
         if (inner == null) {
             return null;
         }
-        return new VirtualNetworkGatewayImpl(inner.getName(), inner, this.manager());
+        return new VirtualNetworkGatewayImpl(inner.name(), inner, this.manager());
     }
 }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java
index 60f84e8300a5..93c1af52470c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java
@@ -136,7 +136,7 @@ public ApplicationGatewayAvailableSslOptionsInner withAvailableProtocols(
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java
index 3dac33bd1bd9..c92d7efd0a94 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java
@@ -838,7 +838,7 @@ public ApplicationGatewayInner withCustomErrorConfigurations(
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java
index d81017374049..198c2ee28d90 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java
@@ -75,7 +75,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java
index a393a441948a..5d953b6097f9 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java
@@ -66,7 +66,7 @@ public AvailableDelegationInner withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java
index 94c98256d373..ef435f15a8f5 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java
@@ -59,7 +59,7 @@ public AvailablePrivateEndpointTypeInner withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java
index c700c3caf246..b27f01862a95 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java
@@ -70,7 +70,7 @@ public String fqdnTagName() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java
index eb1d64ea9439..1a5e6433fadd 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java
@@ -290,7 +290,7 @@ public HubIPAddresses hubIpAddresses() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java
index c3a52620f4f2..b1e0b11c7455 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java
@@ -110,7 +110,7 @@ public ProvisioningState provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java
index c8e1f0ce0caf..154862a94669 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java
@@ -78,7 +78,7 @@ public BgpServiceCommunityInner withBgpCommunities(List<BGPCommunity> bgpCommuni
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java
index 26848c9e5300..99d95032af5d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java
@@ -121,7 +121,7 @@ public DdosCustomPolicyInner withProtocolCustomSettings(List<ProtocolCustomSetti
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCircuitInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCircuitInner.java
index 8eb160f58a70..431435146ddb 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCircuitInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCircuitInner.java
@@ -435,7 +435,7 @@ public ExpressRouteCircuitInner withGlobalReachEnabled(Boolean globalReachEnable
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCrossConnectionInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCrossConnectionInner.java
index 49f2b548edc9..9af8c1d0577f 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCrossConnectionInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteCrossConnectionInner.java
@@ -265,7 +265,7 @@ public ExpressRouteCrossConnectionInner withPeerings(List<ExpressRouteCrossConne
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteGatewayInner.java
index 7aefe0c42e2d..111858f14bc8 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteGatewayInner.java
@@ -126,7 +126,7 @@ public ExpressRouteGatewayInner withVirtualHub(VirtualHubId virtualHub) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortInner.java
index dce8dfbeb321..75d71addab78 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortInner.java
@@ -270,7 +270,7 @@ public ExpressRoutePortInner withResourceGuid(String resourceGuid) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortsLocationInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortsLocationInner.java
index c67ab62908ed..c053866df9b0 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortsLocationInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRoutePortsLocationInner.java
@@ -100,7 +100,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteServiceProviderInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteServiceProviderInner.java
index e4e1cdca1b00..33537a767be0 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteServiceProviderInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ExpressRouteServiceProviderInner.java
@@ -105,7 +105,7 @@ public ExpressRouteServiceProviderInner withProvisioningState(String provisionin
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/FirewallPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/FirewallPolicyInner.java
index a0d3358d761a..97c0c2fef87d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/FirewallPolicyInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/FirewallPolicyInner.java
@@ -157,7 +157,7 @@ public FirewallPolicyInner withThreatIntelMode(AzureFirewallThreatIntelMode thre
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LoadBalancerInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LoadBalancerInner.java
index f1a360e5bce3..cbd8628bee7d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LoadBalancerInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LoadBalancerInner.java
@@ -347,7 +347,7 @@ public LoadBalancerInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LocalNetworkGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LocalNetworkGatewayInner.java
index 91dbe14dc3ab..4b2d07c2c4c0 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LocalNetworkGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/LocalNetworkGatewayInner.java
@@ -173,7 +173,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NatGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NatGatewayInner.java
index 9fe840b350f5..8a715ba94a60 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NatGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NatGatewayInner.java
@@ -255,7 +255,7 @@ public NatGatewayInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkInterfaceInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkInterfaceInner.java
index 83b35a2bbbd5..fb8dac95117c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkInterfaceInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkInterfaceInner.java
@@ -362,7 +362,7 @@ public NetworkInterfaceInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkProfileInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkProfileInner.java
index 303a5a007e5d..47cc79347fdf 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkProfileInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkProfileInner.java
@@ -139,7 +139,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkSecurityGroupInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkSecurityGroupInner.java
index cc13a0b9eb64..e2d3452d8c8e 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkSecurityGroupInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkSecurityGroupInner.java
@@ -188,7 +188,7 @@ public NetworkSecurityGroupInner withProvisioningState(String provisioningState)
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkWatcherInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkWatcherInner.java
index b853f41a01b8..b745e31fc9ac 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkWatcherInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/NetworkWatcherInner.java
@@ -66,7 +66,7 @@ public ProvisioningState provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/P2SVpnGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/P2SVpnGatewayInner.java
index 2d75309fc57c..b41fd3932add 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/P2SVpnGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/P2SVpnGatewayInner.java
@@ -212,7 +212,7 @@ public VpnClientConnectionHealth vpnClientConnectionHealth() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureQueryStatusResultInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureQueryStatusResultInner.java
index 31b8ace8fb3c..4b95310227ff 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureQueryStatusResultInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureQueryStatusResultInner.java
@@ -75,7 +75,7 @@ public PacketCaptureQueryStatusResultInner withName(String name) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureResultInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureResultInner.java
index eaf266406d7d..fbff87322c38 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureResultInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PacketCaptureResultInner.java
@@ -90,7 +90,7 @@ public String name() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateEndpointInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateEndpointInner.java
index 31bc5f468407..a3a7f551be34 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateEndpointInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateEndpointInner.java
@@ -171,7 +171,7 @@ public PrivateEndpointInner withManualPrivateLinkServiceConnections(
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateLinkServiceInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateLinkServiceInner.java
index f4aae5e4c265..f54f269ab556 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateLinkServiceInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PrivateLinkServiceInner.java
@@ -261,7 +261,7 @@ public String alias() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPAddressInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPAddressInner.java
index 5672966f9e9e..50f4706d6407 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPAddressInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPAddressInner.java
@@ -391,7 +391,7 @@ public PublicIPAddressInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPPrefixInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPPrefixInner.java
index e06acb8658a2..36e4acf7d536 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPPrefixInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/PublicIPPrefixInner.java
@@ -313,7 +313,7 @@ public PublicIPPrefixInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteFilterInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteFilterInner.java
index 1d48aa03c83c..1f187bb7d357 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteFilterInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteFilterInner.java
@@ -136,7 +136,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteTableInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteTableInner.java
index 49378289a0a8..01dc88bd84ad 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteTableInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/RouteTableInner.java
@@ -151,7 +151,7 @@ public RouteTableInner withProvisioningState(String provisioningState) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceEndpointPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceEndpointPolicyInner.java
index 950af236e078..af07b4e8a16c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceEndpointPolicyInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceEndpointPolicyInner.java
@@ -128,7 +128,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceTagsListResultInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceTagsListResultInner.java
index 4aff0c22f89d..31e69cbaad5e 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceTagsListResultInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ServiceTagsListResultInner.java
@@ -62,7 +62,7 @@ public String name() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/TopologyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/TopologyInner.java
index 66088842ae18..89e9814291ae 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/TopologyInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/TopologyInner.java
@@ -43,7 +43,7 @@ public final class TopologyInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/UsageInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/UsageInner.java
index 1e5242241e6f..ad50833ac945 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/UsageInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/UsageInner.java
@@ -51,7 +51,7 @@ public UsageInner() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualHubInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualHubInner.java
index 68508f8bd553..199bb8d5aa72 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualHubInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualHubInner.java
@@ -242,7 +242,7 @@ public ProvisioningState provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionInner.java
index 26cdb78f6320..ed42331d5a7a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionInner.java
@@ -505,7 +505,7 @@ public VirtualNetworkGatewayConnectionInner withExpressRouteGatewayBypass(Boolea
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionListEntityInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionListEntityInner.java
index c51c51718ef0..37b13f4a4b7e 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionListEntityInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayConnectionListEntityInner.java
@@ -508,7 +508,7 @@ public VirtualNetworkGatewayConnectionListEntityInner withExpressRouteGatewayByp
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayInner.java
index 0beb065c4e1a..c1a7ed76e702 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkGatewayInner.java
@@ -377,7 +377,7 @@ public String provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkInner.java
index 0a16a10a438d..445e369c333b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkInner.java
@@ -305,7 +305,7 @@ public VirtualNetworkInner withDdosProtectionPlan(SubResource ddosProtectionPlan
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkTapInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkTapInner.java
index a4a906b5ae74..63065ef7033c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkTapInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkTapInner.java
@@ -188,7 +188,7 @@ public VirtualNetworkTapInner withDestinationPort(Integer destinationPort) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkUsageInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkUsageInner.java
index 033804ff4320..fb0ef885b9b7 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkUsageInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualNetworkUsageInner.java
@@ -55,7 +55,7 @@ public Double currentValue() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualWANInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualWANInner.java
index 2878564c467d..f995bcc9b1f5 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualWANInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VirtualWANInner.java
@@ -237,7 +237,7 @@ public ProvisioningState provisioningState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnGatewayInner.java
index 277f502735f4..63ebe387d28c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnGatewayInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnGatewayInner.java
@@ -163,7 +163,7 @@ public VpnGatewayInner withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnSiteInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnSiteInner.java
index 8c90a1218a6d..88cf10e85e2c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnSiteInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/VpnSiteInner.java
@@ -269,7 +269,7 @@ public VpnSiteInner withVpnSiteLinks(List<VpnSiteLinkInner> vpnSiteLinks) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java
index 18d705578e38..19a2d278a9e6 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java
@@ -152,7 +152,7 @@ public WebApplicationFirewallPolicyResourceState resourceState() {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java
index cf0d5f16cb21..7578a39b4e29 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java
@@ -33,7 +33,7 @@ public final class BasicDependency {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java
index f636c27fd251..dfb21e44e232 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java
@@ -60,7 +60,7 @@ public Dependency withDependsOn(List<BasicDependency> dependsOn) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java
index 168aba8a328b..b62f0dafbba4 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java
@@ -33,7 +33,7 @@ public final class TargetResource {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java
index b036e5091249..7295805d5419 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java
@@ -50,7 +50,7 @@ protected IndependentChildResourceImpl(String name, InnerModelT innerObject, Man
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -60,7 +60,7 @@ public Region region() {
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new TreeMap<>();
         }
@@ -70,7 +70,7 @@ public Map<String, String> tags() {
     @Override
     public String id() {
         if (this.inner() != null) {
-            return this.inner().getId();
+            return this.inner().id();
         }
 
         return null;
@@ -78,15 +78,15 @@ public String id() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
     public String name() {
-        if (this.inner().getName() == null) {
+        if (this.inner().name() == null) {
             return super.name();
         } else {
-            return this.inner().getName();
+            return this.inner().name();
         }
     }
 
@@ -102,7 +102,7 @@ public String name() {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return (FluentModelImplT) this;
     }
 
@@ -115,10 +115,10 @@ public final FluentModelImplT withTags(Map<String, String> tags) {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<String, String>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<String, String>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return (FluentModelImplT) this;
     }
 
@@ -130,8 +130,8 @@ public final FluentModelImplT withTag(String key, String value) {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withoutTag(String key) {
-        if (this.inner().getTags() != null) {
-            this.inner().getTags().remove(key);
+        if (this.inner().tags() != null) {
+            this.inner().tags().remove(key);
         }
         return (FluentModelImplT) this;
     }
@@ -141,12 +141,12 @@ public final FluentModelImplT withoutTag(String key) {
      */
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
     public FluentModelImplT withExistingParentResource(FluentParentModelT existingParentResource) {
-        this.inner().setLocation(existingParentResource.regionName());
+        this.inner().withLocation(existingParentResource.regionName());
         return super.withExistingParentResource(existingParentResource);
     }
 }
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java
index 8e329c389111..819399ed09b1 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java
@@ -35,8 +35,8 @@ public abstract class ResourceImpl<
         Resource {
     protected ResourceImpl(String name, InnerModelT innerObject) {
         super(name, innerObject);
-        if (innerObject.getTags() == null) {
-            innerObject.setTags(new TreeMap<String, String>());
+        if (innerObject.tags() == null) {
+            innerObject.withTags(new TreeMap<String, String>());
         }
     }
 
@@ -46,7 +46,7 @@ protected ResourceImpl(String name, InnerModelT innerObject) {
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -56,7 +56,7 @@ public Region region() {
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new TreeMap<>();
         }
@@ -65,20 +65,20 @@ public Map<String, String> tags() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
     public String name() {
-        if (this.inner().getName() == null) {
+        if (this.inner().name() == null) {
             return super.name();
         } else {
-            return this.inner().getName();
+            return this.inner().name();
         }
     }
 
@@ -94,7 +94,7 @@ public String name() {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return (FluentModelImplT) this;
     }
 
@@ -107,10 +107,10 @@ public final FluentModelImplT withTags(Map<String, String> tags) {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<String, String>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<String, String>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return (FluentModelImplT) this;
     }
 
@@ -122,8 +122,8 @@ public final FluentModelImplT withTag(String key, String value) {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withoutTag(String key) {
-        if (this.inner().getTags() != null) {
-            this.inner().getTags().remove(key);
+        if (this.inner().tags() != null) {
+            this.inner().tags().remove(key);
         }
         return (FluentModelImplT) this;
     }
@@ -140,7 +140,7 @@ public final FluentModelImplT withoutTag(String key) {
      */
     @SuppressWarnings("unchecked")
     public final FluentModelImplT withRegion(String regionName) {
-        this.inner().setLocation(regionName);
+        this.inner().withLocation(regionName);
         return (FluentModelImplT) this;
     }
 
@@ -159,7 +159,7 @@ public final FluentModelImplT withRegion(Region region) {
      */
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     protected <InnerT> List<InnerT> innersFromWrappers(Collection<? extends HasInner<InnerT>> wrappers) {
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java
index 3191129708b0..243eeee89c01 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java
@@ -57,7 +57,7 @@ public final class DeploymentImpl extends
 
     DeploymentImpl(DeploymentExtendedInner innerModel, String name, final ResourceManager resourceManager) {
         super(name, innerModel);
-        this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.getId());
+        this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.id());
         this.resourceManager = resourceManager;
         this.objectMapper = new ObjectMapper();
         this.deploymentWhatIf = new DeploymentWhatIf();
@@ -354,7 +354,7 @@ protected Mono<DeploymentExtendedInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -364,7 +364,7 @@ public ResourceManager manager() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java
index 033c0fa6bd78..536bb3daa98e 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java
@@ -28,8 +28,8 @@ final class DeploymentOperationImpl extends
     DeploymentOperationImpl(DeploymentOperationInner innerModel, final DeploymentOperationsInner client) {
         super(innerModel);
         this.client = client;
-        this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.getId());
-        this.deploymentName = ResourceUtils.extractFromResourceId(innerModel.getId(), "deployments");
+        this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.id());
+        this.deploymentName = ResourceUtils.extractFromResourceId(innerModel.id(), "deployments");
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java
index 880f4656f0d6..1704c8928718 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java
@@ -32,7 +32,7 @@ final class DeploymentsImpl
     @Override
     public PagedIterable<Deployment> list() {
         return this.manager().inner().deployments().list()
-                .mapPage(inner -> new DeploymentImpl(inner, inner.getName(), resourceManager));
+                .mapPage(inner -> new DeploymentImpl(inner, inner.name(), resourceManager));
     }
 
     @Override
@@ -49,7 +49,7 @@ public Deployment getByName(String name) {
     @Override
     public Mono<Deployment> getByNameAsync(String name) {
         return this.manager().inner().deployments().getAtTenantScopeAsync(name)
-            .map(inner -> new DeploymentImpl(inner, inner.getName(), this.resourceManager));
+            .map(inner -> new DeploymentImpl(inner, inner.name(), this.resourceManager));
     }
 
     @Override
@@ -91,7 +91,7 @@ protected DeploymentImpl createFluentModel(String name) {
     }
 
     protected DeploymentImpl createFluentModel(DeploymentExtendedInner deploymentExtendedInner) {
-        return new DeploymentImpl(deploymentExtendedInner, deploymentExtendedInner.getName(), this.resourceManager);
+        return new DeploymentImpl(deploymentExtendedInner, deploymentExtendedInner.name(), this.resourceManager);
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java
index 88afbd6c6223..df8387dcadc5 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java
@@ -36,9 +36,9 @@ final class GenericResourceImpl
                         GenericResourceInner innerModel,
                         final ResourceManager resourceManager) {
         super(key, innerModel, resourceManager);
-        resourceProviderNamespace = ResourceUtils.resourceProviderFromResourceId(innerModel.getId());
-        resourceType = ResourceUtils.resourceTypeFromResourceId(innerModel.getId());
-        parentResourcePath = ResourceUtils.parentRelativePathFromResourceId(innerModel.getId());
+        resourceProviderNamespace = ResourceUtils.resourceProviderFromResourceId(innerModel.id());
+        resourceType = ResourceUtils.resourceTypeFromResourceId(innerModel.id());
+        parentResourcePath = ResourceUtils.parentRelativePathFromResourceId(innerModel.id());
     }
 
     @Override
@@ -152,7 +152,7 @@ public Mono<GenericResource> createResourceAsync() {
                     .flatMap(provider -> {
                         String id;
                         if (!isInCreateMode()) {
-                            id = inner().getId();
+                            id = inner().id();
                         } else {
                             id = ResourceUtils.constructResourceId(
                                     serviceClient.getSubscriptionId(),
@@ -171,7 +171,7 @@ public Mono<GenericResource> createResourceAsync() {
                 .flatMap(api -> {
                     String name = this.name();
                     if (!isInCreateMode()) {
-                        name = ResourceUtils.nameFromResourceId(inner().getId());
+                        name = ResourceUtils.nameFromResourceId(inner().id());
                     }
                     return resourceClient.createOrUpdateAsync(
                             resourceGroupName(),
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java
index 60df73ed7f51..a3cb3b729e76 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java
@@ -193,11 +193,11 @@ protected GenericResourceImpl wrapModel(GenericResourceInner inner) {
         if (inner == null) {
             return null;
         }
-        return new GenericResourceImpl(inner.getId(), inner, this.manager())
-                .withExistingResourceGroup(ResourceUtils.groupFromResourceId(inner.getId()))
-                .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(inner.getId()))
-                .withResourceType(ResourceUtils.resourceTypeFromResourceId(inner.getId()))
-                .withParentResourceId(ResourceUtils.parentResourceIdFromResourceId(inner.getId()));
+        return new GenericResourceImpl(inner.id(), inner, this.manager())
+                .withExistingResourceGroup(ResourceUtils.groupFromResourceId(inner.id()))
+                .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(inner.id()))
+                .withResourceType(ResourceUtils.resourceTypeFromResourceId(inner.id()))
+                .withParentResourceId(ResourceUtils.parentResourceIdFromResourceId(inner.id()));
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java
index 2cbaf359c964..a670289bb8e7 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java
@@ -44,12 +44,12 @@ public String scope() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
     public String type() {
-        return inner().getType();
+        return inner().type();
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java
index 3696b4f454f6..3d83d49b1756 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java
@@ -58,7 +58,7 @@ protected PolicyAssignmentImpl wrapModel(PolicyAssignmentInner inner) {
         if (inner == null) {
             return null;
         }
-        return new PolicyAssignmentImpl(inner.getName(), inner, client);
+        return new PolicyAssignmentImpl(inner.name(), inner, client);
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java
index 37584fda6c90..be163bb760bf 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java
@@ -53,7 +53,7 @@ public Object policyRule() {
 
     @Override
     public String id() {
-        return inner().getId();
+        return inner().id();
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java
index ff9c11a4c342..e40729d809b9 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java
@@ -44,7 +44,7 @@ public String provisioningState() {
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -54,7 +54,7 @@ public Region region() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -64,7 +64,7 @@ public String type() {
 
     @Override
     public Map<String, String> tags() {
-        Map<String, String> tags = this.inner().getTags();
+        Map<String, String> tags = this.inner().tags();
         if (tags == null) {
             tags = new HashMap<>();
         }
@@ -87,7 +87,7 @@ public Mono<ResourceGroupExportResult> exportTemplateAsync(ResourceGroupExportTe
 
     @Override
     public ResourceGroupImpl withRegion(String regionName) {
-        this.inner().setLocation(regionName);
+        this.inner().withLocation(regionName);
         return this;
     }
 
@@ -98,30 +98,30 @@ public ResourceGroupImpl withRegion(Region region) {
 
     @Override
     public ResourceGroupImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return this;
     }
 
     @Override
     public ResourceGroupImpl withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<String, String>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<String, String>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return this;
     }
 
     @Override
     public ResourceGroupImpl withoutTag(String key) {
-        this.inner().getTags().remove(key);
+        this.inner().tags().remove(key);
         return this;
     }
 
     @Override
     public Mono<ResourceGroup> createResourceAsync() {
         ResourceGroupInner params = new ResourceGroupInner();
-        params.setLocation(this.inner().getLocation());
-        params.setTags(this.inner().getTags());
+        params.withLocation(this.inner().location());
+        params.withTags(this.inner().tags());
         return client.createOrUpdateAsync(this.name(), params)
                 .map(innerToFluentMap(this));
     }
@@ -133,7 +133,7 @@ public Mono<ResourceGroup> updateResourceAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java
index e75795b2b55a..72f772e9c63c 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java
@@ -90,7 +90,7 @@ protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) {
         if (inner == null) {
             return null;
         }
-        return new ResourceGroupImpl(inner, inner.getName(), serviceClient);
+        return new ResourceGroupImpl(inner, inner.name(), serviceClient);
     }
 
     @Override
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java
index c535c2ad935b..e24bd33b50fd 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java
@@ -34,7 +34,7 @@ public final class DeploymentOperationInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java
index 213373fee01f..72d18c684ec4 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java
@@ -80,7 +80,7 @@ public FeatureResultInner withProperties(FeatureProperties properties) {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java
index 6c82458f051e..f980dd73cf68 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java
@@ -53,7 +53,7 @@ public final class LocationInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java
index fcc06c0b84a6..3bc3567821c2 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java
@@ -75,7 +75,7 @@ public class PolicyDefinitionInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java
index 176173233309..9558ce968533 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java
@@ -47,7 +47,7 @@ public final class ProviderInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java
index 71b7d6d68623..c8745b2582ca 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java
@@ -58,7 +58,7 @@ public final class SubscriptionInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java
index 2529089f5785..1f6984aeada6 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java
@@ -42,7 +42,7 @@ public final class TagDetailsInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java
index 955fb2a42aac..d99535444fd9 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java
@@ -34,7 +34,7 @@ public final class TagValueInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java
index 15cbea442ec8..19257c7fc9a4 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java
@@ -29,7 +29,7 @@ public final class TenantIdDescriptionInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java b/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java
index 5b8716fe33f4..a1f3b8b896e5 100644
--- a/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java
+++ b/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java
@@ -48,7 +48,7 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
                         return Mono.error(new RuntimeException("Failed to deserialize " + bodyStr));
                     }
 
-                    Map<String, String> tags = resourceGroupInner.getTags();
+                    Map<String, String> tags = resourceGroupInner.tags();
                     if (tags == null) {
                         tags = new HashMap<>();
                     }
@@ -58,7 +58,7 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
                     if (System.getenv("ENV_JOB_NAME") != null) {
                         tags.put("job", System.getenv("ENV_JOB_NAME"));
                     }
-                    resourceGroupInner.setTags(tags);
+                    resourceGroupInner.withTags(tags);
                     String newBody;
                     try {
                         newBody = adapter.serialize(resourceGroupInner, SerializerEncoding.JSON);
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java
index a5698ddbfbc2..5645b42bdc0f 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java
@@ -33,7 +33,7 @@ public final class PartnerInfo {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java
index 391354bf5341..05bc50247c83 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java
@@ -21,7 +21,7 @@ public final class PrivateEndpointProperty {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java
index c36631e7f065..ec035ba8901d 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java
@@ -21,7 +21,7 @@ public final class ResourceMoveDefinition {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java
index 295b987cd986..d5ea0981df88 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java
@@ -27,7 +27,7 @@ public final class ServerPrivateEndpointConnection {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java
index 451783a4ce05..eee628ce357c 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java
@@ -95,7 +95,7 @@ public final class ServiceObjectiveCapability {
      *
      * @return the id value.
      */
-    public UUID getId() {
+    public UUID id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java
index 8723ff22c6d8..9dd92556b67b 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java
@@ -16,7 +16,7 @@ class ElasticPoolActivityImpl extends WrapperImpl<ElasticPoolActivityInner> impl
 
     protected ElasticPoolActivityImpl(ElasticPoolActivityInner innerObject) {
         super(innerObject);
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java
index 6b89e7a5845f..fdb38c7487e0 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java
@@ -17,17 +17,17 @@ class ElasticPoolDatabaseActivityImpl extends WrapperImpl<ElasticPoolDatabaseAct
 
     protected ElasticPoolDatabaseActivityImpl(ElasticPoolDatabaseActivityInner innerObject) {
         super(innerObject);
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RecommendedElasticPoolImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RecommendedElasticPoolImpl.java
index ce2637ec3302..86662133f6e0 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RecommendedElasticPoolImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RecommendedElasticPoolImpl.java
@@ -111,7 +111,7 @@ public List<SqlDatabase> listDatabases() {
                 .databases()
                 .listByElasticPool(this.sqlServer.resourceGroupName(), this.sqlServer.name(), this.name());
         for (DatabaseInner inner : databaseInners) {
-            databasesList.add(new SqlDatabaseImpl(inner.getName(), this.sqlServer, inner, this.manager()));
+            databasesList.add(new SqlDatabaseImpl(inner.name(), this.sqlServer, inner, this.manager()));
         }
         return Collections.unmodifiableList(databasesList);
     }
@@ -127,7 +127,7 @@ public PagedFlux<SqlDatabase> listDatabasesAsync() {
             .listByElasticPoolAsync(this.sqlServer.resourceGroupName(), this.sqlServer.name(), this.name())
             .mapPage(
                 databaseInner ->
-                    new SqlDatabaseImpl(databaseInner.getName(), self.sqlServer, databaseInner, self.manager()));
+                    new SqlDatabaseImpl(databaseInner.name(), self.sqlServer, databaseInner, self.manager()));
     }
 
     @Override
@@ -140,7 +140,7 @@ public SqlDatabase getDatabase(String databaseName) {
                 .databases()
                 .get(this.sqlServer.resourceGroupName(), this.sqlServer.name(), databaseName);
 
-        return new SqlDatabaseImpl(databaseInner.getName(), this.sqlServer, databaseInner, this.manager());
+        return new SqlDatabaseImpl(databaseInner.name(), this.sqlServer, databaseInner, this.manager());
     }
 
     @Override
@@ -154,7 +154,7 @@ public Mono<SqlDatabase> getDatabaseAsync(String databaseName) {
             .getAsync(this.sqlServer.resourceGroupName(), this.sqlServer.name(), databaseName)
             .map(
                 databaseInner ->
-                    new SqlDatabaseImpl(databaseInner.getName(), self.sqlServer, databaseInner, self.manager()));
+                    new SqlDatabaseImpl(databaseInner.name(), self.sqlServer, databaseInner, self.manager()));
     }
 
     @Override
@@ -175,12 +175,12 @@ public List<RecommendedElasticPoolMetric> listMetrics() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java
index b98eb7001c15..3e93e5827fb1 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java
@@ -30,7 +30,7 @@ protected ReplicationLinkImpl(
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
         this.sqlServerManager = sqlServerManager;
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
@@ -154,12 +154,12 @@ public Mono<Void> forceFailoverAllowDataLossAsync() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java
index cc45a134bc05..fcb79d3b3344 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java
@@ -20,17 +20,17 @@ protected RestorePointImpl(String resourceGroupName, String sqlServerName, Resto
         super(innerObject);
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java
index 3ee2729fe00c..5b958ae2f0a2 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java
@@ -20,12 +20,12 @@ protected ServiceObjectiveImpl(ServiceObjectiveInner innerObject, SqlServerImpl
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java
index 98a52cf4a5e6..54564a920426 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java
@@ -33,17 +33,17 @@ protected ServiceTierAdvisorImpl(
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
         this.sqlServerManager = sqlServerManager;
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java
index 4cc994d86369..4af229793edb 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java
@@ -33,7 +33,7 @@ public class SqlDatabaseForElasticPoolImpl
         Objects.requireNonNull(sqlDatabase.inner());
         this.sqlElasticPool = sqlElasticPool;
         this.sqlDatabase = sqlDatabase;
-        this.sqlDatabase.inner().setLocation(sqlElasticPool.regionName());
+        this.sqlDatabase.inner().withLocation(sqlElasticPool.regionName());
         this.sqlDatabase.inner().withElasticPoolId(this.sqlElasticPool.id());
         this.sqlDatabase.inner().withSku(null);
     }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java
index 1b27320c054d..844c64947a16 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java
@@ -166,7 +166,7 @@ class SqlDatabaseImpl extends ExternalChildResourceImpl<SqlDatabase, DatabaseInn
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -303,7 +303,7 @@ public Map<String, ReplicationLink> listReplicationLinks() {
         for (ReplicationLinkInner inner : replicationLinkInners) {
             replicationLinkMap
                 .put(
-                    inner.getName(),
+                    inner.name(),
                     new ReplicationLinkImpl(
                         this.resourceGroupName, this.sqlServerName, inner, this.sqlServerManager));
         }
@@ -372,7 +372,7 @@ public SqlDatabaseThreatDetectionPolicy getThreatDetectionPolicy() {
                 .databaseThreatDetectionPolicies()
                 .get(this.resourceGroupName, this.sqlServerName, this.name());
         return policyInner != null
-            ? new SqlDatabaseThreatDetectionPolicyImpl(policyInner.getName(), this, policyInner, this.sqlServerManager)
+            ? new SqlDatabaseThreatDetectionPolicyImpl(policyInner.name(), this, policyInner, this.sqlServerManager)
             : null;
     }
 
@@ -543,7 +543,7 @@ public Map<String, ServiceTierAdvisor> listServiceTierAdvisors() {
         for (ServiceTierAdvisorInner serviceTierAdvisorInner : serviceTierAdvisorInners) {
             serviceTierAdvisorMap
                 .put(
-                    serviceTierAdvisorInner.getName(),
+                    serviceTierAdvisorInner.name(),
                     new ServiceTierAdvisorImpl(
                         this.resourceGroupName,
                         this.sqlServerName,
@@ -574,7 +574,7 @@ public String parentId() {
 
     @Override
     public String regionName() {
-        return this.inner().getLocation();
+        return this.inner().location();
     }
 
     @Override
@@ -627,7 +627,7 @@ public void beforeGroupCreateOrUpdate() {
     @Override
     public Mono<SqlDatabase> createResourceAsync() {
         final SqlDatabaseImpl self = this;
-        this.inner().setLocation(this.sqlServerLocation);
+        this.inner().withLocation(this.sqlServerLocation);
         if (this.importRequestInner != null) {
             this.importRequestInner.withDatabaseName(this.name());
             if (this.importRequestInner.edition() == null) {
@@ -679,7 +679,7 @@ public Mono<SqlDatabase> updateResourceAsync() {
             final SqlDatabaseImpl self = this;
             DatabaseUpdate databaseUpdateInner =
                 new DatabaseUpdate()
-                    .withTags(self.inner().getTags())
+                    .withTags(self.inner().tags())
                     .withCollation(self.inner().collation())
                     .withSourceDatabaseId(self.inner().sourceDatabaseId())
                     .withCreateMode(self.inner().createMode())
@@ -1061,23 +1061,23 @@ public SqlDatabaseImpl withServiceObjective(ServiceObjectiveName serviceLevelObj
 
     @Override
     public SqlDatabaseImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return this;
     }
 
     @Override
     public SqlDatabaseImpl withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<String, String>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<String, String>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return this;
     }
 
     @Override
     public SqlDatabaseImpl withoutTag(String key) {
-        if (this.inner().getTags() != null) {
-            this.inner().getTags().remove(key);
+        if (this.inner().tags() != null) {
+            this.inner().tags().remove(key);
         }
         return this;
     }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java
index fb2c20f66d1f..810efa55c586 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java
@@ -20,12 +20,12 @@ protected SqlDatabaseImportExportResponseImpl(ImportExportResponseInner innerObj
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java
index 1b987e883289..8a665ad973b7 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java
@@ -41,7 +41,7 @@ public SqlDatabase getBySqlServer(String resourceGroupName, String sqlServerName
         DatabaseInner inner = this.manager.inner().databases().get(resourceGroupName, sqlServerName, name);
         return (inner != null)
             ? new SqlDatabaseImpl(
-                resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)
+                resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)
             : null;
     }
 
@@ -56,7 +56,7 @@ public Mono<SqlDatabase> getBySqlServerAsync(
             .map(
                 inner ->
                     new SqlDatabaseImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
     }
 
     @Override
@@ -66,7 +66,7 @@ public SqlDatabase getBySqlServer(SqlServer sqlServer, String name) {
         }
         DatabaseInner inner =
             this.manager.inner().databases().get(sqlServer.resourceGroupName(), sqlServer.name(), name);
-        return (inner != null) ? new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager) : null;
+        return (inner != null) ? new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager) : null;
     }
 
     @Override
@@ -77,7 +77,7 @@ public Mono<SqlDatabase> getBySqlServerAsync(final SqlServer sqlServer, String n
             .inner()
             .databases()
             .getAsync(sqlServer.resourceGroupName(), sqlServer.name(), name)
-            .map(inner -> new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager));
+            .map(inner -> new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager));
     }
 
     @Override
@@ -168,7 +168,7 @@ public List<SqlDatabase> listBySqlServer(String resourceGroupName, String sqlSer
             databasesSet
                 .add(
                     new SqlDatabaseImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
         }
         return Collections.unmodifiableList(databasesSet);
     }
@@ -183,7 +183,7 @@ public PagedFlux<SqlDatabase> listBySqlServerAsync(final String resourceGroupNam
             .mapPage(
                 inner ->
                     new SqlDatabaseImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
     }
 
     @Override
@@ -192,7 +192,7 @@ public List<SqlDatabase> listBySqlServer(SqlServer sqlServer) {
         if (sqlServer != null) {
             for (DatabaseInner inner
                 : this.manager.inner().databases().listByServer(sqlServer.resourceGroupName(), sqlServer.name())) {
-                firewallRuleSet.add(new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager));
+                firewallRuleSet.add(new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager));
             }
         }
         return Collections.unmodifiableList(firewallRuleSet);
@@ -206,7 +206,7 @@ public PagedFlux<SqlDatabase> listBySqlServerAsync(final SqlServer sqlServer) {
             .databases()
             .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name())
             .mapPage(
-                inner -> new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
+                inner -> new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java
index bcb4f72fd93b..1fd400a29eb9 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java
@@ -42,7 +42,7 @@ protected SqlDatabaseThreatDetectionPolicyImpl(
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -52,7 +52,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java
index d8f3b82ad34b..d14c03a8427f 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java
@@ -131,7 +131,7 @@ public class SqlElasticPoolImpl
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -313,7 +313,7 @@ public List<SqlDatabase> listDatabases() {
                         this.resourceGroupName,
                         this.sqlServerName,
                         this.sqlServerLocation,
-                        inner.getName(),
+                        inner.name(),
                         inner,
                         this.sqlServerManager));
         }
@@ -334,7 +334,7 @@ public PagedFlux<SqlDatabase> listDatabasesAsync() {
                         self.resourceGroupName,
                         self.sqlServerName,
                         self.sqlServerLocation,
-                        databaseInner.getName(),
+                        databaseInner.name(),
                         databaseInner,
                         self.sqlServerManager));
     }
@@ -409,7 +409,7 @@ protected Mono<ElasticPoolInner> getInnerAsync() {
     @Override
     public Mono<SqlElasticPool> createResourceAsync() {
         final SqlElasticPoolImpl self = this;
-        this.inner().setLocation(this.sqlServerLocation);
+        this.inner().withLocation(this.sqlServerLocation);
         return this
             .sqlServerManager
             .inner()
@@ -673,23 +673,23 @@ public SqlDatabaseForElasticPoolImpl defineDatabase(String databaseName) {
 
     @Override
     public SqlElasticPoolImpl withTags(Map<String, String> tags) {
-        this.inner().setTags(new HashMap<>(tags));
+        this.inner().withTags(new HashMap<>(tags));
         return this;
     }
 
     @Override
     public SqlElasticPoolImpl withTag(String key, String value) {
-        if (this.inner().getTags() == null) {
-            this.inner().setTags(new HashMap<String, String>());
+        if (this.inner().tags() == null) {
+            this.inner().withTags(new HashMap<String, String>());
         }
-        this.inner().getTags().put(key, value);
+        this.inner().tags().put(key, value);
         return this;
     }
 
     @Override
     public SqlElasticPoolImpl withoutTag(String key) {
-        if (this.inner().getTags() != null) {
-            this.inner().getTags().remove(key);
+        if (this.inner().tags() != null) {
+            this.inner().tags().remove(key);
         }
         return this;
     }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java
index e070a4ec5fa4..2194505bf24e 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java
@@ -40,7 +40,7 @@ public SqlElasticPool getBySqlServer(String resourceGroupName, String sqlServerN
         ElasticPoolInner inner = this.manager.inner().elasticPools().get(resourceGroupName, sqlServerName, name);
         return (inner != null)
             ? new SqlElasticPoolImpl(
-                resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)
+                resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)
             : null;
     }
 
@@ -55,7 +55,7 @@ public Mono<SqlElasticPool> getBySqlServerAsync(
             .map(
                 inner ->
                     new SqlElasticPoolImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
     }
 
     @Override
@@ -66,7 +66,7 @@ public SqlElasticPool getBySqlServer(SqlServer sqlServer, String name) {
         ElasticPoolInner inner =
             this.manager.inner().elasticPools().get(sqlServer.resourceGroupName(), sqlServer.name(), name);
         return (inner != null)
-            ? new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)
+            ? new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)
             : null;
     }
 
@@ -78,7 +78,7 @@ public Mono<SqlElasticPool> getBySqlServerAsync(final SqlServer sqlServer, Strin
             .inner()
             .elasticPools()
             .getAsync(sqlServer.resourceGroupName(), sqlServer.name(), name)
-            .map(inner -> new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager));
+            .map(inner -> new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager));
     }
 
     @Override
@@ -186,7 +186,7 @@ public List<SqlElasticPool> listBySqlServer(String resourceGroupName, String sql
             elasticPoolSet
                 .add(
                     new SqlElasticPoolImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
         }
         return Collections.unmodifiableList(elasticPoolSet);
     }
@@ -201,7 +201,7 @@ public PagedFlux<SqlElasticPool> listBySqlServerAsync(final String resourceGroup
             .mapPage(
                 inner ->
                     new SqlElasticPoolImpl(
-                        resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager));
+                        resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager));
     }
 
     @Override
@@ -210,7 +210,7 @@ public List<SqlElasticPool> listBySqlServer(SqlServer sqlServer) {
         if (sqlServer != null) {
             for (ElasticPoolInner inner
                 : this.manager.inner().elasticPools().listByServer(sqlServer.resourceGroupName(), sqlServer.name())) {
-                elasticPoolSet.add(new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager));
+                elasticPoolSet.add(new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager));
             }
         }
         return Collections.unmodifiableList(elasticPoolSet);
@@ -224,7 +224,7 @@ public PagedFlux<SqlElasticPool> listBySqlServerAsync(final SqlServer sqlServer)
             .inner()
             .elasticPools()
             .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name())
-            .mapPage(inner -> new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager));
+            .mapPage(inner -> new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java
index 46144aa485fe..ae5605f9c861 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java
@@ -41,8 +41,8 @@ public class SqlEncryptionProtectorImpl
         this.sqlServerManager = sqlServerManager;
         this.resourceGroupName = parent.resourceGroupName();
         this.sqlServerName = parent.name();
-        if (innerObject != null && innerObject.getName() != null) {
-            this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.name() != null) {
+            this.serverKeyName = innerObject.name();
         }
     }
 
@@ -64,8 +64,8 @@ public class SqlEncryptionProtectorImpl
         this.sqlServerManager = sqlServerManager;
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
-        if (innerObject != null && innerObject.getName() != null) {
-            this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.name() != null) {
+            this.serverKeyName = innerObject.name();
         }
     }
 
@@ -79,12 +79,12 @@ public class SqlEncryptionProtectorImpl
         super("", null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
-            if (innerObject.getName() != null) {
-                this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.id() != null) {
+            if (innerObject.name() != null) {
+                this.serverKeyName = innerObject.name();
             }
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().name();
             } catch (NullPointerException e) {
@@ -94,7 +94,7 @@ public class SqlEncryptionProtectorImpl
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -109,7 +109,7 @@ public String sqlServerName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java
index d7d9dc7ea614..98eea2beda34 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java
@@ -91,9 +91,9 @@ public class SqlFailoverGroupImpl
         super(name, null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
+        if (innerObject != null && innerObject.id() != null) {
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().name();
                 this.sqlServerLocation = innerObject.location();
@@ -113,7 +113,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -123,7 +123,7 @@ public String sqlServerName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
@@ -241,7 +241,7 @@ protected Mono<FailoverGroupInner> getInnerAsync() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java
index 7ee29216d239..3604b9a49cbe 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java
@@ -88,7 +88,7 @@ public List<SqlFailoverGroup> listBySqlServer(String resourceGroupName, String s
         PagedIterable<FailoverGroupInner> failoverGroupInners =
             this.sqlServerManager.inner().failoverGroups().listByServer(resourceGroupName, sqlServerName);
         for (FailoverGroupInner inner : failoverGroupInners) {
-            failoverGroups.add(new SqlFailoverGroupImpl(inner.getName(), inner, this.sqlServerManager));
+            failoverGroups.add(new SqlFailoverGroupImpl(inner.name(), inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(failoverGroups);
     }
@@ -104,7 +104,7 @@ public PagedFlux<SqlFailoverGroup> listBySqlServerAsync(
             .listByServerAsync(resourceGroupName, sqlServerName)
             .mapPage(
                 failoverGroupInner ->
-                    new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager));
+                    new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager));
     }
 
     @Override
@@ -116,7 +116,7 @@ public List<SqlFailoverGroup> listBySqlServer(final SqlServer sqlServer) {
             failoverGroups
                 .add(
                     new SqlFailoverGroupImpl(
-                        inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
+                        inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(failoverGroups);
     }
@@ -131,7 +131,7 @@ public PagedFlux<SqlFailoverGroup> listBySqlServerAsync(final SqlServer sqlServe
             .mapPage(
                 failoverGroupInner ->
                     new SqlFailoverGroupImpl(
-                        failoverGroupInner.getName(),
+                        failoverGroupInner.name(),
                         (SqlServerImpl) sqlServer,
                         failoverGroupInner,
                         sqlServer.manager()));
@@ -155,7 +155,7 @@ public SqlFailoverGroup failover(String failoverGroupName) {
                 .failover(sqlServer.resourceGroupName(), sqlServer.name(), failoverGroupName);
         return failoverGroupInner != null
             ? new SqlFailoverGroupImpl(
-                failoverGroupInner.getName(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager())
+                failoverGroupInner.name(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager())
             : null;
     }
 
@@ -170,7 +170,7 @@ public Mono<SqlFailoverGroup> failoverAsync(String failoverGroupName) {
             .map(
                 failoverGroupInner ->
                     new SqlFailoverGroupImpl(
-                        failoverGroupInner.getName(),
+                        failoverGroupInner.name(),
                         (SqlServerImpl) sqlServer,
                         failoverGroupInner,
                         sqlServer.manager()));
@@ -187,7 +187,7 @@ public SqlFailoverGroup forceFailoverAllowDataLoss(String failoverGroupName) {
                 .forceFailoverAllowDataLoss(sqlServer.resourceGroupName(), sqlServer.name(), failoverGroupName);
         return failoverGroupInner != null
             ? new SqlFailoverGroupImpl(
-                failoverGroupInner.getName(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager())
+                failoverGroupInner.name(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager())
             : null;
     }
 
@@ -202,7 +202,7 @@ public Mono<SqlFailoverGroup> forceFailoverAllowDataLossAsync(String failoverGro
             .map(
                 failoverGroupInner ->
                     new SqlFailoverGroupImpl(
-                        failoverGroupInner.getName(),
+                        failoverGroupInner.name(),
                         (SqlServerImpl) sqlServer,
                         failoverGroupInner,
                         sqlServer.manager()));
@@ -213,7 +213,7 @@ public SqlFailoverGroup failover(String resourceGroupName, String serverName, St
         FailoverGroupInner failoverGroupInner =
             this.sqlServerManager.inner().failoverGroups().failover(resourceGroupName, serverName, failoverGroupName);
         return failoverGroupInner != null
-            ? new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, this.sqlServerManager)
+            ? new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, this.sqlServerManager)
             : null;
     }
 
@@ -228,7 +228,7 @@ public Mono<SqlFailoverGroup> failoverAsync(
             .failoverAsync(resourceGroupName, serverName, failoverGroupName)
             .map(
                 failoverGroupInner ->
-                    new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager));
+                    new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager));
     }
 
     @Override
@@ -241,7 +241,7 @@ public SqlFailoverGroup forceFailoverAllowDataLoss(
                 .failoverGroups()
                 .forceFailoverAllowDataLoss(resourceGroupName, serverName, failoverGroupName);
         return failoverGroupInner != null
-            ? new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, this.sqlServerManager)
+            ? new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, this.sqlServerManager)
             : null;
     }
 
@@ -256,6 +256,6 @@ public Mono<SqlFailoverGroup> forceFailoverAllowDataLossAsync(
             .forceFailoverAllowDataLossAsync(resourceGroupName, serverName, failoverGroupName)
             .map(
                 failoverGroupInner ->
-                    new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager));
+                    new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager));
     }
 }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java
index 1946bd1b771d..dd5c9841df98 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java
@@ -97,7 +97,7 @@ public SqlFirewallRuleImpl update() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java
index 806b2cb58449..591950136788 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java
@@ -41,7 +41,7 @@ public SqlFirewallRule getBySqlServer(String resourceGroupName, String sqlServer
         FirewallRuleInner inner =
             this.sqlServerManager.inner().firewallRules().get(resourceGroupName, sqlServerName, name);
         return (inner != null)
-            ? new SqlFirewallRuleImpl(resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)
+            ? new SqlFirewallRuleImpl(resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)
             : null;
     }
 
@@ -56,7 +56,7 @@ public Mono<SqlFirewallRule> getBySqlServerAsync(
             .map(
                 inner ->
                     new SqlFirewallRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager));
     }
 
     @Override
@@ -65,7 +65,7 @@ public SqlFirewallRule getBySqlServer(SqlServer sqlServer, String name) {
         FirewallRuleInner inner =
             this.sqlServerManager.inner().firewallRules().get(sqlServer.resourceGroupName(), sqlServer.name(), name);
         return (inner != null)
-            ? new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())
+            ? new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())
             : null;
     }
 
@@ -170,7 +170,7 @@ public List<SqlFirewallRule> listBySqlServer(String resourceGroupName, String sq
             firewallRuleSet
                 .add(
                     new SqlFirewallRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(firewallRuleSet);
     }
@@ -185,7 +185,7 @@ public PagedFlux<SqlFirewallRule> listBySqlServerAsync(final String resourceGrou
             .mapPage(
                 inner ->
                     new SqlFirewallRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager));
     }
 
     @Override
@@ -199,7 +199,7 @@ public List<SqlFirewallRule> listBySqlServer(SqlServer sqlServer) {
                 .firewallRules()
                 .listByServer(sqlServer.resourceGroupName(), sqlServer.name())) {
             firewallRuleSet
-                .add(new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
+                .add(new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
         }
         return Collections.unmodifiableList(firewallRuleSet);
     }
@@ -214,7 +214,7 @@ public PagedFlux<SqlFirewallRule> listBySqlServerAsync(final SqlServer sqlServer
             .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name())
             .mapPage(
                 inner ->
-                    new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
+                    new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java
index c84e9bafaa76..4a639fef7373 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java
@@ -80,17 +80,17 @@ protected Mono<RestorableDroppedDatabaseInner> getInnerAsync() {
             .sqlServerManager
             .inner()
             .restorableDroppedDatabases()
-            .getAsync(this.resourceGroupName, this.sqlServerName, this.inner().getId());
+            .getAsync(this.resourceGroupName, this.sqlServerName, this.inner().id());
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java
index 9431ebd448eb..4163912540bb 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java
@@ -73,9 +73,9 @@ public class SqlServerDnsAliasImpl
         super(name, null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
+        if (innerObject != null && innerObject.id() != null) {
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().name();
             } catch (NullPointerException e) {
@@ -90,7 +90,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -105,7 +105,7 @@ public String azureDnsRecord() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java
index 929b02a22479..53f2583dad41 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java
@@ -99,7 +99,7 @@ public List<SqlServerDnsAlias> listBySqlServer(String resourceGroupName, String
             serverDnsAliases
                 .add(
                     new SqlServerDnsAliasImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(serverDnsAliases);
     }
@@ -118,7 +118,7 @@ public PagedFlux<SqlServerDnsAlias> listBySqlServerAsync(
                     new SqlServerDnsAliasImpl(
                         resourceGroupName,
                         sqlServerName,
-                        serverDnsAliasInner.getName(),
+                        serverDnsAliasInner.name(),
                         serverDnsAliasInner,
                         self.sqlServerManager));
     }
@@ -136,7 +136,7 @@ public List<SqlServerDnsAlias> listBySqlServer(SqlServer sqlServer) {
             serverDnsAliases
                 .add(
                     new SqlServerDnsAliasImpl(
-                        inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
+                        inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(serverDnsAliases);
     }
@@ -151,7 +151,7 @@ public PagedFlux<SqlServerDnsAlias> listBySqlServerAsync(final SqlServer sqlServ
             .mapPage(
                 serverDnsAliasInner ->
                     new SqlServerDnsAliasImpl(
-                        serverDnsAliasInner.getName(),
+                        serverDnsAliasInner.name(),
                         (SqlServerImpl) sqlServer,
                         serverDnsAliasInner,
                         sqlServer.manager()));
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
index 40b485b20934..82c3d4df6d7d 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
@@ -224,7 +224,7 @@ public Map<String, RecommendedElasticPool> listRecommendedElasticPools() {
         PagedIterable<RecommendedElasticPoolInner> recommendedElasticPoolInners =
             this.manager().inner().recommendedElasticPools().listByServer(this.resourceGroupName(), this.name());
         for (RecommendedElasticPoolInner inner : recommendedElasticPoolInners) {
-            recommendedElasticPoolMap.put(inner.getName(), new RecommendedElasticPoolImpl(inner, this));
+            recommendedElasticPoolMap.put(inner.name(), new RecommendedElasticPoolImpl(inner, this));
         }
 
         return Collections.unmodifiableMap(recommendedElasticPoolMap);
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java
index 6c740780d32b..262ff550cc74 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java
@@ -40,8 +40,8 @@ public class SqlServerKeyImpl extends ExternalChildResourceImpl<SqlServerKey, Se
         this.sqlServerManager = sqlServerManager;
         this.resourceGroupName = parent.resourceGroupName();
         this.sqlServerName = parent.name();
-        if (innerObject != null && innerObject.getName() != null) {
-            this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.name() != null) {
+            this.serverKeyName = innerObject.name();
         }
     }
 
@@ -65,8 +65,8 @@ public class SqlServerKeyImpl extends ExternalChildResourceImpl<SqlServerKey, Se
         this.sqlServerManager = sqlServerManager;
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
-        if (innerObject != null && innerObject.getName() != null) {
-            this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.name() != null) {
+            this.serverKeyName = innerObject.name();
         }
     }
 
@@ -81,12 +81,12 @@ public class SqlServerKeyImpl extends ExternalChildResourceImpl<SqlServerKey, Se
         super(name, null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
-            if (innerObject.getName() != null) {
-                this.serverKeyName = innerObject.getName();
+        if (innerObject != null && innerObject.id() != null) {
+            if (innerObject.name() != null) {
+                this.serverKeyName = innerObject.name();
             }
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().name();
             } catch (NullPointerException e) {
@@ -96,7 +96,7 @@ public class SqlServerKeyImpl extends ExternalChildResourceImpl<SqlServerKey, Se
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -201,7 +201,7 @@ public String sqlServerName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyOperationsImpl.java
index 2536673dec95..5694959c8cfc 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyOperationsImpl.java
@@ -94,7 +94,7 @@ public List<SqlServerKey> listBySqlServer(String resourceGroupName, String sqlSe
             serverKeys
                 .add(
                     new SqlServerKeyImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(serverKeys);
     }
@@ -112,7 +112,7 @@ public PagedFlux<SqlServerKey> listBySqlServerAsync(final String resourceGroupNa
                     new SqlServerKeyImpl(
                         resourceGroupName,
                         sqlServerName,
-                        serverKeyInner.getName(),
+                        serverKeyInner.name(),
                         serverKeyInner,
                         self.sqlServerManager));
     }
@@ -125,7 +125,7 @@ public List<SqlServerKey> listBySqlServer(final SqlServer sqlServer) {
             sqlServer.manager().inner().serverKeys().listByServer(sqlServer.resourceGroupName(), sqlServer.name());
         for (ServerKeyInner inner : serverKeyInners) {
             serverKeys
-                .add(new SqlServerKeyImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
+                .add(new SqlServerKeyImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
         }
         return Collections.unmodifiableList(serverKeys);
     }
@@ -141,7 +141,7 @@ public PagedFlux<SqlServerKey> listBySqlServerAsync(final SqlServer sqlServer) {
             .mapPage(
                 serverKeyInner ->
                     new SqlServerKeyImpl(
-                        serverKeyInner.getName(), (SqlServerImpl) sqlServer, serverKeyInner, sqlServer.manager()));
+                        serverKeyInner.name(), (SqlServerImpl) sqlServer, serverKeyInner, sqlServer.manager()));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java
index 7b4085b4ffa9..8d0a5033caad 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java
@@ -76,9 +76,9 @@ public class SqlServerSecurityAlertPolicyImpl
         super("Default", null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
+        if (innerObject != null && innerObject.id() != null) {
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().name();
             } catch (NullPointerException e) {
@@ -88,7 +88,7 @@ public class SqlServerSecurityAlertPolicyImpl
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -108,7 +108,7 @@ public String sqlServerName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java
index 03e6ee20d128..c5b8e9d44737 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java
@@ -64,7 +64,7 @@ protected SqlServerImpl wrapModel(ServerInner inner) {
             return null;
         }
 
-        return new SqlServerImpl(inner.getName(), inner, this.manager());
+        return new SqlServerImpl(inner.name(), inner, this.manager());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java
index d46abd3dc641..9473d81bf927 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java
@@ -31,12 +31,12 @@ protected Mono<SubscriptionUsageInner> getInnerAsync() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -61,6 +61,6 @@ public String unit() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java
index 53ad93d96d83..5057e46342d7 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java
@@ -90,9 +90,9 @@ public class SqlSyncGroupImpl
         super(name, null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
+        if (innerObject != null && innerObject.id() != null) {
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().parent().name();
                 this.sqlDatabaseName = resourceId.parent().name();
@@ -108,7 +108,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -123,7 +123,7 @@ public String sqlDatabaseName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java
index d3d795270914..a9cefc556b82 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java
@@ -68,7 +68,7 @@ public PagedIterable<String> listSyncDatabaseIds(String locationName) {
             .inner()
             .syncGroups()
             .listSyncDatabaseIds(locationName)
-            .mapPage(SyncDatabaseIdPropertiesInner::getId);
+            .mapPage(SyncDatabaseIdPropertiesInner::id);
     }
 
     @Override
@@ -78,7 +78,7 @@ public PagedFlux<String> listSyncDatabaseIdsAsync(String locationName) {
             .inner()
             .syncGroups()
             .listSyncDatabaseIdsAsync(locationName)
-            .mapPage(SyncDatabaseIdPropertiesInner::getId);
+            .mapPage(SyncDatabaseIdPropertiesInner::id);
     }
 
     @Override
@@ -229,7 +229,7 @@ public List<SqlSyncGroup> list() {
                 sqlSyncGroups
                     .add(
                         new SqlSyncGroupImpl(
-                            groupInner.getName(), this.sqlDatabase, groupInner, this.sqlServerManager));
+                            groupInner.name(), this.sqlDatabase, groupInner, this.sqlServerManager));
             }
         }
         return Collections.unmodifiableList(sqlSyncGroups);
@@ -247,6 +247,6 @@ public PagedFlux<SqlSyncGroup> listAsync() {
             .mapPage(
                 syncGroupInner ->
                     new SqlSyncGroupImpl(
-                        syncGroupInner.getName(), self.sqlDatabase, syncGroupInner, self.sqlServerManager));
+                        syncGroupInner.name(), self.sqlDatabase, syncGroupInner, self.sqlServerManager));
     }
 }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java
index dfb8ca435f11..5dbf55e661fa 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java
@@ -90,9 +90,9 @@ public class SqlSyncMemberImpl
         super(name, null, innerObject);
         Objects.requireNonNull(sqlServerManager);
         this.sqlServerManager = sqlServerManager;
-        if (innerObject != null && innerObject.getId() != null) {
+        if (innerObject != null && innerObject.id() != null) {
             try {
-                ResourceId resourceId = ResourceId.fromString(innerObject.getId());
+                ResourceId resourceId = ResourceId.fromString(innerObject.id());
                 this.resourceGroupName = resourceId.resourceGroupName();
                 this.sqlServerName = resourceId.parent().parent().parent().name();
                 this.sqlDatabaseName = resourceId.parent().parent().name();
@@ -109,7 +109,7 @@ public String resourceGroupName() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -129,7 +129,7 @@ public String sqlSyncGroupName() {
 
     @Override
     public String parentId() {
-        return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId());
+        return ResourceUtils.parentResourceIdFromResourceId(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java
index d85dc4996670..2d99054bcda5 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java
@@ -230,7 +230,7 @@ public List<SqlSyncMember> list() {
                 sqlSyncMembers
                     .add(
                         new SqlSyncMemberImpl(
-                            syncMemberInner.getName(), this.sqlSyncGroup, syncMemberInner, this.sqlServerManager));
+                            syncMemberInner.name(), this.sqlSyncGroup, syncMemberInner, this.sqlServerManager));
             }
         }
         return Collections.unmodifiableList(sqlSyncMembers);
@@ -251,7 +251,7 @@ public PagedFlux<SqlSyncMember> listAsync() {
             .mapPage(
                 syncMemberInner ->
                     new SqlSyncMemberImpl(
-                        syncMemberInner.getName(), self.sqlSyncGroup, syncMemberInner, self.sqlServerManager));
+                        syncMemberInner.name(), self.sqlSyncGroup, syncMemberInner, self.sqlServerManager));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java
index 02af4278d62e..be5e806802ab 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java
@@ -125,7 +125,7 @@ public SqlVirtualNetworkRuleImpl update() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java
index f5aa15ed5e59..3b722009619d 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java
@@ -37,7 +37,7 @@ public SqlVirtualNetworkRule getBySqlServer(String resourceGroupName, String sql
         VirtualNetworkRuleInner inner =
             this.sqlServerManager.inner().virtualNetworkRules().get(resourceGroupName, sqlServerName, name);
         return (inner != null)
-            ? new SqlVirtualNetworkRuleImpl(resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)
+            ? new SqlVirtualNetworkRuleImpl(resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)
             : null;
     }
 
@@ -52,7 +52,7 @@ public Mono<SqlVirtualNetworkRule> getBySqlServerAsync(
             .map(
                 inner ->
                     new SqlVirtualNetworkRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager));
     }
 
     @Override
@@ -67,7 +67,7 @@ public SqlVirtualNetworkRule getBySqlServer(SqlServer sqlServer, String name) {
                 .virtualNetworkRules()
                 .get(sqlServer.resourceGroupName(), sqlServer.name(), name);
         return (inner != null)
-            ? new SqlVirtualNetworkRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServerManager)
+            ? new SqlVirtualNetworkRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServerManager)
             : null;
     }
 
@@ -82,7 +82,7 @@ public Mono<SqlVirtualNetworkRule> getBySqlServerAsync(final SqlServer sqlServer
             .map(
                 inner ->
                     new SqlVirtualNetworkRuleImpl(
-                        inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
+                        inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()));
     }
 
     @Override
@@ -103,7 +103,7 @@ public List<SqlVirtualNetworkRule> listBySqlServer(String resourceGroupName, Str
             virtualNetworkRuleSet
                 .add(
                     new SqlVirtualNetworkRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager));
         }
         return Collections.unmodifiableList(virtualNetworkRuleSet);
     }
@@ -119,7 +119,7 @@ public PagedFlux<SqlVirtualNetworkRule> listBySqlServerAsync(
             .mapPage(
                 inner ->
                     new SqlVirtualNetworkRuleImpl(
-                        resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager));
+                        resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager));
     }
 
     @Override
@@ -135,7 +135,7 @@ public List<SqlVirtualNetworkRule> listBySqlServer(SqlServer sqlServer) {
                 virtualNetworkRuleSet
                     .add(
                         new SqlVirtualNetworkRuleImpl(
-                            inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
+                            inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager));
             }
         }
         return Collections.unmodifiableList(virtualNetworkRuleSet);
@@ -151,7 +151,7 @@ public PagedFlux<SqlVirtualNetworkRule> listBySqlServerAsync(final SqlServer sql
             .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name())
             .mapPage(
                 inner ->
-                    new SqlVirtualNetworkRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServerManager));
+                    new SqlVirtualNetworkRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServerManager));
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java
index 3fb3056324a1..8dc4bdbe83e3 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java
@@ -16,7 +16,7 @@ class TransparentDataEncryptionActivityImpl extends WrapperImpl<TransparentDataE
 
     protected TransparentDataEncryptionActivityImpl(TransparentDataEncryptionActivityInner innerObject) {
         super(innerObject);
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionImpl.java
index 2c161eae68e6..1c31c36593c1 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionImpl.java
@@ -35,17 +35,17 @@ protected TransparentDataEncryptionImpl(
         this.resourceGroupName = resourceGroupName;
         this.sqlServerName = sqlServerName;
         this.sqlServerManager = sqlServerManager;
-        this.resourceId = ResourceId.fromString(this.inner().getId());
+        this.resourceId = ResourceId.fromString(this.inner().id());
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/SyncDatabaseIdPropertiesInner.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/SyncDatabaseIdPropertiesInner.java
index f6de91ada755..239b2ec489bd 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/SyncDatabaseIdPropertiesInner.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/SyncDatabaseIdPropertiesInner.java
@@ -21,7 +21,7 @@ public final class SyncDatabaseIdPropertiesInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/UsageInner.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/UsageInner.java
index b4f7bcec38a5..27bc7cced126 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/UsageInner.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/models/UsageInner.java
@@ -58,7 +58,7 @@ public final class UsageInner {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 
diff --git a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java
index ea0705ec10f3..bef45d7d85bd 100644
--- a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java
+++ b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java
@@ -283,7 +283,7 @@ public void canCRUDSqlFailoverGroup() throws Exception {
         Assertions.assertEquals(sqlPrimaryServerName, failoverGroup.sqlServerName());
         Assertions.assertEquals(FailoverGroupReplicationRole.PRIMARY, failoverGroup.replicationRole());
         Assertions.assertEquals(1, failoverGroup.partnerServers().size());
-        Assertions.assertEquals(sqlSecondaryServer.id(), failoverGroup.partnerServers().get(0).getId());
+        Assertions.assertEquals(sqlSecondaryServer.id(), failoverGroup.partnerServers().get(0).id());
         Assertions
             .assertEquals(
                 FailoverGroupReplicationRole.SECONDARY, failoverGroup.partnerServers().get(0).replicationRole());
@@ -298,7 +298,7 @@ public void canCRUDSqlFailoverGroup() throws Exception {
         Assertions.assertEquals(sqlSecondaryServerName, failoverGroupOnPartner.sqlServerName());
         Assertions.assertEquals(FailoverGroupReplicationRole.SECONDARY, failoverGroupOnPartner.replicationRole());
         Assertions.assertEquals(1, failoverGroupOnPartner.partnerServers().size());
-        Assertions.assertEquals(sqlPrimaryServer.id(), failoverGroupOnPartner.partnerServers().get(0).getId());
+        Assertions.assertEquals(sqlPrimaryServer.id(), failoverGroupOnPartner.partnerServers().get(0).id());
         Assertions
             .assertEquals(
                 FailoverGroupReplicationRole.PRIMARY, failoverGroupOnPartner.partnerServers().get(0).replicationRole());
@@ -323,7 +323,7 @@ public void canCRUDSqlFailoverGroup() throws Exception {
         Assertions.assertEquals(sqlPrimaryServerName, failoverGroup2.sqlServerName());
         Assertions.assertEquals(FailoverGroupReplicationRole.PRIMARY, failoverGroup2.replicationRole());
         Assertions.assertEquals(1, failoverGroup2.partnerServers().size());
-        Assertions.assertEquals(sqlOtherServer.id(), failoverGroup2.partnerServers().get(0).getId());
+        Assertions.assertEquals(sqlOtherServer.id(), failoverGroup2.partnerServers().get(0).id());
         Assertions
             .assertEquals(
                 FailoverGroupReplicationRole.SECONDARY, failoverGroup2.partnerServers().get(0).replicationRole());
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java
index b239ad218665..c88174dd620e 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java
@@ -21,7 +21,7 @@ public final class PrivateEndpoint {
      *
      * @return the id value.
      */
-    public String getId() {
+    public String id() {
         return this.id;
     }
 }
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
index 952e25507a6e..76ccac2357eb 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
@@ -38,14 +38,14 @@ class BlobContainerImpl extends CreatableUpdatableImpl<BlobContainer, BlobContai
     }
 
     BlobContainerImpl(BlobContainerInner inner, StorageManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.containerName = inner.getName();
+        this.containerName = inner.name();
         // set resource ancestor and positional variables
-        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts");
-        this.containerName = IdParsingUtils.getValueFromIdByName(inner.getId(), "containers");
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts");
+        this.containerName = IdParsingUtils.getValueFromIdByName(inner.id(), "containers");
         //
     }
 
@@ -79,7 +79,7 @@ protected Mono<BlobContainerInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -99,7 +99,7 @@ public Boolean hasLegalHold() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -139,7 +139,7 @@ public Map<String, String> metadata() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -149,7 +149,7 @@ public PublicAccess publicAccess() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java
index 77966a5172de..fcb26ef0c15b 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java
@@ -30,13 +30,13 @@ class BlobServicePropertiesImpl
     }
 
     BlobServicePropertiesImpl(BlobServicePropertiesInner inner, StorageManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.accountName = inner.getName();
+        this.accountName = inner.name();
         // set resource ancestor and positional variables
-        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts");
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts");
         //
     }
 
@@ -69,7 +69,7 @@ protected Mono<BlobServicePropertiesInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -89,17 +89,17 @@ public DeleteRetentionPolicy deleteRetentionPolicy() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java
index 3d028dc4e388..94051b59bf0b 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java
@@ -31,14 +31,14 @@ class ImmutabilityPolicyImpl
     }
 
     ImmutabilityPolicyImpl(ImmutabilityPolicyInner inner, StorageManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.containerName = inner.getName();
+        this.containerName = inner.name();
         // set resource ancestor and positional variables
-        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts");
-        this.containerName = IdParsingUtils.getValueFromIdByName(inner.getId(), "containers");
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts");
+        this.containerName = IdParsingUtils.getValueFromIdByName(inner.id(), "containers");
         //
     }
 
@@ -88,7 +88,7 @@ protected Mono<ImmutabilityPolicyInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     @Override
@@ -98,7 +98,7 @@ public String etag() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -108,7 +108,7 @@ public int immutabilityPeriodSinceCreationInDays() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -118,7 +118,7 @@ public ImmutabilityPolicyState state() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java
index cdfc0bc3603f..602654078331 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java
@@ -40,13 +40,13 @@ class ManagementPolicyImpl extends CreatableUpdatableImpl<ManagementPolicy, Mana
     }
 
     ManagementPolicyImpl(ManagementPolicyInner inner, StorageManager manager) {
-        super(inner.getName(), inner);
+        super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.accountName = inner.getName();
+        this.accountName = inner.name();
         // set resource ancestor and positional variables
-        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups");
-        this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts");
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts");
         //
         this.cpolicy = new ManagementPolicySchema();
         this.upolicy = new ManagementPolicySchema();
@@ -91,7 +91,7 @@ protected Mono<ManagementPolicyInner> getInnerAsync() {
 
     @Override
     public boolean isInCreateMode() {
-        return this.inner().getId() == null;
+        return this.inner().id() == null;
     }
 
     private void resetCreateUpdateParameters() {
@@ -101,7 +101,7 @@ private void resetCreateUpdateParameters() {
 
     @Override
     public String id() {
-        return this.inner().getId();
+        return this.inner().id();
     }
 
     @Override
@@ -111,7 +111,7 @@ public OffsetDateTime lastModifiedTime() {
 
     @Override
     public String name() {
-        return this.inner().getName();
+        return this.inner().name();
     }
 
     @Override
@@ -121,7 +121,7 @@ public ManagementPolicySchema policy() {
 
     @Override
     public String type() {
-        return this.inner().getType();
+        return this.inner().type();
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java
index 38b8c58a40be..0fb817d2d0b9 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java
@@ -499,7 +499,7 @@ public Update upgradeToGeneralPurposeAccountKindV2() {
     public Mono<StorageAccount> createResourceAsync() {
         this.networkRulesHelper.setDefaultActionIfRequired();
         createParameters.withLocation(this.regionName());
-        createParameters.withTags(this.inner().getTags());
+        createParameters.withTags(this.inner().tags());
         final StorageAccountsInner client = this.manager().inner().storageAccounts();
         return this
             .manager()
@@ -517,7 +517,7 @@ public Mono<StorageAccount> createResourceAsync() {
     @Override
     public Mono<StorageAccount> updateResourceAsync() {
         this.networkRulesHelper.setDefaultActionIfRequired();
-        updateParameters.withTags(this.inner().getTags());
+        updateParameters.withTags(this.inner().tags());
         return this
             .manager()
             .inner()
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java
index 2c2fec53a0a2..266ba3883613 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java
@@ -51,7 +51,7 @@ protected StorageAccountImpl wrapModel(StorageAccountInner storageAccountInner)
         if (storageAccountInner == null) {
             return null;
         }
-        return new StorageAccountImpl(storageAccountInner.getName(), storageAccountInner, this.manager());
+        return new StorageAccountImpl(storageAccountInner.name(), storageAccountInner, this.manager());
     }
 
     @Override

From 2fe6e66cfaaf3fa7f4c9d2b5b6226e39fc26ce7c Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Wed, 6 May 2020 21:58:35 -0700
Subject: [PATCH 19/41] Update README and samples (#10837)

* Adding README samples and update README.md

* Remove unmaintained CONTRIBUTING and link to one in master.
---
 .../azure-messaging-servicebus/CHANGELOG.md   |  11 +-
 .../CONTRIBUTING.md                           |  92 -----
 .../azure-messaging-servicebus/README.md      | 342 +++++++++++-------
 .../src/samples/README.md                     |  18 +-
 .../messaging/servicebus/ReadmeSamples.java   | 137 ++++++-
 .../servicebus/ReceiveMessageSyncSample.java  |   2 +
 ...> ReceiveMultipleSessionsAsyncSample.java} |  21 +-
 .../ReceiveNamedSessionAsyncSample.java       |  68 ++++
 .../ReceiveSingleSessionAsyncSample.java      |  69 ++++
 .../ServiceBusMessageProcessorTest.java       |   6 +-
 .../ServiceBusReceiveLinkProcessorTest.java   |  13 +-
 sdk/servicebus/tests.yml                      |   2 +-
 12 files changed, 513 insertions(+), 268 deletions(-)
 delete mode 100644 sdk/servicebus/azure-messaging-servicebus/CONTRIBUTING.md
 rename sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/{MultiSessionReceiveAsyncSample.java => ReceiveMultipleSessionsAsyncSample.java} (82%)
 create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java
 create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java

diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
index e1a9ba15e60a..9c2fb0cf29b1 100644
--- a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
+++ b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Release History
 
-## 7.0.0-beta.2 (Unreleased)
-
+## 7.0.0-beta.2 (2020-05-07)
+
+- Add support for receiving messages from specific sessions
+- Add support for processing messages from multiple sessions
+- Add missing schedule and cancel APIs in ServiceBusSenderClient
+- Add support to send a collection of messages at once
+- Change return type from `ServiceBusReceivedMessage` to `ServiceBusReceivedMessageContext` when calling `receive()`
+- Fix message settlement to occur on receive link
+- Various bug fixes
 
 ## 7.0.0-beta.1 (2020-04-06)
 
diff --git a/sdk/servicebus/azure-messaging-servicebus/CONTRIBUTING.md b/sdk/servicebus/azure-messaging-servicebus/CONTRIBUTING.md
deleted file mode 100644
index 760ae8b962fb..000000000000
--- a/sdk/servicebus/azure-messaging-servicebus/CONTRIBUTING.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Contributing
-
-This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License
-Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For
-details, visit https://cla.microsoft.com.
-
-When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate
-the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to
-do this once across all repositories using our CLA.
-
-## Code of conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
-[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## Getting started
-
-Before working on a contribution, it would be beneficial to familiarize yourself with the process and guidelines used
-for the Azure SDKs so that your submission is consistent with the project standards and is ready to be accepted with
-fewer changes requested. In particular, it is recommended to review:
-
-- [Azure SDK README][github-general], to learn more about the overall project and processes used.
-- [Azure SDK Design Guidelines][design-guidelines], to understand the general guidelines for the SDKs across all
-  languages and platforms
-- [Azure SDK Design Guidelines for Java][java-spec], to understand the guidelines specific to the Azure SDKs for Java.
-
-## Development environment setup
-
-### Prerequisites
-
-- Java Development Kit (JDK) with version 8 or above
-- [Maven][maven]
-- Git
-- Microsoft Azure subscription
-    - You can create a free account at: https://azure.microsoft.com
-
-## Building all the client libraries
-
-Open a command prompt/terminal:
-1. Execute `git clone https://github.com/Azure/azure-sdk-for-java.git`
-2. Traverse to the repository root.
-3. Execute `mvn compile -f pom.client.xml`
-4. Install the tooling and build the product by executing:
-    * `mvn install -Dinclude-non-shipping-modules -DskipTests -Dgpg.skip -f pom.client.xml`
-
-## Building only the Azure SDK client library for Service Bus
-
-After building the tooling and solution once from the section, [Building all the client libraries](#building-all-the-client-libraries), you can build just the Azure SDK client library for Service Bus by
-executing:
-1. `mvn compile -f servicebus\azure-messaging-servicebus\pom.xml`
-
-## Running tests
-
-After following instructions in [Building all the client libraries](#building-all-the-client-libraries), you can run the
-unit tests by executing:
-1. `mvn test -f servicebus\azure-messaging-servicebus\pom.xml`
-
-For unit tests, there are no special considerations; these are self-contained and execute locally without any reliance
-on external resources. These tests are run for all PR validations.
-
-### Running integration tests
-
-Integration tests have dependencies on live Azure resources and require setting up your development environment prior
-to running. Known in the Azure SDK project commonly as "Live" tests, these tests only run when the
-[`TestMode`][test-mode] is equal to [`TestMode.RECORD`][test-mode-record]. The Live tests read information from the
-following environment variables:
-
-- AZURE_TEST_MODE
-    - Can be either "RECORD" or "PLAYBACK". If AZURE_TEST_MODE is equal to "RECORD", then the tests will run against the
-      live service.
-- AZURE_SERVICEBUS_CONNECTION_STRING
-    - The connection string to the Azure Service Bus instance. This is required when running tests in RECORD mode. It must
-      contain the name of the Service Bus instance (the `EntityPath=` component must be in the connection string).
-
-## Logging output
-
-Log messages can be seen in the output window by:
-1. Setting `AZURE_LOG_LEVEL` to the desired verbosity. Log levels can be found in [ClientLogger][log-level]
-1. Adding an implementation of [slf4j][slf4j] to the classpath. Implementations can be found under section "[Binding with a
-   logging framework at deployment time][slf4j-implementations]".
-
-<!-- Links -->
-[design-guidelines]: https://azuresdkspecs.z5.web.core.windows.net/DesignGuidelines.html
-[github-general]: https://github.com/Azure/azure-sdk
-[java-spec]: https://azuresdkspecs.z5.web.core.windows.net/JavaSpec.html
-[log-level]: https://github.com/Azure/azure-sdk-for-java/blob/master/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java#L40
-[maven]: https://maven.apache.org/
-[slf4j]: https://www.slf4j.org/
-[slf4j-implementations]: https://www.slf4j.org/manual.html#swapping
-[test-mode]: https://github.com/Azure/azure-sdk-for-java/blob/master/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
-[test-mode-record]: https://github.com/Azure/azure-sdk-for-java/blob/master/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java#L12
diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md
index 942d82b4e46e..9c9b489e3172 100644
--- a/sdk/servicebus/azure-messaging-servicebus/README.md
+++ b/sdk/servicebus/azure-messaging-servicebus/README.md
@@ -1,39 +1,40 @@
 # Azure Service Bus client library for Java
 
 Microsoft Azure Service Bus is a fully managed enterprise integration message broker. Service Bus can decouple
-applications and services. Service Bus offers a reliable and secure platform for asynchronous transfer of data
-and state. Data is transferred between different applications and services using messages. If you would like to know
-more about Azure Service Bus, you may wish to review: [What is Service Bus](https://docs.microsoft.com/en-us/azure/service-bus-messaging)?
+applications and services. Service Bus offers a reliable and secure platform for asynchronous transfer of data and
+state. Data is transferred between different applications and services using messages. If you would like to know more
+about Azure Service Bus, you may wish to review: [What is Service Bus][product_docs]
 
 The Azure Service Bus client library allows for sending and receiving of Azure Service Bus messages and may be used to:
-
-- Messaging: Transfer business data, such as sales or purchase orders, journals, or inventory movements.
-- Decouple applications: Improve reliability and scalability of applications and services. Client and service don't
+- Transfer business data, such as sales or purchase orders, journals, or inventory movements.
+- Decouple applications to improve reliability and scalability of applications and services. Clients and services don't
 have to be online at the same time.
-- Topics and subscriptions: Enable 1:n relationships between publishers and subscribers.
-- Message sessions. Implement work-flows that require message ordering or message deferral.
+- Enable 1:n relationships between publishers and subscribers.
+- Implement workflows that require message ordering or message deferral.
 
-[Source code][source_code] | [API reference documentation][api_documentation] | [Samples][sample_readme]
+[Source code][source_code] | [API reference documentation][api_documentation]
+| [Product documentation][product_docs]| [Samples][sample_examples]
 
 ## Table of contents
 
-- [Table of contents](#table-of-contents)
-- [Getting started](#getting-started)
-  - [Prerequisites](#prerequisites)
-  - [Adding the package to your product](#adding-the-package-to-your-product)
-  - [Authenticate the client](#authenticate-the-client)
-- [Key concepts](#key-concepts)
-- [Examples](#examples)
-  - [Sending messages](#sending-messages)
-  - [Receiving messages](#receiving-messages)
-- [Troubleshooting](#troubleshooting)
-  - [Enable client logging](#enable-client-logging)
-  - [Enable AMQP transport logging](#enable-amqp-transport-logging)
-  - [Common exceptions](#common-exceptions)
-  - [Handling transient AMQP exceptions](#handling-transient-amqp-exceptions)
-  - [Default SSL library](#default-ssl-library)
-- [Next steps](#next-steps)
-- [Contributing](#contributing)
+- [Azure Service Bus client library for Java](#azure-service-bus-client-library-for-java)
+  - [Table of contents](#table-of-contents)
+  - [Getting started](#getting-started)
+    - [Prerequisites](#prerequisites)
+    - [Include the package](#include-the-package)
+    - [Authenticate the client](#authenticate-the-client)
+  - [Key concepts](#key-concepts)
+  - [Examples](#examples)
+    - [Send messages](#send-messages)
+    - [Receive messages](#receive-messages)
+    - [Settle messages](#settle-messages)
+    - [Send and receive from session enabled queues or topics](#send-and-receive-from-session-enabled-queues-or-topics)
+  - [Troubleshooting](#troubleshooting)
+    - [Enable client logging](#enable-client-logging)
+    - [Enable AMQP transport logging](#enable-amqp-transport-logging)
+    - [Common exceptions](#common-exceptions)
+  - [Next steps](#next-steps)
+  - [Contributing](#contributing)
 
 ## Getting started
 
@@ -43,27 +44,58 @@ have to be online at the same time.
 - [Maven][maven]
 - Microsoft Azure subscription
   - You can create a free account at: https://azure.microsoft.com
+- Azure Service Bus instance
+  - Step-by-step guide for [creating a Service Bus instance using Azure Portal][service_bus_create]
 
-### Adding the package to your product
+### Include the package
 
 [//]: # ({x-version-update-start;com.azure:azure-messaging-servicebus;current})
 ```xml
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-messaging-servicebus</artifactId>
-    <version>7.0.0-beta.1</version>
+    <version>7.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
 
 ### Authenticate the client
 
-For the Service Bus client library to interact with an Service Bus, it will need to understand how to connect
-and authorize with it.
+For the Service Bus client library to interact with Service Bus, it will need to understand how to connect and authorize
+with it.
+
+#### Create Service Bus clients using a connection string
+
+The easiest means for authenticating is to use a connection string, which automatically created when creating a Service Bus
+namespace. If you aren't familiar with shared access policies in Azure, you may wish to follow the step-by-step guide to
+[get a Service Bus connection string][service_bus_connection_string].
+
+Both the asynchronous and synchronous Service Bus sender and receiver clients are instantiated using
+`ServiceBusClientBuilder`. The snippets below create a synchronous Service Bus sender and an asynchronous receiver,
+respectively.
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L29-L33 -->
+```java
+ServiceBusSenderClient sender = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+    .sender()
+    .queueName("<< QUEUE NAME >>")
+    .buildClient();
+```
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L40-L45 -->
+```java
+ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+    .receiver()
+    .topicName("<< TOPIC NAME >>")
+    .subscriptionName("<< SUBSCRIPTION NAME >>")
+    .buildAsyncClient();
+```
 
-#### Create an Service Bus client using Microsoft identity platform (formerly Azure Active Directory)
+#### Create a Service Bus client using Microsoft Identity platform (formerly Azure Active Directory)
 
-Azure SDK for Java supports an Azure Identity package, making it simple get credentials from Microsoft identity
+Azure SDK for Java supports the Azure Identity package, making it simple to get credentials from the Microsoft identity
 platform. First, add the package:
 
 [//]: # ({x-version-update-start;com.azure:azure-identity;dependency})
@@ -76,20 +108,18 @@ platform. First, add the package:
 ```
 [//]: # ({x-version-update-end})
 
-All the implemented ways to request a credential can be found under the `com.azure.identity.credential` package. The
-sample below shows how to use an Azure Active Directory (AAD) application client secret to authorize with Azure Service Bus.
+The implemented ways to request a credential are under the `com.azure.identity.credential` package. The sample below
+shows how to use an Azure Active Directory (AAD) application client secret to authorize with Azure Service Bus.
 
-#### Authorizing with AAD application client secret
+##### Authorizing with DefaultAzureCredential
 
-Follow the instructions in [Creating a service principal using Azure Portal][application_client_secret] to create a
-service principal and a client secret. The corresponding `clientId` and `tenantId` for the service principal can be
-obtained from the [App registration page][app_registration_page].
-
-Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables:
-AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET.
+Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds the best credential to use in its
+running environment. For more information about using Azure Active Directory authorization with Service Bus, please
+refer to [the associated documentation][aad_authorization].
 
 Use the returned token credential to authenticate the client:
-<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L48-L54 -->
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L52-L58 -->
 ```java
 TokenCredential credential = new DefaultAzureCredentialBuilder()
     .build();
@@ -100,92 +130,163 @@ ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
     .buildAsyncClient();
 ```
 
-##### Service Bus Roles
-
-When using Azure Active Directory, your principal must be assigned a role which allows access to Service Bus, such
-as the `Azure Service Bus Data Owner`, `Azure Service Bus Data Sender` and `Azure Service Bus Data Receiver`
-[role][servicebus_roles].
-For more information about using Azure Active Directory authorization with Service Bus, please refer to
-[the associated documentation][aad_authorization].
-
 ## Key concepts
 
 You can interact with the primary resource types within a Service Bus Namespace, of which multiple can exist and
-on which actual message transmission takes place, the namespace often serving as an application container:
-
-* [Queue][queue_concept]: Allows for Sending and Receiving of messages, ordered first-in-first-out.  Often used for
-point-to-point communication.
+on which actual message transmission takes place. The namespace often serves as an application container:
 
-* [Topic][topic_concept]: As opposed to Queues, Topics are better suited to publish/subscribe scenarios.  A topic can
-be sent to, but requires a subscription, of which there can be multiple in parallel, to consume from.
-
-* [Subscription][subscription_concept]: The mechanism to consume from a Topic.  Each subscription is independent, and
-receaves a copy of each message sent to the topic.
+* A **[queue][queue_concept]** allows for the sending and receiving of messages, ordered first-in-first-out. It is often
+  used for point-to-point communication.
+* A **[topic][topic_concept]** is better suited to publisher and subscriber scenarios. A topic publishes messages to
+  subscriptions, of which, multiple can exist simultaneously.
+* A **[subscription][subscription_concept]** receives messages from a topic. Each subscription is independent and
+  receives a copy of the message sent to the topic.
 
 ## Examples
 
-### Create a sender or receiver using connection string
-
-The easiest means for doing so is to use a connection string, which is created automatically when creating an Service Bus
-namespace. If you aren't familiar with shared access policies in Azure, you may wish to follow the step-by-step guide to
-[get an Service Bus connection string][service_bus_connection_string].
+### Send messages
 
-Both the asynchronous and synchronous Service Bus sender and receiver clients can be created using
-`ServiceBusClientBuilder`.The examples are explained blow.
+You'll need to create an asynchronous [`ServiceBusSenderAsyncClient`][ServiceBusSenderAsyncClient] or a synchronous
+[`ServiceBusSenderClient`][ServiceBusSenderClient] to send messages. Each sender can send messages to either a queue or
+a topic.
 
-The snippet below creates an asynchronous Service Bus sender.
+The snippet below creates a synchronous `ServiceBusSender` to publish a message to a queue.
 
-<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L23-L28 -->
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L65-L74 -->
 ```java
-String connectionString = "<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>";
-ServiceBusSenderAsyncClient sender = new ServiceBusClientBuilder()
-    .connectionString(connectionString)
+ServiceBusSenderClient sender = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
     .sender()
     .queueName("<< QUEUE NAME >>")
-    .buildAsyncClient();
+    .buildClient();
+List<ServiceBusMessage> messages = Arrays.asList(
+    new ServiceBusMessage("Hello world".getBytes()).setMessageId("1"),
+    new ServiceBusMessage("Bonjour".getBytes()).setMessageId("2"));
+
+sender.send(messages);
 ```
 
-The snippet below creates an asynchronous Service Bus receiver.
+### Receive messages
+
+You'll need to create an asynchronous [`ServiceBusReceiverAsyncClient`][ServiceBusReceiverAsyncClient] or a synchronous
+[`ServiceBusReceiverClient`][ServiceBusReceiverClient] to receive messages. Each receiver can consume messages from
+either a queue or a topic subscription.
+
+#### Receive a batch of messages
+
+The snippet below creates a `ServiceBusReceiverClient` to receive messages from a topic subscription. It returns a batch
+of messages when 10 messages are received or until 30 seconds have elapsed, whichever happens first.
 
-<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L35-L41 -->
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L81-L94 -->
 ```java
-String connectionString = "<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>";
-ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
-    .connectionString(connectionString)
+ServiceBusReceiverClient receiver = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
     .receiver()
     .topicName("<< TOPIC NAME >>")
     .subscriptionName("<< SUBSCRIPTION NAME >>")
+    .receiveMode(ReceiveMode.PEEK_LOCK)
+    .buildClient();
+
+IterableStream<ServiceBusReceivedMessageContext> messages = receiver.receive(10, Duration.ofSeconds(30));
+messages.forEach(context -> {
+    ServiceBusReceivedMessage message = context.getMessage();
+    System.out.printf("Id: %s. Contents: %s%n", message.getMessageId(),
+        new String(message.getBody(), StandardCharsets.UTF_8));
+});
+```
+
+#### Receive a stream of messages
+
+The asynchronous `ServiceBusReceiverAsyncClient` continuously fetches messages until the `subscription` is disposed.
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L101-L115 -->
+```java
+ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+    .receiver()
+    .queueName("<< QUEUE NAME >>")
     .buildAsyncClient();
+
+Disposable subscription = receiver.receive().subscribe(context -> {
+    ServiceBusReceivedMessage message = context.getMessage();
+    System.out.printf("Id: %s%n", message.getMessageId());
+    System.out.printf("Contents: %s%n", new String(message.getBody(), StandardCharsets.UTF_8));
+}, error -> {
+        System.err.println("Error occurred while receiving messages: " + error);
+    }, () -> {
+        System.out.println("Finished receiving messages.");
+    });
+```
+
+### Settle messages
+
+When a message is received, it can be settled using any of the `complete()`, `abandon()`, `defer()`, or `deadLetter()`
+overloads. The sample below completes a received message from synchronous `ServiceBusReceiverClient`.
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L130-L135 -->
+```java
+receiver.receive(10).forEach(context -> {
+    ServiceBusReceivedMessage message = context.getMessage();
+
+    // Process message and then complete it.
+    receiver.complete(message);
+});
 ```
 
-### Sending messages
+### Send and receive from session enabled queues or topics
 
-You'll need to create an asynchronous [`ServiceBusSenderAsyncClient`][ServiceBusSenderAsyncClient] or
-a synchronous [`ServiceBusSenderClient`][ServiceBusSenderClient] to send message. Each sender can send message to either, a queue,
-or topic.
+> Using sessions requires you to create a session enabled queue or subscription. You can read more about how to
+> configure this in "[Message sessions][message-sessions]".
 
-* [Sending a message asynchronously][sample-send-async-message].
-* [Sending a message asynchronously using active directory credential][sample-send-async-aad-message].
-* [Send message in batch synchronously][sample-send-batch-messages].
+Unlike non-session-enabled queues or subscriptions, only a single receiver can read from a session at any time. When a
+receiver fetches a session, Service Bus locks the session for that receiver, and it has exclusive access to messages in
+that session.
 
-### Receiving messages
+#### Send message to a session
 
-You'll need to create an asynchronous [`ServiceBusReceiverAsyncClient`][ServiceBusReceiverAsyncClient] or
-a synchronous [`ServiceBusReceiverClient`][ServiceBusReceiverClient]. Each receiver can receive message from either, a queue,
-or subscriber.
+Create a `ServiceBusSenderClient` for a session enabled queue or topic subscription. Setting `.setSessionId(String)` on
+a `ServiceBusMessage` will publish the message to that session. If the session does not exist, it is created.
 
-* [Receiving a message asynchronously][sample-receive-async-message].
-* [Receiving a message asynchronously using active directory credential][sample-receive-async-aad-message].
-* [Receiving a message asynchronously and settling][sample-receive-message-and-settle].
-* [Receiving messages synchronously][sample-receive-message-synchronously].
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L148-L151 -->
+```java
+ServiceBusMessage message = new ServiceBusMessage("Hello world".getBytes())
+    .setSessionId("greetings");
+
+sender.send(message);
+```
+
+#### Receive messages from a session
+
+Receivers can fetch messages from a specific session or the first available, unlocked session. The first snippet creates
+a receiver for a session with id "greetings". The second snippet creates a receiver that fetches the first available
+session.
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L158-L163 -->
+```java
+ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+    .sessionReceiver()
+    .queueName("<< QUEUE NAME >>")
+    .sessionId("greetings")
+    .buildAsyncClient();
+```
+
+<!-- embedme ./src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java#L170-L174 -->
+```java
+ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+    .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+    .sessionReceiver()
+    .queueName("<< QUEUE NAME >>")
+    .buildAsyncClient();
+```
 
 ## Troubleshooting
 
 ### Enable client logging
 
-You can set the `AZURE_LOG_LEVEL` environment variable to view logging statements made in the client library. For
-example, setting `AZURE_LOG_LEVEL=2` would show all informational, warning, and error log messages. The log levels can
-be found here: [log levels][LogLevels].
+Azure SDK for Java offers a consistent logging story to help aid in troubleshooting application errors and expedite
+their resolution. The logs produced will capture the flow of an application before reaching the terminal state to help
+locate the root issue. View the [logging][logging] wiki for guidance about enabling logging.
 
 ### Enable AMQP transport logging
 
@@ -224,66 +325,40 @@ services. When an AMQP exception is thrown, examining the error condition field
 exception occurred and if possible, how to mitigate this exception. A list of all the AMQP exceptions can be found in
 [OASIS AMQP Version 1.0 Transport Errors][oasis_amqp_v1_error].
 
-The [`AmqpErrorContext`][AmqpErrorContext] in the [`AmqpException`][AmqpException] provides information about the AMQP
-session, link, or connection that the exception occurred in. This is useful to diagnose which level in the transport
-this exception occurred at and whether it was an issue in one of the producers or consumers.
-
-#### Operation cancelled exception
-
-It occurs when the underlying AMQP layer encounters an abnormal link abort or the connection is disconnected in an
-unexpected fashion. It is recommended to attempt to verify the current state and retry if necessary.
-
-### Handling transient AMQP exceptions
-
-If a transient AMQP exception occurs, the client library retries the operation as many times as the
-[AmqpRetryOptions][AmqpRetryOptions] allows. Afterwards, the operation fails and an exception is propagated back to the
-user.
-
-### Default SSL library
-
-All client libraries, by default, use the Tomcat-native Boring SSL library to enable native-level performance for SSL
-operations. The Boring SSL library is an uber jar containing native libraries for Linux / macOS / Windows, and provides
-better performance compared to the default SSL implementation within the JDK. For more information, including how to
-reduce the dependency size, refer to the [performance tuning][performance_tuning] section of the wiki.
+The recommended way to solve the specific exception the AMQP exception represents is to follow the
+[Service Bus Messaging Exceptions][] guidance.
 
 ## Next steps
 
 Beyond those discussed, the Azure Service Bus client library offers support for many additional scenarios to help take
-advantage of the full feature set of the Azure Service Bus service. In order to help explore some of the these scenarios,
-the following set of sample is available [here][samples_readme].
+advantage of the full feature set of the Azure Service Bus service. In order to help explore some of these scenarios,
+check out the [samples README][samples_readme].
 
 ## Contributing
 
 If you would like to become an active contributor to this project please refer to our [Contribution
-Guidelines](./CONTRIBUTING.md) for more information.
+Guidelines](./../../../CONTRIBUTING.md) for more information.
 
 <!-- Links -->
 [aad_authorization]: https://docs.microsoft.com/azure/service-bus-messaging/authenticate-application
 [amqp_transport_error]: https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-transport-v1.0-os.html#type-amqp-error
 [AmqpErrorCondition]: ../../core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpErrorCondition.java
-[AmqpErrorContext]: ../../core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpErrorContext.java
-[AmqpException]: ../../core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
 [api_documentation]: https://aka.ms/java-docs
-[app_registration_page]: https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal#get-values-for-signing-in
-[application_client_secret]: https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal#create-a-new-application-secret
 [java_8_sdk_javadocs]: https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html
-[LogLevels]: ../../core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
+[logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK
 [maven]: https://maven.apache.org/
+[message-sessions]: https://docs.microsoft.com/azure/service-bus-messaging/message-sessions
 [oasis_amqp_v1_error]: http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-transport-v1.0-os.html#type-error
 [oasis_amqp_v1]: http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-overview-v1.0-os.html
-[performance_tuning]: https://github.com/Azure/azure-sdk-for-java/wiki/Performance-Tuning
+[product_docs]: https://docs.microsoft.com/azure/service-bus-messaging
 [qpid_proton_j_apache]: http://qpid.apache.org/proton/
 [queue_concept]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-messaging-overview#queues
 [RetryOptions]: ../../core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpRetryOptions.java
-[sample_readme]: ./src/samples/README.md
-[sample-receive-async-aad-message]: ./src/samples/java/com/azure/messaging/servicebus/ReceiveMessageAzureIdentityAsyncSample.java
-[sample-receive-async-message]: ./src/samples/java/com/azure/messaging/servicebus/ReceiveMessageAsyncSample.java
-[sample-receive-message-and-settle]: ./src/samples/java/com/azure/messaging/servicebus/ReceiveMessageAndSettleAsyncSample.java
-[sample-receive-message-synchronously]: ./src/samples/java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java
-[sample-send-async-aad-message]: ./src/samples/java/com/azure/messaging/servicebus/SendMessageWithAzureIdentityAsyncSample.java
-[sample-send-async-message]: ./src/samples/java/com/azure/messaging/servicebus/SendMessageAsyncSample.java
-[sample-send-batch-messages]: ./src/samples/java/com/azure/messaging/servicebus/SendMessageBatchSyncSample.java
+[sample_examples]: ./src/samples/java/com/azure/messaging/servicebus/
+[samples_readme]: ./src/samples/README.md
 [service_bus_connection_string]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-create-namespace-portal#get-the-connection-string
+[servicebus_create]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-create-namespace-portal
+[servicebus_messaging_exceptions]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-messaging-exceptions
 [servicebus_roles]: https://docs.microsoft.com/azure/service-bus-messaging/authenticate-application#built-in-rbac-roles-for-azure-service-bus
 [ServiceBusReceiverAsyncClient]: ./src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java
 [ServiceBusReceiverClient]: ./src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java
@@ -292,5 +367,6 @@ Guidelines](./CONTRIBUTING.md) for more information.
 [source_code]: ./
 [subscription_concept]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-queues-topics-subscriptions#topics-and-subscriptions
 [topic_concept]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-messaging-overview#topics
+[wiki_identity]: https://github.com/Azure/azure-sdk-for-java/wiki/Identity-and-Authentication
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fservicebus%2Fazure-messaging-servicebus%2FREADME.png)
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/README.md b/sdk/servicebus/azure-messaging-servicebus/src/samples/README.md
index e272b68c4a76..5b3df0220482 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/samples/README.md
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/README.md
@@ -18,7 +18,7 @@ Key concepts are explained in detail [here][sdk_readme_key_concepts].
 ## Getting started
 Please refer to the [Getting Started][sdk_readme_getting_started] section.
 
-### Obtaining an Event Hub instance connection string
+### Obtaining a Service Bus namespace connection string
 
 Most of the samples authorize with Service Bus using a connection string generated for that Service Bus namespace. The
 connection string value can be obtained by:
@@ -34,12 +34,18 @@ connection string value can be obtained by:
 - [Send messages using Azure Identity][SendMessageWithAzureIdentityAsyncSample]
 - [Send message batches synchronously][SendMessageBatchSyncSample]
 - [Schedule and cancel a message][MessageCancelScheduleAsyncSample]
+- [Receive messages synchronously][ReceiveMessageSyncSample]
 - [Receive and auto-complete messages][ReceiveMessageAsyncSample]
 - [Receive messages using Azure Identity][ReceiveMessageAzureIdentityAsyncSample]
 - [Receive and settle messages via complete or abandon][ReceiveMessageAndSettleAsyncSample]
-- [Receive messages synchronously][ReceiveMessageSyncSample]
 - [Peek at a message][PeekMessageAsyncSample]
 
+### Message sessions
+- [Send and receive messages from a session][SendAndReceiveSessionMessageSample]
+- [Receive messages from multiple available sessions][ReceiveMultipleSessionsAsyncSample]
+- [Receive messages from a specific session][ReceiveNamedSessionAsyncSample]
+- [Receive messages from the first available session][ReceiveSingleSessionAsyncSample]
+
 ## Troubleshooting
 See [Troubleshooting][sdk_readme_troubleshooting].
 
@@ -49,7 +55,7 @@ See [Next steps][sdk_readme_next_steps].
 ## Contributing
 
 If you would like to become an active contributor to this project please refer to our [Contribution
-Guidelines](../../CONTRIBUTING.md) for more information.
+Guidelines](../../../../../CONTRIBUTING.md) for more information.
 
 <!-- LINKS -->
 [sdk_readme_key_concepts]: ../../README.md#key-concepts
@@ -57,14 +63,18 @@ Guidelines](../../CONTRIBUTING.md) for more information.
 [sdk_readme_troubleshooting]: ../../README.md#troubleshooting
 [sdk_readme_next_steps]: ../../README.md#next-steps
 
-[MessageCancelScheduleAsyncSample]: ./java/com/azure/messaging/servicebus/SendScheduledMessageAndCancelAsyncSample.java
 [PeekMessageAsyncSample]: ./java/com/azure/messaging/servicebus/PeekMessageAsyncSample.java
 [ReceiveMessageAndSettleAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveMessageAndSettleAsyncSample.java
 [ReceiveMessageAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveMessageAsyncSample.java
 [ReceiveMessageAzureIdentityAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveMessageAzureIdentityAsyncSample.java
 [ReceiveMessageSyncSample]: ./java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java
+[ReceiveMultipleSessionsAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java
+[ReceiveNamedSessionAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java
+[ReceiveSingleSessionAsyncSample]: ./java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java
+[SendAndReceiveSessionMessageSample]: ./java/com/azure/messaging/servicebus/SendAndReceiveSessionMessageSample.java
 [SendMessageAsyncSample]: ./java/com/azure/messaging/servicebus/SendMessageAsyncSample.java
 [SendMessageBatchSyncSample]: ./java/com/azure/messaging/servicebus/SendMessageBatchSyncSample.java
 [SendMessageWithAzureIdentityAsyncSample]: ./java/com/azure/messaging/servicebus/SendMessageWithAzureIdentityAsyncSample.java
+[SendScheduledMessageAndCancelAsyncSample]: ./java/com/azure/messaging/servicebus/SendScheduledMessageAndCancelAsyncSample.java
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fappconfiguration%2Fazure-messaging-servicebus%2Fsrc%2Fsamples%2FREADME.png)
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java
index bc2ea9444be7..70c1cc118aa0 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java
@@ -4,9 +4,15 @@
 package com.azure.messaging.servicebus;
 
 import com.azure.core.credential.TokenCredential;
-import com.azure.identity.ClientSecretCredential;
-import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.core.util.IterableStream;
 import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.messaging.servicebus.models.ReceiveMode;
+import reactor.core.Disposable;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * WARNING: MODIFYING THIS FILE WILL REQUIRE CORRESPONDING UPDATES TO README.md FILE. LINE NUMBERS ARE USED TO EXTRACT
@@ -20,21 +26,19 @@ public class ReadmeSamples {
      * Code sample for creating an asynchronous Service Bus sender.
      */
     public void createAsynchronousServiceBusSender() {
-        String connectionString = "<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>";
-        ServiceBusSenderAsyncClient sender = new ServiceBusClientBuilder()
-            .connectionString(connectionString)
+        ServiceBusSenderClient sender = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
             .sender()
             .queueName("<< QUEUE NAME >>")
-            .buildAsyncClient();
+            .buildClient();
     }
 
     /**
      * Code sample for creating an asynchronous Service Bus receiver.
      */
     public void createAsynchronousServiceBusReceiver() {
-        String connectionString = "<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>";
         ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
-            .connectionString(connectionString)
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
             .receiver()
             .topicName("<< TOPIC NAME >>")
             .subscriptionName("<< SUBSCRIPTION NAME >>")
@@ -55,19 +59,118 @@ public void createAsynchronousServiceBusReceiverWithAzureIdentity() {
     }
 
     /**
-     * Code sample for creating an asynchronous Service Bus receiver using Aad.
+     * Sends messages to a queue.
      */
-    public void createAsynchronousServiceBusReceiverWithAad() {
-        ClientSecretCredential credential = new ClientSecretCredentialBuilder()
-            .clientId("<< APPLICATION (CLIENT) ID >>")
-            .clientSecret("<< APPLICATION SECRET >>")
-            .tenantId("<< TENANT ID >>")
-            .build();
+    public void sendMessage() {
+        ServiceBusSenderClient sender = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .sender()
+            .queueName("<< QUEUE NAME >>")
+            .buildClient();
+        List<ServiceBusMessage> messages = Arrays.asList(
+            new ServiceBusMessage("Hello world".getBytes()).setMessageId("1"),
+            new ServiceBusMessage("Bonjour".getBytes()).setMessageId("2"));
+
+        sender.send(messages);
+    }
+
+    /**
+     * Receives messages from a topic and subscription.
+     */
+    public void receiveMessages() {
+        ServiceBusReceiverClient receiver = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .receiver()
+            .topicName("<< TOPIC NAME >>")
+            .subscriptionName("<< SUBSCRIPTION NAME >>")
+            .receiveMode(ReceiveMode.PEEK_LOCK)
+            .buildClient();
 
+        IterableStream<ServiceBusReceivedMessageContext> messages = receiver.receive(10, Duration.ofSeconds(30));
+        messages.forEach(context -> {
+            ServiceBusReceivedMessage message = context.getMessage();
+            System.out.printf("Id: %s. Contents: %s%n", message.getMessageId(),
+                new String(message.getBody(), StandardCharsets.UTF_8));
+        });
+    }
+
+    /**
+     * Receives messages asynchronously.
+     */
+    public void receiveMessagesAsync() {
         ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
-            .credential("<<fully-qualified-namespace>>", credential)
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
             .receiver()
-            .queueName("<<queue-name>>")
+            .queueName("<< QUEUE NAME >>")
+            .buildAsyncClient();
+
+        Disposable subscription = receiver.receive().subscribe(context -> {
+            ServiceBusReceivedMessage message = context.getMessage();
+            System.out.printf("Id: %s%n", message.getMessageId());
+            System.out.printf("Contents: %s%n", new String(message.getBody(), StandardCharsets.UTF_8));
+        }, error -> {
+                System.err.println("Error occurred while receiving messages: " + error);
+            }, () -> {
+                System.out.println("Finished receiving messages.");
+            });
+    }
+
+    /**
+     * Complete a message.
+     */
+    public void completeMessage() {
+        ServiceBusReceiverClient receiver = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .receiver()
+            .topicName("<< TOPIC NAME >>")
+            .subscriptionName("<< SUBSCRIPTION NAME >>")
+            .receiveMode(ReceiveMode.PEEK_LOCK)
+            .buildClient();
+
+        receiver.receive(10).forEach(context -> {
+            ServiceBusReceivedMessage message = context.getMessage();
+
+            // Process message and then complete it.
+            receiver.complete(message);
+        });
+    }
+
+    /**
+     * Create a session message.
+     */
+    public void createSessionMessage() {
+        ServiceBusSenderClient sender = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .sender()
+            .queueName("<< QUEUE NAME >>")
+            .buildClient();
+
+        ServiceBusMessage message = new ServiceBusMessage("Hello world".getBytes())
+            .setSessionId("greetings");
+
+        sender.send(message);
+    }
+
+    /**
+     * Create session receiver for "greetings"
+     */
+    public void namedSessionReceiver() {
+        ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .sessionReceiver()
+            .queueName("<< QUEUE NAME >>")
+            .sessionId("greetings")
+            .buildAsyncClient();
+    }
+
+    /**
+     * Create session receiver for the first available session.
+     */
+    public void unnamedSessionReceiver() {
+        ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+            .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>")
+            .sessionReceiver()
+            .queueName("<< QUEUE NAME >>")
             .buildAsyncClient();
     }
 }
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java
index c120a5a08f27..a23782c0fafc 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMessageSyncSample.java
@@ -43,6 +43,8 @@ public static void main(String[] args) {
 
             System.out.println("Received Message Id: " + message.getMessageId());
             System.out.println("Received Message: " + new String(message.getBody()));
+
+            receiverClient.complete(message);
         });
 
         // Close the receiver.
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/MultiSessionReceiveAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java
similarity index 82%
rename from sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/MultiSessionReceiveAsyncSample.java
rename to sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java
index a868bcee7b9e..184805b6311e 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/MultiSessionReceiveAsyncSample.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java
@@ -9,18 +9,18 @@
 import reactor.core.publisher.Mono;
 
 import java.security.SecureRandom;
-import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Sample demonstrates how to receive and process multiple samples.
+ * Sample demonstrates how to receive and process multiple sessions. In the sample, at most 3 sessions are processed
+ * concurrently. When there are no more messages in a session, the receiver finds the next available session to
+ * process.
  */
-public class MultiSessionReceiveAsyncSample {
+public class ReceiveMultipleSessionsAsyncSample {
     private static final SecureRandom RANDOM = new SecureRandom();
 
     /**
-     * Main method to invoke this demo on how to receive from multiple sessions {@link ServiceBusReceivedMessage} from
-     * an Azure Service Bus Queue.
+     * Main method to invoke this demo on how to receive messages from multiple sessions in an Azure Service Bus Queue.
      *
      * @param args Unused arguments to the program.
      *
@@ -36,8 +36,8 @@ public static void main(String[] args) throws InterruptedException {
             + "SharedAccessKey={key}";
 
         // Create a receiver.
-        // "<<queue-name>>" will be the name of the Service Bus queue instance you created inside the Service Bus
-        // namespace.
+        // "<<queue-name>>" will be the name of the Service Bus session-enabled queue instance you created inside the
+        // Service Bus namespace.
         ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
             .connectionString(connectionString)
             .sessionReceiver()
@@ -46,12 +46,11 @@ public static void main(String[] args) throws InterruptedException {
             .queueName("<<queue-name>>")
             .buildAsyncClient();
 
-        // At most, the receiver will automatically renew the session lock until 120 seconds have elapsed.
         // By default, after messages are processed, they are completed (ie. removed from the queue/topic). Setting
-        // enableAutoComplete to true will tell the processor to complete or abandon the message depending
+        // enableAutoComplete to true will tell the processor to complete or abandon the message depending on whether or
+        // not processing the message results in an exception.
         ReceiveAsyncOptions options = new ReceiveAsyncOptions()
-            .setIsAutoCompleteEnabled(false)
-            .setMaxAutoLockRenewalDuration(Duration.ofSeconds(120));
+            .setIsAutoCompleteEnabled(false);
 
         Disposable subscription = receiver.receive(options)
             .flatMap(context -> {
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java
new file mode 100644
index 000000000000..6b33ecbd6f95
--- /dev/null
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.servicebus;
+
+import com.azure.messaging.servicebus.models.ReceiveMode;
+import reactor.core.Disposable;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Demonstrates how to receive messages from a named session.
+ */
+public class ReceiveNamedSessionAsyncSample {
+    /**
+     * Main method to invoke this demo on how to receive messages from a session with id "greetings" in an Azure Service
+     * Bus Queue.
+     *
+     * @param args Unused arguments to the program.
+     *
+     * @throws InterruptedException If the program is unable to sleep while waiting for the operations to complete.
+     */
+    public static void main(String[] args) throws InterruptedException {
+
+        // The connection string value can be obtained by:
+        // 1. Going to your Service Bus namespace in Azure Portal.
+        // 2. Go to "Shared access policies"
+        // 3. Copy the connection string for the "RootManageSharedAccessKey" policy.
+        String connectionString = "Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};"
+            + "SharedAccessKey={key}";
+
+        // Create a receiver.
+        // "<<queue-name>>" will be the name of the Service Bus session-enabled queue instance you created inside the
+        // Service Bus namespace.
+        ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+            .connectionString(connectionString)
+            .sessionReceiver()
+            .sessionId("greetings")
+            .receiveMode(ReceiveMode.PEEK_LOCK)
+            .queueName("<<queue-name>>")
+            .buildAsyncClient();
+
+        Disposable subscription = receiver.receive()
+            .subscribe(context -> {
+                if (context.hasError()) {
+                    System.out.printf("An error occurred in session %s. Error: %s%n",
+                        context.getSessionId(), context.getThrowable());
+                    return;
+                }
+
+                System.out.println("Processing message from session: " + context.getSessionId());
+
+                // Process message
+                // The message is automatically completed if no exceptions are thrown while processing message.
+            }, error -> {
+                    System.err.println("Error occurred: " + error);
+                });
+
+        // Subscribe is not a blocking call so we sleep here so the program does not end.
+        TimeUnit.SECONDS.sleep(60);
+
+        // Disposing of the subscription will cancel the receive() operation.
+        subscription.dispose();
+
+        // Close the receiver.
+        receiver.close();
+    }
+}
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java
new file mode 100644
index 000000000000..6b1ec92583d6
--- /dev/null
+++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.servicebus;
+
+import com.azure.messaging.servicebus.models.ReceiveMode;
+import reactor.core.Disposable;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Demonstrates how to receive from the first available session.
+ */
+public class ReceiveSingleSessionAsyncSample {
+    /**
+     * Main method to invoke this demo on how to receive messages from the first available session in a Service Bus
+     * topic subscription.
+     *
+     * @param args Unused arguments to the program.
+     *
+     * @throws InterruptedException If the program is unable to sleep while waiting for the operations to complete.
+     */
+    public static void main(String[] args) throws InterruptedException {
+        // The connection string value can be obtained by:
+        // 1. Going to your Service Bus namespace in Azure Portal.
+        // 2. Go to "Shared access policies"
+        // 3. Copy the connection string for the "RootManageSharedAccessKey" policy.
+        String connectionString = "Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};"
+            + "SharedAccessKey={key}";
+
+        // Create a receiver.
+        // "<<topic-name>>" will be the name of the Service Bus topic you created inside the Service Bus namespace.
+        // "<<subscription-name>>" will be the name of the session-enabled subscription.
+        ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder()
+            .connectionString(connectionString)
+            .sessionReceiver()
+            .receiveMode(ReceiveMode.PEEK_LOCK)
+            .topicName("<<topic-name>>")
+            .subscriptionName("<<subscription-name>>")
+            .buildAsyncClient();
+
+        // Messages are continuously received until there are no more messages in the current session. Then, the Flux
+        // completes.
+        Disposable subscription = receiver.receive()
+            .subscribe(context -> {
+                if (context.hasError()) {
+                    System.out.printf("An error occurred in session %s. Error: %s%n",
+                        context.getSessionId(), context.getThrowable());
+                    return;
+                }
+
+                System.out.println("Processing message from session: " + context.getSessionId());
+
+                // Process message
+                // The message is automatically completed if no exceptions are thrown while processing message.
+            }, error -> {
+                    System.err.println("Error occurred: " + error);
+                });
+
+        // Subscribe is not a blocking call so we sleep here so the program does not end.
+        TimeUnit.SECONDS.sleep(60);
+
+        // Disposing of the subscription will cancel the receive() operation.
+        subscription.dispose();
+
+        // Close the receiver.
+        receiver.close();
+    }
+}
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
index d8691cb6ebc3..e458b17cc77a 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusMessageProcessorTest.java
@@ -127,7 +127,7 @@ void autoCompletesAndAutoRenews() {
 
                 logger.info("Now: {}", Instant.now());
                 try {
-                    TimeUnit.SECONDS.sleep(8);
+                    TimeUnit.SECONDS.sleep(15);
                 } catch (InterruptedException ignored) {
                 }
                 logger.info("After: {}", Instant.now());
@@ -211,7 +211,7 @@ void autoRenewExpires() {
     @Test
     void autoRenewOperationErrors() {
         // Arrange
-        final Duration maxRenewDuration = Duration.ofSeconds(10);
+        final Duration maxRenewDuration = Duration.ofSeconds(20);
         final String lock1 = UUID.randomUUID().toString();
         final String lock2 = UUID.randomUUID().toString();
         when(message1.getLockToken()).thenReturn(lock1);
@@ -234,7 +234,7 @@ void autoRenewOperationErrors() {
 
                 logger.info("Now: {}", Instant.now());
                 try {
-                    TimeUnit.SECONDS.sleep(3);
+                    TimeUnit.SECONDS.sleep(10);
                 } catch (InterruptedException ignored) {
                 }
                 logger.info("After: {}", Instant.now());
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
index 5ea87289d080..52aa09adf4a8 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java
@@ -23,6 +23,7 @@
 import org.reactivestreams.Subscription;
 import reactor.core.Disposable;
 import reactor.core.publisher.DirectProcessor;
+import reactor.core.publisher.EmitterProcessor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.test.StepVerifier;
@@ -65,8 +66,8 @@ class ServiceBusReceiveLinkProcessorTest {
     private ArgumentCaptor<Supplier<Integer>> creditSupplierCaptor;
 
     private final AmqpErrorContext amqpErrorContext = new AmqpErrorContext("test-context");
-    private final DirectProcessor<AmqpEndpointState> endpointProcessor = DirectProcessor.create();
-    private final DirectProcessor<Message> messageProcessor = DirectProcessor.create();
+    private final EmitterProcessor<AmqpEndpointState> endpointProcessor = EmitterProcessor.create();
+    private final EmitterProcessor<Message> messageProcessor = EmitterProcessor.create();
     private final FluxSink<Message> messageProcessorSink = messageProcessor.sink(FluxSink.OverflowStrategy.BUFFER);
     private ServiceBusReceiveLinkProcessor linkProcessor;
 
@@ -288,7 +289,9 @@ void newLinkOnRetryableError() {
         final ServiceBusReceiveLinkProcessor processor = createSink(connections).subscribeWith(linkProcessor);
         final FluxSink<AmqpEndpointState> endpointSink = endpointProcessor.sink();
 
-        when(link2.getEndpointStates()).thenReturn(Flux.create(sink -> sink.next(AmqpEndpointState.ACTIVE)));
+        when(link2.getEndpointStates()).thenReturn(Flux.defer(() -> Flux.create(e -> {
+            e.next(AmqpEndpointState.ACTIVE);
+        })));
         when(link2.receive()).thenReturn(Flux.just(message2));
 
         final AmqpException amqpException = new AmqpException(true, AmqpErrorCondition.SERVER_BUSY_ERROR, "Test-error",
@@ -581,8 +584,8 @@ void receivesFromFirstLink() {
     }
 
     /**
-     * Verifies that when we request back pressure amounts, if it only requests a certain number of events, only
-     * that number is consumed.
+     * Verifies that when we request back pressure amounts, if it only requests a certain number of events, only that
+     * number is consumed.
      */
     @Test
     void backpressureRequestOnlyEmitsThatAmount() {
diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml
index a2032a72c0d9..0f9627249c51 100644
--- a/sdk/servicebus/tests.yml
+++ b/sdk/servicebus/tests.yml
@@ -10,4 +10,4 @@ jobs:
           safeName: azuremessagingservicebus
       EnvVars:
         AZURE_TEST_MODE: RECORD
-        AZURE_LOG_LEVEL: 3
+        AZURE_LOG_LEVEL: 2

From b5c17c65d6647d3c0bb988685d5cf81d5191d87f Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Thu, 7 May 2020 06:32:59 -0700
Subject: [PATCH 20/41] Sync eng/common directory with azure-sdk-tools
 repository (#10854)

---
 eng/common/TestResources/Remove-TestResources.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/TestResources/Remove-TestResources.ps1 b/eng/common/TestResources/Remove-TestResources.ps1
index 565803213096..6d89a967ec03 100644
--- a/eng/common/TestResources/Remove-TestResources.ps1
+++ b/eng/common/TestResources/Remove-TestResources.ps1
@@ -125,7 +125,7 @@ if (![string]::IsNullOrWhiteSpace($ServiceDirectory)) {
     if (Test-Path $preRemovalScript) {
         Log "Invoking pre resource removal script '$preRemovalScript'"
 
-        if ($PSCmdlet.ParameterSetName.StartsWith('ResourceGroup')) {
+        if (!$PSCmdlet.ParameterSetName.StartsWith('ResourceGroup')) {
             $PSBoundParameters.Add('ResourceGroupName', $ResourceGroupName);
         }
 

From 1485216c5d1105830a2a320083aaccd27209f983 Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Thu, 7 May 2020 09:37:54 -0700
Subject: [PATCH 21/41] Identity  Changelog + README update May 2020 (#10850)

---
 sdk/identity/azure-identity/CHANGELOG.md | 15 ++++++++++++++-
 sdk/identity/azure-identity/README.md    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index a562d876ee92..eea6c6807e72 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Release History
 
-## 1.1.0-beta.4 (Unreleased)
+## 1.1.0-beta.4 (2020-05-06)
+- Added `IntelliJCredential` support in `DefaultAzureCredential`.
+- Added `VsCodeCredential` support in `DefaultAzureCredential`.
+- Added support to disable specific credentials in `DefaultAzureCredential` authentication flow.
+- Added Shared Token cache support for MacOS Keychain, Gnome Keyring, and plain text for other Linux environments
+- Added option to write to shared token cache from `InteractiveBrowserCredential`, `AuthorizationCodeCredential`, `UsernamePasswordCredential`, and `DeviceCodeCredential`
 
+## 1.0.6 (2020-05-05)
+- Upgraded `azure-core` dependency to 1.5.0
+- Fix `MSIToken` expiry time parsing for Azure App Service platforms.
 
 ## 1.1.0-beta.3 (2020-04-07)
 - Added `KnownAuthorityHosts` to enable quick references to public azure authority hosts.
@@ -9,6 +17,8 @@
 - Added support for authority host to be read from `AZURE_AUTHORITY_HOST` environment variable.
 - Added support for `ClientCertificateCredential` and `UserNamePasswordCredential` in EnvironmentCredential.
 
+## 1.0.5 (2020-04-07)
+- Upgraded `azure-core` dependency to 1.4.0
 
 ## 1.1.0-beta.2 (2020-03-11)
 
@@ -20,6 +30,9 @@
 - Added `httpClient` set method in all the credential builders.
 - Updated `DefaultAzureCredential` to enable authenticating through the Azure CLI
 
+## 1.0.4 (2020-03-10)
+- Upgraded `azure-core` dependency to 1.0.4
+
 ## 1.1.0-beta.1 (2020-02-12)
 - All credential builders support setting a pipeline via `httpPipeline` method.
 - SharedTokenCacheCredentialBuilder supports setting the tenant id via `tenantId` method.
diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md
index 25739170e326..8d366f4d996f 100644
--- a/sdk/identity/azure-identity/README.md
+++ b/sdk/identity/azure-identity/README.md
@@ -45,7 +45,7 @@ Maven dependency for Azure Secret Client library. Add it to your project's pom f
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

From 3742ebfbcefbabbbd3c08b5cf15a440ff57b06f9 Mon Sep 17 00:00:00 2001
From: Kushagra Thapar <kuthapar@microsoft.com>
Date: Thu, 7 May 2020 10:14:55 -0700
Subject: [PATCH 22/41] Added content response on write enabled feature to
 Gateway and Direct TCP (#10741)

* Added return minimal response feature to Gateway and Direct TCP for item write operations

* Updated name to noContentResponseOnWrite.
Updated cosmos container and database tests to emulator groups.
Removed prefer header generic logic

* Finalized name and updated documentation regarding RU usage

* Fixed benchmark configurations, internal TestSuiteBase async document clients with content response on write flag

* Fixed more tests by enabling content on response. Updated names of tests to reflect correct value

* Fixed negation check of content response flag on write throughput and write latency

* Fixed more tests client builders with content response on write disabled
---
 .../AsynReadWithMultipleClients.java          |   1 +
 .../cosmos/benchmark/AsyncBenchmark.java      |   1 +
 .../azure/cosmos/benchmark/Configuration.java |   7 +
 .../java/com/azure/cosmos/benchmark/Main.java |  15 ++
 .../azure/cosmos/benchmark/SyncBenchmark.java |   1 +
 .../com/azure/cosmos/benchmark/Utils.java     |   7 +-
 .../ChangeFeed/SampleChangeFeedProcessor.java |   1 +
 .../samples/MultiMasterScenario.java          |   4 +-
 .../examples/CollectionCRUDAsyncAPITest.java  |   3 +-
 .../cosmos/rx/examples/ConflictAPITest.java   |   3 +-
 .../CosmosAuthorizationTokenResolverTest.java |   6 +-
 .../rx/examples/DatabaseCRUDAsyncAPITest.java |   3 +-
 .../rx/examples/DocumentCRUDAsyncAPITest.java |   3 +-
 .../examples/DocumentQueryAsyncAPITest.java   |   3 +-
 .../rx/examples/InMemoryGroupbyTest.java      |   3 +-
 .../rx/examples/OfferCRUDAsyncAPITest.java    |   3 +-
 .../examples/StoredProcedureAsyncAPITest.java |   3 +-
 .../rx/examples/UniqueIndexAsyncAPITest.java  |   3 +-
 .../com/azure/cosmos/rx/examples/Utils.java   |   2 +-
 .../com/azure/cosmos/CosmosAsyncClient.java   |  19 +++
 .../azure/cosmos/CosmosBridgeInternal.java    |   5 +-
 .../com/azure/cosmos/CosmosClientBuilder.java |  36 ++++
 .../implementation/AsyncDocumentClient.java   |  25 ++-
 .../cosmos/implementation/HttpConstants.java  |   3 +-
 .../implementation/ResourceResponse.java      |  11 ++
 .../implementation/RxDocumentClientImpl.java  |  94 ++++++-----
 .../RxDocumentServiceRequest.java             |  13 --
 .../HttpTransportClient.java                  |   2 +-
 .../rntbd/RntbdConstants.java                 |   3 +-
 .../rntbd/RntbdRequestHeaders.java            |  14 +-
 .../models/CosmosAsyncItemResponse.java       |  11 ++
 .../cosmos/models/CosmosItemResponse.java     |  10 ++
 .../azure/cosmos/ClientUnderTestBuilder.java  |   4 +-
 ...osContainerContentResponseOnWriteTest.java | 126 ++++++++++++++
 ...mosDatabaseContentResponseOnWriteTest.java |  84 ++++++++++
 .../CosmosItemContentResponseOnWriteTest.java | 155 ++++++++++++++++++
 .../cosmos/CosmosResponseDiagnosticsTest.java |   4 +-
 .../implementation/ConsistencyTests1.java     |  35 ++--
 .../implementation/ConsistencyTests2.java     |  14 +-
 .../implementation/ConsistencyTestsBase.java  |  30 ++--
 .../implementation/RetryThrottleTest.java     |   3 +-
 .../RxDocumentClientUnderTest.java            |   5 +-
 .../RxDocumentServiceRequestTest.java         |  18 --
 .../implementation/SpyClientBuilder.java      |  35 ++--
 .../SpyClientUnderTestFactory.java            |  30 ++--
 .../cosmos/implementation/TestSuiteBase.java  |  57 ++++---
 .../DCDocumentCrudTest.java                   |   1 +
 .../azure/cosmos/rx/AggregateQueryTests.java  |   2 -
 .../CosmosAuthorizationTokenResolverTest.java |   6 +
 .../com/azure/cosmos/rx/DocumentCrudTest.java |   6 -
 .../cosmos/rx/OrderbyDocumentQueryTest.java   |   2 -
 .../cosmos/rx/ParallelDocumentQueryTest.java  |   2 -
 .../com/azure/cosmos/rx/ProxyHostTest.java    |   8 +-
 .../cosmos/rx/ReadFeedDocumentsTest.java      |   2 -
 .../SinglePartitionReadFeedDocumentsTest.java |   2 -
 .../com/azure/cosmos/rx/TestSuiteBase.java    |  95 +++++++----
 .../com/azure/cosmos/rx/UniqueIndexTest.java  |   5 +-
 .../UserDefinedFunctionUpsertReplaceTest.java |   2 -
 .../cosmos/rx/VeryLargeDocumentQueryTest.java |   5 -
 59 files changed, 790 insertions(+), 266 deletions(-)
 create mode 100644 sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerContentResponseOnWriteTest.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseContentResponseOnWriteTest.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java

diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java
index b7d1250c6cfa..dd9c0ad47baf 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java
@@ -226,6 +226,7 @@ private void createClients() {
                         .connectionPolicy(configuration.getConnectionPolicy())
                         .consistencyLevel(configuration.getConsistencyLevel())
                         .connectionReuseAcrossClientsEnabled(true)
+                        .contentResponseOnWriteEnabled(Boolean.parseBoolean(configuration.isContentResponseOnWriteEnabled()))
                         .buildAsyncClient();
                     List<PojoizedJson> docsToRead = new ArrayList<>();
                     CosmosAsyncDatabase cosmosAsyncDatabase = null;
diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java
index b1530abb1a30..7324fcfcf5e1 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java
@@ -66,6 +66,7 @@ abstract class AsyncBenchmark<T> {
             .key(cfg.getMasterKey())
             .connectionPolicy(cfg.getConnectionPolicy())
             .consistencyLevel(cfg.getConsistencyLevel())
+            .contentResponseOnWriteEnabled(Boolean.parseBoolean(cfg.isContentResponseOnWriteEnabled()))
             .buildAsyncClient();
         configuration = cfg;
         logger = LoggerFactory.getLogger(this.getClass());
diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java
index 377e3c5f18c9..9a7d35eabbb4 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java
@@ -130,6 +130,9 @@ public Duration convert(String value) {
     @Parameter(names = "-useSync", description = "Uses Sync API")
     private boolean useSync = false;
 
+    @Parameter(names = "-contentResponseOnWriteEnabled", description = "if set to false, does not returns content response on document write operations")
+    private String contentResponseOnWriteEnabled = String.valueOf(true);
+
     @Parameter(names = {"-h", "-help", "--help"}, description = "Help", help = true)
     private boolean help = false;
 
@@ -264,6 +267,10 @@ ConsistencyLevel getConsistencyLevel() {
         return consistencyLevel;
     }
 
+    String isContentResponseOnWriteEnabled() {
+        return contentResponseOnWriteEnabled;
+    }
+
     String getDatabaseId() {
         return databaseId;
     }
diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java
index 26c7fdd3c285..d2b4295a8d74 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java
@@ -27,6 +27,8 @@ public static void main(String[] args) throws Exception {
                 return;
             }
 
+            validateConfiguration(cfg);
+
             if (cfg.isSync()) {
                 syncBenchmark(cfg);
             } else {
@@ -44,6 +46,19 @@ public static void main(String[] args) throws Exception {
         }
     }
 
+    private static void validateConfiguration(Configuration cfg) {
+        switch (cfg.getOperationType()) {
+            case WriteLatency:
+            case WriteThroughput:
+                break;
+            default:
+                if (!Boolean.parseBoolean(cfg.isContentResponseOnWriteEnabled())) {
+                    throw new IllegalArgumentException("contentResponseOnWriteEnabled parameter can only be set to false " +
+                        "for write latency and write throughput operations");
+                }
+        }
+    }
+
     private static void syncBenchmark(Configuration cfg) throws Exception {
         LOGGER.info("Sync benchmark ...");
         SyncBenchmark benchmark = null;
diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java
index e27f7939db8f..ddd4420301cd 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java
@@ -105,6 +105,7 @@ public T apply(T o, Throwable throwable) {
             .key(cfg.getMasterKey())
             .connectionPolicy(cfg.getConnectionPolicy())
             .consistencyLevel(cfg.getConsistencyLevel())
+            .contentResponseOnWriteEnabled(Boolean.parseBoolean(cfg.isContentResponseOnWriteEnabled()))
             .buildClient();
 
         try {
diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java
index bdbca32cdbed..e55098ca9480 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java
+++ b/sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java
@@ -26,9 +26,10 @@ public static AsyncDocumentClient housekeepingClient() {
         options.setMaxRetryWaitTime(Duration.ofSeconds(60));
         connectionPolicy.setThrottlingRetryOptions(options);
         return new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
-                .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
-                .withConnectionPolicy(connectionPolicy)
-                .build();
+                                                .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+                                                .withConnectionPolicy(connectionPolicy)
+                                                .withContentResponseOnWriteEnabled(true)
+                                                .build();
     }
 
     public static String getCollectionLink(Database db, DocumentCollection collection) {
diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
index 3200aba9020a..439f510ed9f7 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
@@ -121,6 +121,7 @@ public static CosmosAsyncClient getCosmosClient() {
                 .key(SampleConfigurations.MASTER_KEY)
                 .connectionPolicy(ConnectionPolicy.getDefaultPolicy())
                 .consistencyLevel(ConsistencyLevel.EVENTUAL)
+                .contentResponseOnWriteEnabled(true)
                 .buildAsyncClient();
     }
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java
index a6707b2e8391..5b15fbd2a274 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java
@@ -59,7 +59,9 @@ public MultiMasterScenario() {
                             .withMasterKeyOrResourceToken(this.accountKey)
                             .withServiceEndpoint(this.accountEndpoint)
                             .withConsistencyLevel(ConsistencyLevel.EVENTUAL)
-                            .withConnectionPolicy(policy).build();
+                            .withConnectionPolicy(policy)
+                            .withContentResponseOnWriteEnabled(true)
+                            .build();
 
 
             workers.add(new Worker(client, databaseName, basicCollectionName));
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
index 6e572f6febe4..04a10a6d4fff 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
@@ -81,7 +81,8 @@ public void before_CollectionCRUDAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java
index 9c6d26038223..3271607d60ef 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/ConflictAPITest.java
@@ -59,7 +59,8 @@ public void before_ConflictAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CosmosAuthorizationTokenResolverTest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CosmosAuthorizationTokenResolverTest.java
index bc051fe7596a..380a27b0dd2a 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CosmosAuthorizationTokenResolverTest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/CosmosAuthorizationTokenResolverTest.java
@@ -69,7 +69,8 @@ public void before_TokenResolverTest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
@@ -145,6 +146,7 @@ public void readDocumentThroughTokenResolver() throws Exception {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withTokenResolver(getTokenResolverForRead())
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             List<ResourceResponse<Document>> capturedResponse = Collections
                     .synchronizedList(new ArrayList<>());
@@ -183,6 +185,7 @@ public void deleteDocumentThroughTokenResolver() throws Exception {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withTokenResolver(getTokenResolverForReadWrite())
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             List<ResourceResponse<Document>> capturedResponse = Collections
                     .synchronizedList(new ArrayList<>());
@@ -225,6 +228,7 @@ public void blockListUserThroughTokenResolver() throws Exception {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withTokenResolver(getTokenResolverWithBlockList(blockListedUserId, errorMessage))
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
 
             // READ a document using a block listed user, passing the 'userId' in the item.
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java
index 62da255a422d..5e76d3df1931 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java
@@ -65,7 +65,8 @@ public void before_DatabaseCRUDAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
     }
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java
index 4db2b93f169e..04cca82d59e1 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java
@@ -89,7 +89,8 @@ public void before_DocumentCRUDAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java
index b32b68fb54f1..5c9d999137f2 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/DocumentQueryAsyncAPITest.java
@@ -85,7 +85,8 @@ public void before_DocumentQueryAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java
index c24d34f7d5d3..b6a2008bb378 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/InMemoryGroupbyTest.java
@@ -46,7 +46,8 @@ public void before_InMemoryGroupbyTest() throws Exception {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java
index e19ed9deba1a..1cea3438e29b 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/OfferCRUDAsyncAPITest.java
@@ -50,7 +50,8 @@ public void before_OfferCRUDAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java
index 5af4fe79426d..a02fa03358aa 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/StoredProcedureAsyncAPITest.java
@@ -56,7 +56,8 @@ public void before_StoredProcedureAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java
index f4c0f9bd4d75..924561d43a40 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/UniqueIndexAsyncAPITest.java
@@ -91,7 +91,8 @@ public void before_UniqueIndexAsyncAPITest() {
             .withServiceEndpoint(TestConfigurations.HOST)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
             .withConnectionPolicy(connectionPolicy)
-            .withConsistencyLevel(ConsistencyLevel.SESSION);
+            .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true);
 
         this.client = this.clientBuilder().build();
 
diff --git a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java
index eeec67601ac5..1972f39c53a4 100644
--- a/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java
+++ b/sdk/cosmos/azure-cosmos-examples/src/test/java/com/azure/cosmos/rx/examples/Utils.java
@@ -28,7 +28,7 @@ public void cleanupStaleDatabase() {
         connectionPolicy.setThrottlingRetryOptions(options);
         AsyncDocumentClient client = new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
-                .withConnectionPolicy(connectionPolicy)
+                .withConnectionPolicy(connectionPolicy).withContentResponseOnWriteEnabled(true)
                 .build();
         safeCleanDatabases(client);
         client.close();
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
index e30ff232cd61..2e2aaf51d213 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
@@ -49,6 +49,7 @@ public final class CosmosAsyncClient implements Closeable {
     private final CosmosKeyCredential cosmosKeyCredential;
     private final boolean sessionCapturingOverride;
     private final boolean enableTransportClientSharing;
+    private final boolean contentResponseOnWriteEnabled;
 
     CosmosAsyncClient(CosmosClientBuilder builder) {
         this.configs = builder.configs();
@@ -61,6 +62,7 @@ public final class CosmosAsyncClient implements Closeable {
         this.cosmosKeyCredential = builder.getKeyCredential();
         this.sessionCapturingOverride = builder.isSessionCapturingOverrideEnabled();
         this.enableTransportClientSharing = builder.isConnectionReuseAcrossClientsEnabled();
+        this.contentResponseOnWriteEnabled = builder.isContentResponseOnWriteEnabled();
         this.asyncDocumentClient = new AsyncDocumentClient.Builder()
                                        .withServiceEndpoint(this.serviceEndpoint)
                                        .withMasterKeyOrResourceToken(this.keyOrResourceToken)
@@ -71,6 +73,7 @@ public final class CosmosAsyncClient implements Closeable {
                                        .withTokenResolver(this.cosmosAuthorizationTokenResolver)
                                        .withCosmosKeyCredential(this.cosmosKeyCredential)
                                        .withTransportClientSharing(this.enableTransportClientSharing)
+                                       .withContentResponseOnWriteEnabled(this.contentResponseOnWriteEnabled)
                                        .build();
     }
 
@@ -163,6 +166,22 @@ CosmosKeyCredential cosmosKeyCredential() {
         return cosmosKeyCredential;
     }
 
+    /**
+     * Gets the boolean which indicates whether to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
+     *
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it
+     * on the client.
+     *
+     * By-default, this is false.
+     *
+     * @return a boolean indicating whether resource will be included in the response or not
+     */
+    boolean isContentResponseOnWriteEnabled() {
+        return contentResponseOnWriteEnabled;
+    }
+
     /**
      * CREATE a Database if it does not already exist on the service
      * <p>
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java
index 937a452ddc83..932e3fc69e32 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosBridgeInternal.java
@@ -4,8 +4,6 @@
 package com.azure.cosmos;
 
 import com.azure.cosmos.implementation.AsyncDocumentClient;
-import com.azure.cosmos.implementation.DocumentCollection;
-import com.azure.cosmos.models.CosmosContainerProperties;
 
 /**
  * DO NOT USE. For internal use only by the SDK. These methods might break at any time. No support will be provided.
@@ -66,7 +64,8 @@ public static CosmosClientBuilder cloneCosmosClientBuilder(CosmosClientBuilder b
             .keyCredential(builder.getKeyCredential())
             .permissions(builder.getPermissions())
             .authorizationTokenResolver(builder.getAuthorizationTokenResolver())
-            .resourceToken(builder.getResourceToken());
+            .resourceToken(builder.getResourceToken())
+            .contentResponseOnWriteEnabled(builder.isContentResponseOnWriteEnabled());
 
         return copy;
     }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java
index fa42fcdda5df..0435020dc3e8 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java
@@ -39,6 +39,7 @@ public class CosmosClientBuilder {
     private CosmosKeyCredential cosmosKeyCredential;
     private boolean sessionCapturingOverrideEnabled;
     private boolean connectionReuseAcrossClientsEnabled;
+    private boolean contentResponseOnWriteEnabled;
 
     /**
      * Instantiates a new Cosmos client builder.
@@ -291,6 +292,41 @@ public CosmosClientBuilder keyCredential(CosmosKeyCredential cosmosKeyCredential
         return this;
     }
 
+    /**
+     * Gets the boolean which indicates whether to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
+     *
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it
+     * on the client.
+     *
+     * By-default, this is false.
+     *
+     * @return a boolean indicating whether resource will be included in the response or not
+     */
+    boolean isContentResponseOnWriteEnabled() {
+        return contentResponseOnWriteEnabled;
+    }
+
+    /**
+     * Sets the boolean to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
+     *
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it on the client.
+     *
+     * This feature does not impact RU usage for read or write operations.
+     *
+     * By-default, this is false.
+     *
+     * @param contentResponseOnWriteEnabled a boolean indicating whether resource will be included in the response or not
+     * @return current cosmosClientBuilder
+     */
+    public CosmosClientBuilder contentResponseOnWriteEnabled(boolean contentResponseOnWriteEnabled) {
+        this.contentResponseOnWriteEnabled = contentResponseOnWriteEnabled;
+        return this;
+    }
+
     /**
      * Builds a cosmos configuration object with the provided properties
      *
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/AsyncDocumentClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/AsyncDocumentClient.java
index 3bcec8266202..f0751fba79f1 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/AsyncDocumentClient.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/AsyncDocumentClient.java
@@ -77,6 +77,7 @@ class Builder {
         CosmosKeyCredential cosmosKeyCredential;
         boolean sessionCapturingOverride;
         boolean transportClientSharing;
+        boolean contentResponseOnWriteEnabled;
 
         public Builder withServiceEndpoint(String serviceEndpoint) {
             try {
@@ -158,6 +159,11 @@ public Builder withCosmosKeyCredential(CosmosKeyCredential cosmosKeyCredential)
             return this;
         }
 
+        public Builder withContentResponseOnWriteEnabled(boolean contentResponseOnWriteEnabled) {
+            this.contentResponseOnWriteEnabled = contentResponseOnWriteEnabled;
+            return this;
+        }
+
         /**
          * This method will accept functional interface TokenResolver which helps in generation authorization
          * token per request. AsyncDocumentClient can be successfully initialized with this API without passing any MasterKey, ResourceToken or PermissionFeed.
@@ -187,15 +193,16 @@ public AsyncDocumentClient build() {
                 "cannot buildAsyncClient client without key credential");
 
             RxDocumentClientImpl client = new RxDocumentClientImpl(serviceEndpoint,
-                                                                   masterKeyOrResourceToken,
-                                                                   permissionFeed,
-                                                                   connectionPolicy,
-                                                                   desiredConsistencyLevel,
-                                                                   configs,
-                                                                   cosmosAuthorizationTokenResolver,
-                                                                   cosmosKeyCredential,
-                                                                   sessionCapturingOverride,
-                                                                   transportClientSharing);
+                masterKeyOrResourceToken,
+                permissionFeed,
+                connectionPolicy,
+                desiredConsistencyLevel,
+                configs,
+                cosmosAuthorizationTokenResolver,
+                cosmosKeyCredential,
+                sessionCapturingOverride,
+                transportClientSharing,
+                contentResponseOnWriteEnabled);
             client.init();
             return client;
         }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
index 6b85e9cfc80d..b6ba29c7f982 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
@@ -306,6 +306,7 @@ public static class SubStatusCodes {
     }
 
     public static class HeaderValues {
-        public static final String NoCache = "no-cache";
+        public static final String NO_CACHE = "no-cache";
+        public static final String PREFER_RETURN_MINIMAL = "return=minimal";
     }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ResourceResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ResourceResponse.java
index ba1453d4017c..a20fa6aeae7b 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ResourceResponse.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ResourceResponse.java
@@ -358,6 +358,17 @@ public String getCosmosResponseDiagnosticString() {
         return cosmosResponseRequestDiagnosticStatistics.toString();
     }
 
+    /**
+     * Gets the ETag from the response headers.
+     *
+     * Null in case of delete operation.
+     *
+     * @return ETag
+     */
+    public String getETag() {
+        return this.response.getResponseHeaders().get(HttpConstants.HttpHeaders.E_TAG);
+    }
+
     long getCurrentQuotaHeader(String headerName) {
         if (this.usageHeaders.size() == 0 &&
                 !StringUtils.isEmpty(this.getMaxResourceQuota()) &&
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
index 9f3f52ffffbe..93c44e39cc1d 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
@@ -77,6 +77,8 @@
  * This is meant to be internally used only by our sdk.
  */
 public class RxDocumentClientImpl implements AsyncDocumentClient, IAuthorizationTokenProvider {
+
+    private static final char PREFER_HEADER_SEPERATOR = ';';
     private final static ObjectMapper mapper = Utils.getSimpleObjectMapper();
     private final Logger logger = LoggerFactory.getLogger(RxDocumentClientImpl.class);
     private final String masterKeyOrResourceToken;
@@ -98,6 +100,7 @@ public class RxDocumentClientImpl implements AsyncDocumentClient, IAuthorization
     private GlobalAddressResolver addressResolver;
     private RxPartitionKeyRangeCache partitionKeyRangeCache;
     private Map<String, List<PartitionKeyAndResourceTokenPair>> resourceTokensMap;
+    private final boolean contentResponseOnWriteEnabled;
 
     // RetryPolicy retries a request when it encounters session unavailable (see ClientRetryPolicy).
     // Once it exhausts all write regions it clears the session container, then it uses RxClientCollectionCache
@@ -131,8 +134,10 @@ public RxDocumentClientImpl(URI serviceEndpoint,
                                 CosmosAuthorizationTokenResolver cosmosAuthorizationTokenResolver,
                                 CosmosKeyCredential cosmosKeyCredential,
                                 boolean sessionCapturingOverride,
-                                boolean connectionSharingAcrossClientsEnabled) {
-        this(serviceEndpoint, masterKeyOrResourceToken, permissionFeed, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, sessionCapturingOverride, connectionSharingAcrossClientsEnabled);
+                                boolean connectionSharingAcrossClientsEnabled,
+                                boolean contentResponseOnWriteEnabled) {
+        this(serviceEndpoint, masterKeyOrResourceToken, permissionFeed, connectionPolicy, consistencyLevel, configs,
+            cosmosKeyCredential, sessionCapturingOverride, connectionSharingAcrossClientsEnabled, contentResponseOnWriteEnabled);
         this.cosmosAuthorizationTokenResolver = cosmosAuthorizationTokenResolver;
     }
 
@@ -144,8 +149,10 @@ private RxDocumentClientImpl(URI serviceEndpoint,
                                 Configs configs,
                                 CosmosKeyCredential cosmosKeyCredential,
                                 boolean sessionCapturingOverrideEnabled,
-                                boolean connectionSharingAcrossClientsEnabled) {
-        this(serviceEndpoint, masterKeyOrResourceToken, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, sessionCapturingOverrideEnabled, connectionSharingAcrossClientsEnabled);
+                                boolean connectionSharingAcrossClientsEnabled,
+                                boolean contentResponseOnWriteEnabled) {
+        this(serviceEndpoint, masterKeyOrResourceToken, connectionPolicy, consistencyLevel, configs,
+            cosmosKeyCredential, sessionCapturingOverrideEnabled, connectionSharingAcrossClientsEnabled, contentResponseOnWriteEnabled);
         if (permissionFeed != null && permissionFeed.size() > 0) {
             this.resourceTokensMap = new HashMap<>();
             for (Permission permission : permissionFeed) {
@@ -195,7 +202,8 @@ private RxDocumentClientImpl(URI serviceEndpoint,
                          Configs configs,
                          CosmosKeyCredential cosmosKeyCredential,
                          boolean sessionCapturingOverrideEnabled,
-                         boolean connectionSharingAcrossClientsEnabled) {
+                         boolean connectionSharingAcrossClientsEnabled,
+                         boolean contentResponseOnWriteEnabled) {
 
         logger.info(
             "Initializing DocumentClient with"
@@ -207,6 +215,7 @@ private RxDocumentClientImpl(URI serviceEndpoint,
         this.masterKeyOrResourceToken = masterKeyOrResourceToken;
         this.serviceEndpoint = serviceEndpoint;
         this.cosmosKeyCredential = cosmosKeyCredential;
+        this.contentResponseOnWriteEnabled = contentResponseOnWriteEnabled;
 
         if (this.cosmosKeyCredential != null) {
             hasAuthKeyResourceToken = false;
@@ -416,7 +425,7 @@ private Mono<ResourceResponse<Database>> createDatabaseInternal(Database databas
             logger.debug("Creating a Database. id: [{}]", database.getId());
             validateResource(database);
 
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Database, OperationType.Create);
             ZonedDateTime serializationStartTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
             ByteBuffer byteBuffer = ModelBridgeInternal.serializeJsonToByteBuffer(database);
             ZonedDateTime serializationEndTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
@@ -458,7 +467,7 @@ private Mono<ResourceResponse<Database>> deleteDatabaseInternal(String databaseL
 
             logger.debug("Deleting a Database. databaseLink: [{}]", databaseLink);
             String path = Utils.joinPath(databaseLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Database, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                 ResourceType.Database, path, requestHeaders, options);
 
@@ -487,7 +496,7 @@ private Mono<ResourceResponse<Database>> readDatabaseInternal(String databaseLin
 
             logger.debug("Reading a Database. databaseLink: [{}]", databaseLink);
             String path = Utils.joinPath(databaseLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Database, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                 ResourceType.Database, path, requestHeaders, options);
 
@@ -593,7 +602,7 @@ private Mono<ResourceResponse<DocumentCollection>> createCollectionInternal(Stri
             validateResource(collection);
 
             String path = Utils.joinPath(databaseLink, Paths.COLLECTIONS_PATH_SEGMENT);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.DocumentCollection, OperationType.Create);
 
             ZonedDateTime serializationStartTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
             ByteBuffer byteBuffer = ModelBridgeInternal.serializeJsonToByteBuffer(collection);
@@ -645,7 +654,7 @@ private Mono<ResourceResponse<DocumentCollection>> replaceCollectionInternal(Doc
             validateResource(collection);
 
             String path = Utils.joinPath(collection.getSelfLink(), null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.DocumentCollection, OperationType.Replace);
             ZonedDateTime serializationStartTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
             ByteBuffer byteBuffer = ModelBridgeInternal.serializeJsonToByteBuffer(collection);
             ZonedDateTime serializationEndTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
@@ -699,7 +708,7 @@ private Mono<ResourceResponse<DocumentCollection>> deleteCollectionInternal(Stri
 
             logger.debug("Deleting a Collection. collectionLink: [{}]", collectionLink);
             String path = Utils.joinPath(collectionLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.DocumentCollection, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                 ResourceType.DocumentCollection, path, requestHeaders, options);
 
@@ -771,7 +780,7 @@ private Mono<ResourceResponse<DocumentCollection>> readCollectionInternal(String
 
             logger.debug("Reading a Collection. collectionLink: [{}]", collectionLink);
             String path = Utils.joinPath(collectionLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.DocumentCollection, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                 ResourceType.DocumentCollection, path, requestHeaders, options);
 
@@ -843,7 +852,7 @@ private static void validateResource(Resource resource) {
         }
     }
 
-    private Map<String, String> getRequestHeaders(RequestOptions options) {
+    private Map<String, String> getRequestHeaders(RequestOptions options, ResourceType resourceType, OperationType operationType) {
         Map<String, String> headers = new HashMap<>();
 
         if (this.useMultipleWriteLocations) {
@@ -854,6 +863,11 @@ private Map<String, String> getRequestHeaders(RequestOptions options) {
             headers.put(HttpConstants.HttpHeaders.CONSISTENCY_LEVEL, consistencyLevel.toString());
         }
 
+        //  If content response on write is not enabled, and operation is document write - then add minimal prefer header
+        if (resourceType.equals(ResourceType.Document) && operationType.isWriteOperation() && !this.contentResponseOnWriteEnabled) {
+            headers.put(HttpConstants.HttpHeaders.PREFER, HttpConstants.HeaderValues.PREFER_RETURN_MINIMAL);
+        }
+
         if (options == null) {
             return headers;
         }
@@ -1031,7 +1045,7 @@ private Mono<RxDocumentServiceRequest> getCreateDocumentRequest(DocumentClientRe
             SerializationDiagnosticsContext.SerializationType.ITEM_SERIALIZATION);
 
         String path = Utils.joinPath(documentCollectionLink, Paths.DOCUMENTS_PATH_SEGMENT);
-        Map<String, String> requestHeaders = this.getRequestHeaders(options);
+        Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Document, operationType);
 
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType, ResourceType.Document, path,
                                                                            requestHeaders, options, content);
@@ -1292,7 +1306,7 @@ private Mono<ResourceResponse<Document>> replaceDocumentInternal(String document
 
         logger.debug("Replacing a Document. documentLink: [{}]", documentLink);
         final String path = Utils.joinPath(documentLink, null);
-        final Map<String, String> requestHeaders = getRequestHeaders(options);
+        final Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Document, OperationType.Replace);
         ZonedDateTime serializationStartTimeUTC = ZonedDateTime.now(ZoneOffset.UTC);
         ByteBuffer content = serializeJsonToByteBuffer(document);
         ZonedDateTime serializationEndTime = ZonedDateTime.now(ZoneOffset.UTC);
@@ -1335,7 +1349,7 @@ private Mono<ResourceResponse<Document>> deleteDocumentInternal(String documentL
 
             logger.debug("Deleting a Document. documentLink: [{}]", documentLink);
             String path = Utils.joinPath(documentLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Document, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                 ResourceType.Document, path, requestHeaders, options);
             if (retryPolicyInstance != null) {
@@ -1371,7 +1385,7 @@ private Mono<ResourceResponse<Document>> readDocumentInternal(String documentLin
 
             logger.debug("Reading a Document. documentLink: [{}]", documentLink);
             String path = Utils.joinPath(documentLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.Document, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                 ResourceType.Document, path, requestHeaders, options);
             if (retryPolicyInstance != null) {
@@ -1736,7 +1750,7 @@ private RxDocumentServiceRequest getStoredProcedureRequest(String collectionLink
         validateResource(storedProcedure);
 
         String path = Utils.joinPath(collectionLink, Paths.STORED_PROCEDURES_PATH_SEGMENT);
-        Map<String, String> requestHeaders = this.getRequestHeaders(options);
+        Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.StoredProcedure, operationType);
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType, ResourceType.StoredProcedure,
                 path, storedProcedure, requestHeaders, options);
 
@@ -1755,7 +1769,7 @@ private RxDocumentServiceRequest getUserDefinedFunctionRequest(String collection
         validateResource(udf);
 
         String path = Utils.joinPath(collectionLink, Paths.USER_DEFINED_FUNCTIONS_PATH_SEGMENT);
-        Map<String, String> requestHeaders = this.getRequestHeaders(options);
+        Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.UserDefinedFunction, operationType);
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType,
                 ResourceType.UserDefinedFunction, path, udf, requestHeaders, options);
 
@@ -1845,7 +1859,7 @@ private Mono<ResourceResponse<StoredProcedure>> replaceStoredProcedureInternal(S
             RxDocumentClientImpl.validateResource(storedProcedure);
 
             String path = Utils.joinPath(storedProcedure.getSelfLink(), null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.StoredProcedure, OperationType.Replace);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Replace,
                     ResourceType.StoredProcedure, path, storedProcedure, requestHeaders, options);
 
@@ -1882,7 +1896,7 @@ private Mono<ResourceResponse<StoredProcedure>> deleteStoredProcedureInternal(St
 
             logger.debug("Deleting a StoredProcedure. storedProcedureLink [{}]", storedProcedureLink);
             String path = Utils.joinPath(storedProcedureLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.StoredProcedure, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.StoredProcedure, path, requestHeaders, options);
 
@@ -1921,7 +1935,7 @@ private Mono<ResourceResponse<StoredProcedure>> readStoredProcedureInternal(Stri
 
             logger.debug("Reading a StoredProcedure. storedProcedureLink [{}]", storedProcedureLink);
             String path = Utils.joinPath(storedProcedureLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.StoredProcedure, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.StoredProcedure, path, requestHeaders, options);
 
@@ -1982,7 +1996,7 @@ private Mono<StoredProcedureResponse> executeStoredProcedureInternal(String stor
             logger.debug("Executing a StoredProcedure. storedProcedureLink [{}]", storedProcedureLink);
             String path = Utils.joinPath(storedProcedureLink, null);
 
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.StoredProcedure, OperationType.ExecuteJavaScript);
             requestHeaders.put(HttpConstants.HttpHeaders.ACCEPT, RuntimeConstants.MediaTypes.JSON);
 
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.ExecuteJavaScript,
@@ -2069,7 +2083,7 @@ private RxDocumentServiceRequest getTriggerRequest(String collectionLink, Trigge
         RxDocumentClientImpl.validateResource(trigger);
 
         String path = Utils.joinPath(collectionLink, Paths.TRIGGERS_PATH_SEGMENT);
-        Map<String, String> requestHeaders = getRequestHeaders(options);
+        Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Trigger, operationType);
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType, ResourceType.Trigger, path,
                 trigger, requestHeaders, options);
 
@@ -2094,7 +2108,7 @@ private Mono<ResourceResponse<Trigger>> replaceTriggerInternal(Trigger trigger,
             RxDocumentClientImpl.validateResource(trigger);
 
             String path = Utils.joinPath(trigger.getSelfLink(), null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Trigger, OperationType.Replace);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Replace,
                     ResourceType.Trigger, path, trigger, requestHeaders, options);
 
@@ -2124,7 +2138,7 @@ private Mono<ResourceResponse<Trigger>> deleteTriggerInternal(String triggerLink
 
             logger.debug("Deleting a Trigger. triggerLink [{}]", triggerLink);
             String path = Utils.joinPath(triggerLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Trigger, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.Trigger, path, requestHeaders, options);
 
@@ -2155,7 +2169,7 @@ private Mono<ResourceResponse<Trigger>> readTriggerInternal(String triggerLink,
 
             logger.debug("Reading a Trigger. triggerLink [{}]", triggerLink);
             String path = Utils.joinPath(triggerLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Trigger, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.Trigger, path, requestHeaders, options);
 
@@ -2278,7 +2292,7 @@ private Mono<ResourceResponse<UserDefinedFunction>> replaceUserDefinedFunctionIn
             validateResource(udf);
 
             String path = Utils.joinPath(udf.getSelfLink(), null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.UserDefinedFunction, OperationType.Replace);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Replace,
                     ResourceType.UserDefinedFunction, path, udf, requestHeaders, options);
 
@@ -2315,7 +2329,7 @@ private Mono<ResourceResponse<UserDefinedFunction>> deleteUserDefinedFunctionInt
 
             logger.debug("Deleting a UserDefinedFunction. udfLink [{}]", udfLink);
             String path = Utils.joinPath(udfLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.UserDefinedFunction, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.UserDefinedFunction, path, requestHeaders, options);
 
@@ -2352,7 +2366,7 @@ private Mono<ResourceResponse<UserDefinedFunction>> readUserDefinedFunctionInter
 
             logger.debug("Reading a UserDefinedFunction. udfLink [{}]", udfLink);
             String path = Utils.joinPath(udfLink, null);
-            Map<String, String> requestHeaders = this.getRequestHeaders(options);
+            Map<String, String> requestHeaders = this.getRequestHeaders(options, ResourceType.UserDefinedFunction, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.UserDefinedFunction, path, requestHeaders, options);
 
@@ -2408,7 +2422,7 @@ private Mono<ResourceResponse<Conflict>> readConflictInternal(String conflictLin
 
             logger.debug("Reading a Conflict. conflictLink [{}]", conflictLink);
             String path = Utils.joinPath(conflictLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Conflict, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.Conflict, path, requestHeaders, options);
 
@@ -2466,7 +2480,7 @@ private Mono<ResourceResponse<Conflict>> deleteConflictInternal(String conflictL
 
             logger.debug("Deleting a Conflict. conflictLink [{}]", conflictLink);
             String path = Utils.joinPath(conflictLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Conflict, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.Conflict, path, requestHeaders, options);
 
@@ -2538,7 +2552,7 @@ private RxDocumentServiceRequest getUserRequest(String databaseLink, User user,
         RxDocumentClientImpl.validateResource(user);
 
         String path = Utils.joinPath(databaseLink, Paths.USERS_PATH_SEGMENT);
-        Map<String, String> requestHeaders = getRequestHeaders(options);
+        Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.User, operationType);
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType, ResourceType.User, path, user,
                 requestHeaders, options);
 
@@ -2560,7 +2574,7 @@ private Mono<ResourceResponse<User>> replaceUserInternal(User user, RequestOptio
             RxDocumentClientImpl.validateResource(user);
 
             String path = Utils.joinPath(user.getSelfLink(), null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.User, OperationType.Replace);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Replace,
                     ResourceType.User, path, user, requestHeaders, options);
             if (retryPolicyInstance != null) {
@@ -2590,7 +2604,7 @@ private Mono<ResourceResponse<User>> deleteUserInternal(String userLink, Request
             }
             logger.debug("Deleting a User. userLink [{}]", userLink);
             String path = Utils.joinPath(userLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.User, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.User, path, requestHeaders, options);
 
@@ -2618,7 +2632,7 @@ private Mono<ResourceResponse<User>> readUserInternal(String userLink, RequestOp
             }
             logger.debug("Reading a User. userLink [{}]", userLink);
             String path = Utils.joinPath(userLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.User, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.User, path, requestHeaders, options);
 
@@ -2715,7 +2729,7 @@ private RxDocumentServiceRequest getPermissionRequest(String userLink, Permissio
         RxDocumentClientImpl.validateResource(permission);
 
         String path = Utils.joinPath(userLink, Paths.PERMISSIONS_PATH_SEGMENT);
-        Map<String, String> requestHeaders = getRequestHeaders(options);
+        Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Permission, operationType);
         RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType, ResourceType.Permission, path,
                 permission, requestHeaders, options);
 
@@ -2737,7 +2751,7 @@ private Mono<ResourceResponse<Permission>> replacePermissionInternal(Permission
             RxDocumentClientImpl.validateResource(permission);
 
             String path = Utils.joinPath(permission.getSelfLink(), null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Permission, OperationType.Replace);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Replace,
                     ResourceType.Permission, path, permission, requestHeaders, options);
 
@@ -2768,7 +2782,7 @@ private Mono<ResourceResponse<Permission>> deletePermissionInternal(String permi
             }
             logger.debug("Deleting a Permission. permissionLink [{}]", permissionLink);
             String path = Utils.joinPath(permissionLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Permission, OperationType.Delete);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Delete,
                     ResourceType.Permission, path, requestHeaders, options);
 
@@ -2797,7 +2811,7 @@ private Mono<ResourceResponse<Permission>> readPermissionInternal(String permiss
             }
             logger.debug("Reading a Permission. permissionLink [{}]", permissionLink);
             String path = Utils.joinPath(permissionLink, null);
-            Map<String, String> requestHeaders = getRequestHeaders(options);
+            Map<String, String> requestHeaders = getRequestHeaders(options, ResourceType.Permission, OperationType.Read);
             RxDocumentServiceRequest request = RxDocumentServiceRequest.create(OperationType.Read,
                     ResourceType.Permission, path, requestHeaders, options);
 
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentServiceRequest.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentServiceRequest.java
index f5287a9b82a3..24ae1acca4b1 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentServiceRequest.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentServiceRequest.java
@@ -26,8 +26,6 @@
  * This is core Transport/Connection agnostic request to the Azure Cosmos DB database service.
  */
 public class RxDocumentServiceRequest implements Cloneable {
-    private static final char PREFER_HEADER_SEPERATOR = ';';
-    private static final String PREFER_HEADER_VALUE_FORMAT = "%s=%s";
 
     public volatile boolean forcePartitionKeyRangeRefresh;
     public volatile boolean forceCollectionRoutingMapRefresh;
@@ -969,17 +967,6 @@ public boolean isValidAddress(ResourceType resourceType) {
         }
     }
 
-    public void addPreferHeader(String preferHeaderName, String preferHeaderValue) {
-        String headerToAdd = String.format(PREFER_HEADER_VALUE_FORMAT, preferHeaderName, preferHeaderValue);
-        String preferHeader = this.headers.get(HttpConstants.HttpHeaders.PREFER);
-        if(StringUtils.isNotEmpty(preferHeader)) {
-            preferHeader += PREFER_HEADER_SEPERATOR + headerToAdd;
-        } else {
-            preferHeader = headerToAdd;
-        }
-        this.headers.put(HttpConstants.HttpHeaders.PREFER, preferHeader);
-    }
-
     public static RxDocumentServiceRequest createFromResource(RxDocumentServiceRequest request, Resource modifiedResource) {
         RxDocumentServiceRequest modifiedRequest;
         if (!request.getIsNameBased()) {
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java
index 04bb13d98a68..9ec2da929bd3 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java
@@ -84,7 +84,7 @@ public HttpTransportClient(Configs configs, Duration requestTimeout, UserAgentCo
 
         // Set requested API version header for version enforcement.
         this.defaultHeaders.put(HttpConstants.HttpHeaders.VERSION, HttpConstants.Versions.CURRENT_VERSION);
-        this.defaultHeaders.put(HttpConstants.HttpHeaders.CACHE_CONTROL, HttpConstants.HeaderValues.NoCache);
+        this.defaultHeaders.put(HttpConstants.HttpHeaders.CACHE_CONTROL, HttpConstants.HeaderValues.NO_CACHE);
 
         if (userAgent == null) {
             userAgent = new UserAgentContainer();
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdConstants.java
index 86849db8c6da..951747ddd83a 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdConstants.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdConstants.java
@@ -572,7 +572,8 @@ public enum RntbdRequestHeader implements RntbdHeader {
         ContentSerializationFormat((short) 0x0065, RntbdTokenType.Byte, false),
         AllowTentativeWrites((short) 0x0066, RntbdTokenType.Byte, false),
         IsUserRequest((short) 0x0067, RntbdTokenType.Byte, false),
-        SharedOfferThroughput((short) 0x0068, RntbdTokenType.ULong, false);
+        SharedOfferThroughput((short) 0x0068, RntbdTokenType.ULong, false),
+        ReturnPreference((short) 0x0082, RntbdTokenType.Byte, false);
 
         public static final ImmutableMap<Short, RntbdRequestHeader> map;
         public static final ImmutableSet<RntbdRequestHeader> set = Sets.immutableEnumSet(EnumSet.allOf(RntbdRequestHeader.class));
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdRequestHeaders.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdRequestHeaders.java
index ccf5a8b6b64f..ccadaf602b04 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdRequestHeaders.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdRequestHeaders.java
@@ -17,7 +17,6 @@
 import com.azure.cosmos.implementation.RemoteStorageType;
 import com.azure.cosmos.implementation.ResourceId;
 import com.azure.cosmos.implementation.RxDocumentServiceRequest;
-import com.azure.cosmos.models.IndexingDirective;
 import com.fasterxml.jackson.annotation.JsonFilter;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -29,6 +28,7 @@
 import java.util.function.Supplier;
 
 import static com.azure.cosmos.implementation.HttpConstants.HttpHeaders;
+import static com.azure.cosmos.implementation.HttpConstants.HeaderValues;
 import static com.azure.cosmos.implementation.directconnectivity.WFConstants.BackendHeaders;
 import static com.azure.cosmos.implementation.directconnectivity.rntbd.RntbdConstants.RntbdConsistencyLevel;
 import static com.azure.cosmos.implementation.directconnectivity.rntbd.RntbdConstants.RntbdContentSerializationFormat;
@@ -112,6 +112,7 @@ final class RntbdRequestHeaders extends RntbdTokenStream<RntbdRequestHeader> {
         this.addStartAndEndKeys(headers);
         this.addSupportSpatialLegacyCoordinates(headers);
         this.addUsePolygonsSmallerThanAHemisphere(headers);
+        this.addReturnPreference(headers);
 
         // Normal headers (Strings, Ints, Longs, etc.)
 
@@ -279,6 +280,10 @@ private RntbdToken getEffectivePartitionKey() {
         return this.get(RntbdRequestHeader.EffectivePartitionKey);
     }
 
+    private RntbdToken getReturnPreference() {
+        return this.get(RntbdRequestHeader.ReturnPreference);
+    }
+
     private RntbdToken getEmitVerboseTracesInQuery() {
         return this.get(RntbdRequestHeader.EmitVerboseTracesInQuery);
     }
@@ -1159,6 +1164,13 @@ private void addUsePolygonsSmallerThanAHemisphere(final Map<String, String> head
         }
     }
 
+    private void addReturnPreference(final Map<String, String> headers) {
+        final String value = headers.get(HttpHeaders.PREFER);
+        if (StringUtils.isNotEmpty(value) && value.contains(HeaderValues.PREFER_RETURN_MINIMAL)) {
+            this.getReturnPreference().setValue(true);
+        }
+    }
+
     private void fillTokenFromHeader(final Map<String, String> headers, final Supplier<RntbdToken> supplier, final String name) {
 
         final String value = headers.get(name);
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java
index 56529eaf98ee..a919a6a83554 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java
@@ -179,4 +179,15 @@ public CosmosResponseDiagnostics getResponseDiagnostics() {
     public Duration getRequestLatency() {
         return resourceResponse.getRequestLatency();
     }
+
+    /**
+     * Gets the ETag from the response headers.
+     *
+     * Null in case of delete operation.
+     *
+     * @return ETag
+     */
+    public String getETag() {
+        return resourceResponse.getETag();
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java
index b1bde4ac913a..13063cdb23b7 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java
@@ -121,4 +121,14 @@ public Duration getRequestLatency() {
         return responseWrapper.getRequestLatency();
     }
 
+    /**
+     * Gets the ETag from the response headers.
+     *
+     * Null in case of delete operation.
+     *
+     * @return ETag
+     */
+    public String getETag() {
+        return responseWrapper.getETag();
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java
index 107a9286372b..60d9aefe9920 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/ClientUnderTestBuilder.java
@@ -17,6 +17,7 @@ public ClientUnderTestBuilder(CosmosClientBuilder builder) {
         this.key(builder.getKey());
         this.endpoint(builder.getEndpoint());
         this.keyCredential(builder.getKeyCredential());
+        this.contentResponseOnWriteEnabled(builder.isContentResponseOnWriteEnabled());
     }
 
     @Override
@@ -29,7 +30,8 @@ public CosmosAsyncClient buildAsyncClient() {
                 this.getConnectionPolicy(),
                 this.getConsistencyLevel(),
                 this.configs(),
-                this.getKeyCredential());
+                this.getKeyCredential(),
+                this.isContentResponseOnWriteEnabled());
         } catch (URISyntaxException e) {
             throw new IllegalArgumentException(e.getMessage());
         }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerContentResponseOnWriteTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerContentResponseOnWriteTest.java
new file mode 100644
index 000000000000..da23f418b482
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosContainerContentResponseOnWriteTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.azure.cosmos;
+
+import com.azure.cosmos.models.CosmosContainerProperties;
+import com.azure.cosmos.models.CosmosContainerRequestOptions;
+import com.azure.cosmos.models.CosmosContainerResponse;
+import com.azure.cosmos.models.IndexingMode;
+import com.azure.cosmos.models.IndexingPolicy;
+import com.azure.cosmos.models.PartitionKeyDefinition;
+import com.azure.cosmos.rx.TestSuiteBase;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CosmosContainerContentResponseOnWriteTest extends TestSuiteBase {
+
+    private final String preExistingDatabaseId = CosmosDatabaseForTest.generateId();
+    private CosmosClient client;
+    private CosmosDatabase createdDatabase;
+
+    //  Currently Gateway and Direct TCP support minimal response feature.
+    @Factory(dataProvider = "clientBuildersWithDirectTcpWithContentResponseOnWriteDisabled")
+    public CosmosContainerContentResponseOnWriteTest(CosmosClientBuilder clientBuilder) {
+        super(clientBuilder);
+    }
+
+    @BeforeClass(groups = {"emulator"}, timeOut = SETUP_TIMEOUT)
+    public void beforeClass() {
+        assertThat(this.client).isNull();
+        this.client = getClientBuilder().buildClient();
+        createdDatabase = createSyncDatabase(client, preExistingDatabaseId);
+    }
+
+    @AfterClass(groups = {"emulator"}, timeOut = SHUTDOWN_TIMEOUT, alwaysRun = true)
+    public void afterClass() {
+        safeDeleteSyncDatabase(createdDatabase);
+        safeCloseSyncClient(client);
+    }
+
+    @Test(groups = { "emulator" }, timeOut = TIMEOUT)
+    public void createContainer_withContentResponseOnWriteDisabled() throws Exception {
+        String collectionName = UUID.randomUUID().toString();
+        CosmosContainerProperties containerProperties = getCollectionDefinition(collectionName);
+
+        CosmosContainerResponse containerResponse = createdDatabase.createContainer(containerProperties);
+        assertThat(containerResponse.getRequestCharge()).isGreaterThan(0);
+        validateContainerResponse(containerProperties, containerResponse);
+    }
+
+    @Test(groups = { "emulator" }, timeOut = TIMEOUT)
+    public void readContainer_withContentResponseOnWriteDisabled() throws Exception {
+        String collectionName = UUID.randomUUID().toString();
+        CosmosContainerProperties containerProperties = getCollectionDefinition(collectionName);
+        CosmosContainerRequestOptions options = new CosmosContainerRequestOptions();
+
+        CosmosContainerResponse containerResponse = createdDatabase.createContainer(containerProperties);
+
+        CosmosContainer syncContainer = createdDatabase.getContainer(collectionName);
+
+        CosmosContainerResponse read = syncContainer.read();
+        validateContainerResponse(containerProperties, read);
+
+        CosmosContainerResponse read1 = syncContainer.read(options);
+        validateContainerResponse(containerProperties, read1);
+    }
+
+    @Test(groups = { "emulator" }, timeOut = TIMEOUT)
+    public void replaceContainer_withContentResponseOnWriteDisabled() throws Exception {
+
+        String collectionName = UUID.randomUUID().toString();
+        CosmosContainerProperties containerProperties = getCollectionDefinition(collectionName);
+        CosmosContainerRequestOptions options = new CosmosContainerRequestOptions();
+
+        CosmosContainerResponse containerResponse = createdDatabase.createContainer(containerProperties);
+        validateContainerResponse(containerProperties, containerResponse);
+
+        assertThat(containerResponse.getProperties().getIndexingPolicy().getIndexingMode()).isEqualTo(IndexingMode.CONSISTENT);
+
+        CosmosContainerResponse replaceResponse = containerResponse.getContainer()
+                                                                   .replace(containerResponse.getProperties().setIndexingPolicy(
+                                                                       new IndexingPolicy().setIndexingMode(IndexingMode.LAZY)));
+        assertThat(replaceResponse.getProperties().getIndexingPolicy().getIndexingMode())
+            .isEqualTo(IndexingMode.LAZY);
+
+        CosmosContainerResponse replaceResponse1 = containerResponse.getContainer()
+                                                                    .replace(containerResponse.getProperties().setIndexingPolicy(
+                                                                        new IndexingPolicy().setIndexingMode(IndexingMode.CONSISTENT)),
+                                                                        options);
+        assertThat(replaceResponse1.getProperties().getIndexingPolicy().getIndexingMode())
+            .isEqualTo(IndexingMode.CONSISTENT);
+
+    }
+
+    private CosmosContainerProperties getCollectionDefinition(String collectionName) {
+        PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+        ArrayList<String> paths = new ArrayList<String>();
+        paths.add("/mypk");
+        partitionKeyDef.setPaths(paths);
+
+        return new CosmosContainerProperties(
+            collectionName,
+            partitionKeyDef);
+    }
+
+    private void validateContainerResponse(CosmosContainerProperties containerProperties,
+                                           CosmosContainerResponse createResponse) {
+        // Basic validation
+        assertThat(createResponse.getProperties().getId()).isNotNull();
+        assertThat(createResponse.getProperties().getId())
+            .as("check Resource Id")
+            .isEqualTo(containerProperties.getId());
+
+    }
+
+}
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseContentResponseOnWriteTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseContentResponseOnWriteTest.java
new file mode 100644
index 000000000000..e4264996bdac
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosDatabaseContentResponseOnWriteTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.azure.cosmos;
+
+import com.azure.cosmos.models.CosmosDatabaseProperties;
+import com.azure.cosmos.models.CosmosDatabaseRequestOptions;
+import com.azure.cosmos.models.CosmosDatabaseResponse;
+import com.azure.cosmos.rx.TestSuiteBase;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CosmosDatabaseContentResponseOnWriteTest extends TestSuiteBase {
+
+    private final String preExistingDatabaseId = CosmosDatabaseForTest.generateId();
+    private final List<String> databases = new ArrayList<>();
+    private CosmosClient client;
+    private CosmosDatabase createdDatabase;
+
+    //  Currently Gateway and Direct TCP support minimal response feature.
+    @Factory(dataProvider = "clientBuildersWithDirectTcpWithContentResponseOnWriteDisabled")
+    public CosmosDatabaseContentResponseOnWriteTest(CosmosClientBuilder clientBuilder) {
+        super(clientBuilder);
+    }
+
+    @BeforeClass(groups = {"emulator"}, timeOut = SETUP_TIMEOUT)
+    public void beforeClass() {
+        assertThat(this.client).isNull();
+        this.client = getClientBuilder().buildClient();
+        createdDatabase = createSyncDatabase(client, preExistingDatabaseId);
+    }
+
+    @AfterClass(groups = {"emulator"}, timeOut = SHUTDOWN_TIMEOUT, alwaysRun = true)
+    public void afterClass() {
+        safeDeleteSyncDatabase(createdDatabase);
+        for (String dbId : databases) {
+            safeDeleteSyncDatabase(client.getDatabase(dbId));
+        }
+        safeCloseSyncClient(client);
+    }
+
+    @Test(groups = {"emulator"}, timeOut = TIMEOUT)
+    public void createDatabase_withContentResponseOnWriteDisabled() throws CosmosClientException {
+        CosmosDatabaseProperties databaseDefinition = new CosmosDatabaseProperties(CosmosDatabaseForTest.generateId());
+        databases.add(databaseDefinition.getId());
+
+        CosmosDatabaseResponse createResponse = client.createDatabase(databaseDefinition, new CosmosDatabaseRequestOptions());
+
+        validateDatabaseResponse(databaseDefinition, createResponse);
+    }
+
+    @Test(groups = {"emulator"}, timeOut = TIMEOUT)
+    public void readDatabase_withContentResponseOnWriteDisabled() throws Exception {
+        CosmosDatabase database = client.getDatabase(createdDatabase.getId());
+        CosmosDatabaseProperties properties = new CosmosDatabaseProperties(createdDatabase.getId());
+        CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions();
+
+        CosmosDatabaseResponse read = database.read();
+        validateDatabaseResponse(properties, read);
+
+        CosmosDatabaseResponse read1 = database.read(options);
+        validateDatabaseResponse(properties, read1);
+    }
+
+    private void validateDatabaseResponse(CosmosDatabaseProperties databaseDefinition, CosmosDatabaseResponse createResponse) {
+        // Basic validation
+        assertThat(createResponse.getProperties().getId()).isNotNull();
+        assertThat(createResponse.getProperties().getId())
+            .as("check Resource Id")
+            .isEqualTo(databaseDefinition.getId());
+
+    }
+
+}
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java
new file mode 100644
index 000000000000..a291d7a2f3ab
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ */
+
+package com.azure.cosmos;
+
+import com.azure.cosmos.implementation.CosmosItemProperties;
+import com.azure.cosmos.models.CosmosContainerProperties;
+import com.azure.cosmos.models.CosmosItemRequestOptions;
+import com.azure.cosmos.models.CosmosItemResponse;
+import com.azure.cosmos.models.ModelBridgeInternal;
+import com.azure.cosmos.models.PartitionKey;
+import com.azure.cosmos.models.PartitionKeyDefinition;
+import com.azure.cosmos.rx.TestSuiteBase;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CosmosItemContentResponseOnWriteTest extends TestSuiteBase {
+
+    private CosmosClient client;
+    private CosmosContainer container;
+
+    //  Currently Gateway and Direct TCP support minimal response feature.
+    @Factory(dataProvider = "clientBuildersWithDirectTcpWithContentResponseOnWriteDisabled")
+    public CosmosItemContentResponseOnWriteTest(CosmosClientBuilder clientBuilder) {
+        super(clientBuilder);
+    }
+
+    @BeforeClass(groups = {"simple"}, timeOut = SETUP_TIMEOUT)
+    public void beforeClass() {
+        assertThat(this.client).isNull();
+        this.client = getClientBuilder().buildClient();
+        CosmosAsyncContainer asyncContainer = getSharedMultiPartitionCosmosContainer(this.client.asyncClient());
+        container = client.getDatabase(asyncContainer.getDatabase().getId()).getContainer(asyncContainer.getId());
+    }
+
+    @AfterClass(groups = {"simple"}, timeOut = SHUTDOWN_TIMEOUT, alwaysRun = true)
+    public void afterClass() {
+        assertThat(this.client).isNotNull();
+        this.client.close();
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void createItem_withContentResponseOnWriteDisabled() throws Exception {
+        CosmosItemProperties properties = getDocumentDefinition(UUID.randomUUID().toString());
+        CosmosItemResponse<CosmosItemProperties> itemResponse = container.createItem(properties);
+        assertThat(itemResponse.getRequestCharge()).isGreaterThan(0);
+        validateMinimalItemResponse(properties, itemResponse, true);
+
+        properties = getDocumentDefinition(UUID.randomUUID().toString());
+        CosmosItemResponse<CosmosItemProperties> itemResponse1 = container.createItem(properties, new CosmosItemRequestOptions());
+        validateMinimalItemResponse(properties, itemResponse1, true);
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void readItem_withContentResponseOnWriteDisabled() throws Exception {
+        CosmosItemProperties properties = getDocumentDefinition(UUID.randomUUID().toString());
+        CosmosItemResponse<CosmosItemProperties> itemResponse = container.createItem(properties);
+
+        CosmosItemResponse<CosmosItemProperties> readResponse1 = container.readItem(properties.getId(),
+                                                                                    new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(properties, "mypk")),
+                                                                                    new CosmosItemRequestOptions(),
+                                                                                    CosmosItemProperties.class);
+        //  Read item should have full response irrespective of the flag - contentResponseOnWriteEnabled
+        validateItemResponse(properties, readResponse1);
+
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void replaceItem_withContentResponseOnWriteDisabled() throws Exception{
+        CosmosItemProperties properties = getDocumentDefinition(UUID.randomUUID().toString());
+        CosmosItemResponse<CosmosItemProperties> itemResponse = container.createItem(properties);
+
+        validateMinimalItemResponse(properties, itemResponse, true);
+        String newPropValue = UUID.randomUUID().toString();
+        BridgeInternal.setProperty(properties, "newProp", newPropValue);
+        CosmosItemRequestOptions options = new CosmosItemRequestOptions();
+        ModelBridgeInternal.setPartitionKey(options, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(properties, "mypk")));
+        // replace document
+        CosmosItemResponse<CosmosItemProperties> replace = container.replaceItem(properties,
+                                                              properties.getId(),
+                                                              new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(properties, "mypk")),
+                                                              options);
+        validateMinimalItemResponse(properties, replace, true);
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void deleteItem_withContentResponseOnWriteDisabled() throws Exception {
+        CosmosItemProperties properties = getDocumentDefinition(UUID.randomUUID().toString());
+        CosmosItemResponse<CosmosItemProperties> itemResponse = container.createItem(properties);
+        CosmosItemRequestOptions options = new CosmosItemRequestOptions();
+
+        CosmosItemResponse<?> deleteResponse = container.deleteItem(properties.getId(),
+                                                                    new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(properties, "mypk")),
+                                                                    options);
+        assertThat(deleteResponse.getStatusCode()).isEqualTo(204);
+        validateMinimalItemResponse(properties, deleteResponse, false);
+    }
+
+    private CosmosContainerProperties getCollectionDefinition(String collectionName) {
+        PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+        ArrayList<String> paths = new ArrayList<String>();
+        paths.add("/mypk");
+        partitionKeyDef.setPaths(paths);
+
+        return new CosmosContainerProperties(
+            collectionName,
+            partitionKeyDef);
+    }
+
+    private CosmosItemProperties getDocumentDefinition(String documentId) {
+        final String uuid = UUID.randomUUID().toString();
+        final CosmosItemProperties properties =
+            new CosmosItemProperties(String.format("{ "
+                                                       + "\"id\": \"%s\", "
+                                                       + "\"mypk\": \"%s\", "
+                                                       + "\"sgmts\": [[6519456, 1471916863], [2498434, 1455671440]]"
+                                                       + "}"
+                , documentId, uuid));
+        return properties;
+    }
+
+    private void validateItemResponse(CosmosItemProperties containerProperties,
+                                      CosmosItemResponse<CosmosItemProperties> createResponse) {
+        // Basic validation
+        assertThat(BridgeInternal.getProperties(createResponse).getId()).isNotNull();
+        assertThat(BridgeInternal.getProperties(createResponse).getId())
+            .as("check Resource Id")
+            .isEqualTo(containerProperties.getId());
+    }
+
+    private void validateMinimalItemResponse(CosmosItemProperties containerProperties,
+                                      CosmosItemResponse<?> createResponse, boolean withETag) {
+        // Basic validation
+        assertThat(BridgeInternal.getProperties(createResponse)).isNull();
+        assertThat(createResponse.getStatusCode()).isNotNull();
+        assertThat(createResponse.getResponseHeaders()).isNotEmpty();
+        assertThat(createResponse.getRequestCharge()).isGreaterThan(0);
+        if (withETag) {
+            assertThat(createResponse.getETag()).isNotEmpty();
+        } else {
+            assertThat(createResponse.getETag()).isNull();
+        }
+    }
+
+}
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseDiagnosticsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseDiagnosticsTest.java
index 472a1ff27f6f..de28d0cab4b6 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseDiagnosticsTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseDiagnosticsTest.java
@@ -9,7 +9,6 @@
 import com.azure.cosmos.implementation.ResourceType;
 import com.azure.cosmos.implementation.RxDocumentServiceRequest;
 import com.azure.cosmos.implementation.TestConfigurations;
-import com.azure.cosmos.models.CosmosContainerProperties;
 import com.azure.cosmos.models.CosmosContainerResponse;
 import com.azure.cosmos.models.CosmosDatabaseResponse;
 import com.azure.cosmos.models.CosmosItemRequestOptions;
@@ -44,7 +43,8 @@ public void beforeClass() throws Exception {
         assertThat(this.gatewayClient).isNull();
         cosmosClientBuilder = new CosmosClientBuilder()
             .endpoint(TestConfigurations.HOST)
-            .key(TestConfigurations.MASTER_KEY);
+            .key(TestConfigurations.MASTER_KEY)
+            .contentResponseOnWriteEnabled(true);
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.GATEWAY);
         gatewayClient = cosmosClientBuilder.connectionPolicy(connectionPolicy).buildClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests1.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests1.java
index 76d8bc40a3fa..2cbb77032da9 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests1.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests1.java
@@ -32,12 +32,12 @@ public void validateStrongConsistencyOnSyncReplication() throws Exception {
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.STRONG).build();
+                .withConsistencyLevel(ConsistencyLevel.STRONG).withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.STRONG).build();
+                .withConsistencyLevel(ConsistencyLevel.STRONG).withContentResponseOnWriteEnabled(true).build();
         User userDefinition = getUserDefinition();
         userDefinition.setId(userDefinition.getId() + "validateStrongConsistencyOnSyncReplication");
         User user = safeCreateUser(this.initClient, createdDatabase.getId(), userDefinition);
@@ -54,12 +54,12 @@ public void validateConsistentLSNForDirectTCPClient() {
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         validateConsistentLSN();
     }
 
@@ -70,12 +70,12 @@ public void validateConsistentLSNForDirectHttpsClient() {
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         validateConsistentLSN();
     }
 
@@ -88,12 +88,12 @@ public void validateConsistentLSNAndQuorumAckedLSNForDirectTCPClient() {
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         validateConsistentLSNAndQuorumAckedLSN();
     }
 
@@ -122,12 +122,12 @@ public void validateConsistentLSNAndQuorumAckedLSNForDirectHttpsClient() {
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         validateConsistentLSNAndQuorumAckedLSN();
     }
 
@@ -165,22 +165,17 @@ public void validateConsistentPrefixOnSyncReplication() throws InterruptedExcept
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS).build();
+                .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS).withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS).build();
+                .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS).withContentResponseOnWriteEnabled(true).build();
         User user = safeCreateUser(this.initClient, createdDatabase.getId(), getUserDefinition());
         boolean readLagging = validateConsistentPrefix(user);
         assertThat(readLagging).isFalse();
     }
 
-    // TODO (DANOBLE) ConsistencyTests1::validateConsistentPrefixOnAsyncReplication test fails
-    //  This test requires BoundedStaleness and fails due to timeouts when run in Direct TCP mode.
-    //  This test should be enabled when we are ready to address our BoundedStaleness consistency issues.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6378
-    @Ignore
     @Test(groups = {"direct"}, timeOut = CONSISTENCY_TEST_TIMEOUT)
     public void validateConsistentPrefixOnAsyncReplication() throws InterruptedException {
         if (!(TestConfigurations.CONSISTENCY.equalsIgnoreCase(ConsistencyLevel.STRONG.toString()) || TestConfigurations.CONSISTENCY.equalsIgnoreCase(ConsistencyLevel.BOUNDED_STALENESS.toString()))) {
@@ -193,13 +188,13 @@ public void validateConsistentPrefixOnAsyncReplication() throws InterruptedExcep
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
                 .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
                 .withConsistencyLevel(ConsistencyLevel.BOUNDED_STALENESS)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         Document documentDefinition = getDocumentDefinition();
         Document document = createDocument(this.initClient, createdDatabase.getId(), createdCollection.getId(), documentDefinition);
         boolean readLagging = validateConsistentPrefix(document);
@@ -245,7 +240,7 @@ private void validateSubstatusCodeOnNotFoundExceptionInSessionReadAsync(boolean
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
                 .withConsistencyLevel(ConsistencyLevel.SESSION)
-                .build();
+                .withContentResponseOnWriteEnabled(true).build();
         try {
             DocumentCollection documentCollection = new DocumentCollection();
             documentCollection.setId(UUID.randomUUID().toString());
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests2.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests2.java
index ca39e63be90c..6bfd2e122335 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests2.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTests2.java
@@ -33,12 +33,12 @@ public void validateReadSessionOnAsyncReplication() throws InterruptedException
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION).build();
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION).build();
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true).build();
 
         Document document = this.initClient.createDocument(createdCollection.getSelfLink(), getDocumentDefinition(),
                                                            null, false).block().getResource();
@@ -54,12 +54,12 @@ public void validateWriteSessionOnAsyncReplication() throws InterruptedException
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION).build();
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION).build();
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true).build();
 
         Document document = this.initClient.createDocument(createdCollection.getSelfLink(), getDocumentDefinition(),
                                                            null, false).block().getResource();
@@ -161,13 +161,13 @@ public void validateNoChargeOnFailedSessionRead() throws Exception {
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         // Client locked to replica for pause/resume
         RxDocumentClientImpl readSecondaryClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
             // CREATE collection
@@ -221,7 +221,7 @@ public void validateSessionTokenAsync() {
         RxDocumentClientImpl client = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
 
         try {
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTestsBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTestsBase.java
index 7cc07073fc08..f1780f389f92 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTestsBase.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/ConsistencyTestsBase.java
@@ -124,12 +124,12 @@ void validateStrongConsistencyOnAsyncReplication(boolean useGateway) throws Inte
         this.writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.STRONG).build();
+                .withConsistencyLevel(ConsistencyLevel.STRONG).withContentResponseOnWriteEnabled(true).build();
 
         this.readClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.STRONG).build();
+                .withConsistencyLevel(ConsistencyLevel.STRONG).withContentResponseOnWriteEnabled(true).build();
 
         Document documentDefinition = getDocumentDefinition();
         Document document = createDocument(this.writeClient, createdDatabase.getId(), createdCollection.getId(), documentDefinition);
@@ -164,7 +164,7 @@ void validateSessionContainerAfterCollectionCreateReplace(boolean useGateway) {
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION).build();
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true).build();
 
         try {
             PartitionKeyDefinition partitionKey = new PartitionKeyDefinition();
@@ -371,12 +371,12 @@ void validateSessionContainerAfterCollectionDeletion(boolean useGateway) throws
         RxDocumentClientImpl client1 = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         RxDocumentClientImpl client2 = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
 
         String collectionId = UUID.randomUUID().toString();
@@ -502,12 +502,12 @@ void validateSessionTokenWithPreConditionFailure(boolean useGateway) throws Exce
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         RxDocumentClientImpl validationClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
             // write a document, and upsert to it to update etag.
@@ -546,12 +546,12 @@ void validateSessionTokenWithDocumentNotFoundException(boolean useGateway) throw
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         RxDocumentClientImpl validationClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
             DocumentCollection collectionDefinition = getCollectionDefinition();
@@ -582,7 +582,7 @@ void validateSessionTokenWithExpectedException(boolean useGateway) throws Except
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
             ResourceResponse<Document> documentResponse =
@@ -615,12 +615,12 @@ void validateSessionTokenWithConflictException(boolean useGateway) {
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         RxDocumentClientImpl validationClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
             Document documentDefinition = getDocumentDefinition();
@@ -648,7 +648,7 @@ void validateSessionTokenMultiPartitionCollection(boolean useGateway) throws Exc
         RxDocumentClientImpl writeClient = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         try {
 
@@ -727,7 +727,7 @@ void validateSessionTokenFromCollectionReplaceIsServerToken(boolean useGateway)
         RxDocumentClientImpl client1 = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION)
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                 .build();
         RxDocumentClientImpl client2 = null;
         try {
@@ -740,7 +740,7 @@ void validateSessionTokenFromCollectionReplaceIsServerToken(boolean useGateway)
             client2 = (RxDocumentClientImpl) new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
                     .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                     .withConnectionPolicy(connectionPolicy)
-                    .withConsistencyLevel(ConsistencyLevel.SESSION)
+                    .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true)
                     .build();
             client2.replaceCollection(createdCollection, null).block();
             String token2 = ((SessionContainer) client2.getSession()).getSessionToken(createdCollection.getSelfLink());
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RetryThrottleTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RetryThrottleTest.java
index e77e425c45fc..c10853d2352c 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RetryThrottleTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RetryThrottleTest.java
@@ -47,7 +47,8 @@ public void retryCreateDocumentsOnSpike() throws Exception {
                 .withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(policy)
-                .withConsistencyLevel(ConsistencyLevel.EVENTUAL);
+                .withConsistencyLevel(ConsistencyLevel.EVENTUAL)
+                .withContentResponseOnWriteEnabled(true);
 
         client = SpyClientUnderTestFactory.createClientWithGatewaySpy(builder);
 
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentClientUnderTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentClientUnderTest.java
index 549e7b8346fe..cf9695dae8fa 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentClientUnderTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentClientUnderTest.java
@@ -36,8 +36,9 @@ public RxDocumentClientUnderTest(URI serviceEndpoint,
                                      ConnectionPolicy connectionPolicy,
                                      ConsistencyLevel consistencyLevel,
                                      Configs configs,
-                                     CosmosKeyCredential cosmosKeyCredential) {
-        super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, false, false);
+                                     CosmosKeyCredential cosmosKeyCredential,
+                                     boolean contentResponseOnWriteEnabled) {
+        super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, false, false, contentResponseOnWriteEnabled);
         init();
     }
 
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentServiceRequestTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentServiceRequestTest.java
index 2cd57da2124d..5540345e13d5 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentServiceRequestTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/RxDocumentServiceRequestTest.java
@@ -404,24 +404,6 @@ public void isValidAddress(String documentUrlWithId, String documentUrlWithName,
         assertThat(request.isValidAddress(ResourceType.Unknown)).isTrue();
     }
 
-    @Test(groups = { "unit" }, dataProvider = "documentUrl")
-    public void addPreferHeader(String documentUrlWithId, String documentUrlWithName, OperationType operationType) {
-        RxDocumentServiceRequest request = RxDocumentServiceRequest.create(operationType,
-                                                                           ResourceType.Document,
-                                                                           documentUrlWithId,
-                                                                           new HashedMap<String, String>());
-
-        request.addPreferHeader("preferHeaderName1", "preferHeaderValue1");
-        assertThat(request.getHeaders().size()).isEqualTo(1);
-        assertThat(request.getHeaders().get(HttpConstants.HttpHeaders.PREFER))
-                .isEqualTo("preferHeaderName1=preferHeaderValue1");
-
-        request.addPreferHeader("preferHeaderName2", "preferHeaderValue2");
-        assertThat(request.getHeaders().size()).isEqualTo(1);
-        assertThat(request.getHeaders().get(HttpConstants.HttpHeaders.PREFER))
-                .isEqualTo("preferHeaderName1=preferHeaderValue1;" + "preferHeaderName2=preferHeaderValue2");
-    }
-
     private Document getDocumentDefinition() {
         String uuid = UUID.randomUUID().toString();
         Document doc = new Document(String.format(DOCUMENT_DEFINITION, uuid, PARTITION_KEY_VALUE));
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientBuilder.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientBuilder.java
index db0950fe283e..08cabe715196 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientBuilder.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientBuilder.java
@@ -12,31 +12,38 @@ public SpyClientBuilder(AsyncDocumentClient.Builder builder) {
         super.masterKeyOrResourceToken = builder.masterKeyOrResourceToken;
         super.serviceEndpoint = builder.serviceEndpoint;
         super.cosmosKeyCredential = builder.cosmosKeyCredential;
+        super.contentResponseOnWriteEnabled = builder.contentResponseOnWriteEnabled;
     }
 
     public SpyClientUnderTestFactory.ClientUnderTest build() {
         return SpyClientUnderTestFactory.createClientUnderTest(
-                serviceEndpoint,
-                masterKeyOrResourceToken,
-                connectionPolicy,
-                desiredConsistencyLevel,
-                configs, cosmosKeyCredential);
+            serviceEndpoint,
+            masterKeyOrResourceToken,
+            connectionPolicy,
+            desiredConsistencyLevel,
+            configs,
+            cosmosKeyCredential,
+            contentResponseOnWriteEnabled);
     }
 
     public SpyClientUnderTestFactory.ClientWithGatewaySpy buildWithGatewaySpy() {
         return SpyClientUnderTestFactory.createClientWithGatewaySpy(
-                serviceEndpoint,
-                masterKeyOrResourceToken,
-                connectionPolicy,
-                desiredConsistencyLevel,
-                configs, cosmosKeyCredential);
+            serviceEndpoint,
+            masterKeyOrResourceToken,
+            connectionPolicy,
+            desiredConsistencyLevel,
+            configs,
+            cosmosKeyCredential,
+            contentResponseOnWriteEnabled);
     }
 
     public SpyClientUnderTestFactory.DirectHttpsClientUnderTest buildWithDirectHttps() {
         return SpyClientUnderTestFactory.createDirectHttpsClientUnderTest(
-                serviceEndpoint,
-                masterKeyOrResourceToken,
-                connectionPolicy,
-                desiredConsistencyLevel, cosmosKeyCredential);
+            serviceEndpoint,
+            masterKeyOrResourceToken,
+            connectionPolicy,
+            desiredConsistencyLevel,
+            cosmosKeyCredential,
+            contentResponseOnWriteEnabled);
     }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientUnderTestFactory.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientUnderTestFactory.java
index e3e52cdba795..dac2acff90b9 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientUnderTestFactory.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/SpyClientUnderTestFactory.java
@@ -32,8 +32,8 @@ public class SpyClientUnderTestFactory {
 
     public static abstract class SpyBaseClass<T> extends RxDocumentClientImpl {
 
-        public SpyBaseClass(URI serviceEndpoint, String masterKeyOrResourceToken, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential) {
-            super(serviceEndpoint, masterKeyOrResourceToken, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, false, false);
+        public SpyBaseClass(URI serviceEndpoint, String masterKeyOrResourceToken, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential, boolean contentResponseOnWriteEnabled) {
+            super(serviceEndpoint, masterKeyOrResourceToken, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, false, false, contentResponseOnWriteEnabled);
         }
 
         public abstract List<T> getCapturedRequests();
@@ -55,8 +55,8 @@ public static class ClientWithGatewaySpy extends SpyBaseClass<RxDocumentServiceR
         private List<RxDocumentServiceRequest> requests;
 
 
-        ClientWithGatewaySpy(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential) {
-            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential);
+        ClientWithGatewaySpy(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential, boolean contentResponseOnWriteEnabled) {
+            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, contentResponseOnWriteEnabled);
             init();
         }
 
@@ -117,8 +117,8 @@ public static class ClientUnderTest extends SpyBaseClass<HttpRequest> {
         List<Pair<HttpRequest, Future<HttpHeaders>>> requestsResponsePairs =
                 Collections.synchronizedList(new ArrayList<>());
 
-        ClientUnderTest(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential) {
-            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential);
+        ClientUnderTest(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, Configs configs, CosmosKeyCredential cosmosKeyCredential, boolean contentResponseOnWriteEnabled) {
+            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, contentResponseOnWriteEnabled);
             init();
         }
 
@@ -169,8 +169,8 @@ public static class DirectHttpsClientUnderTest extends SpyBaseClass<HttpRequest>
         List<Pair<HttpRequest, Future<HttpHeaders>>> requestsResponsePairs =
                 Collections.synchronizedList(new ArrayList<>());
 
-        DirectHttpsClientUnderTest(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, CosmosKeyCredential cosmosKeyCredential) {
-            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, createConfigsSpy(Protocol.HTTPS), cosmosKeyCredential);
+        DirectHttpsClientUnderTest(URI serviceEndpoint, String masterKey, ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, CosmosKeyCredential cosmosKeyCredential, boolean contentResponseOnWriteEnabled) {
+            super(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, createConfigsSpy(Protocol.HTTPS), cosmosKeyCredential, contentResponseOnWriteEnabled);
             assert connectionPolicy.getConnectionMode() == ConnectionMode.DIRECT;
             init();
 
@@ -230,8 +230,9 @@ public static ClientWithGatewaySpy createClientWithGatewaySpy(URI serviceEndpoin
                                                                   ConnectionPolicy connectionPolicy,
                                                                   ConsistencyLevel consistencyLevel,
                                                                   Configs configs,
-                                                                  CosmosKeyCredential cosmosKeyCredential) {
-        return new ClientWithGatewaySpy(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential);
+                                                                  CosmosKeyCredential cosmosKeyCredential,
+                                                                  boolean contentResponseOnWriteEnabled) {
+        return new ClientWithGatewaySpy(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, contentResponseOnWriteEnabled);
     }
 
     public static ClientUnderTest createClientUnderTest(AsyncDocumentClient.Builder builder) {
@@ -247,8 +248,9 @@ public static ClientUnderTest createClientUnderTest(URI serviceEndpoint,
                                                         ConnectionPolicy connectionPolicy,
                                                         ConsistencyLevel consistencyLevel,
                                                         Configs configs,
-                                                        CosmosKeyCredential cosmosKeyCredential) {
-        return new ClientUnderTest(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential) {
+                                                        CosmosKeyCredential cosmosKeyCredential,
+                                                        boolean contentResponseOnWriteEnabled) {
+        return new ClientUnderTest(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, configs, cosmosKeyCredential, contentResponseOnWriteEnabled) {
 
             @Override
             RxGatewayStoreModel createRxGatewayProxy(ISessionContainer sessionContainer,
@@ -277,7 +279,7 @@ RxGatewayStoreModel createRxGatewayProxy(ISessionContainer sessionContainer,
     }
 
     public static DirectHttpsClientUnderTest createDirectHttpsClientUnderTest(URI serviceEndpoint, String masterKey,
-            ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, CosmosKeyCredential cosmosKeyCredential) {
-        return new DirectHttpsClientUnderTest(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, cosmosKeyCredential);
+            ConnectionPolicy connectionPolicy, ConsistencyLevel consistencyLevel, CosmosKeyCredential cosmosKeyCredential, boolean contentResponseOnWriteEnabled) {
+        return new DirectHttpsClientUnderTest(serviceEndpoint, masterKey, connectionPolicy, consistencyLevel, cosmosKeyCredential, contentResponseOnWriteEnabled);
     }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/TestSuiteBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/TestSuiteBase.java
index d4caa3fc19f9..727a76ac1466 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/TestSuiteBase.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/TestSuiteBase.java
@@ -727,15 +727,15 @@ public static <T extends Resource> void validateQueryFailure(Flux<FeedResponse<T
 
     @DataProvider
     public static Object[][] clientBuilders() {
-        return new Object[][]{{createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null)}};
+        return new Object[][]{{createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true)}};
     }
 
     @DataProvider
     public static Object[][] clientBuildersWithSessionConsistency() {
         return new Object[][]{
-                {createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null)},
-                {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.HTTPS, false, null)},
-                {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.TCP, false, null)}
+                {createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true)},
+                {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.HTTPS, false, null, true)},
+                {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.TCP, false, null, true)}
         };
     }
 
@@ -783,28 +783,28 @@ static List<Protocol> parseProtocols(String protocols) {
 
     @DataProvider
     public static Object[][] simpleClientBuildersWithDirect() {
-        return simpleClientBuildersWithDirect(toArray(protocols));
+        return simpleClientBuildersWithDirect(true, toArray(protocols));
     }
 
     @DataProvider
     public static Object[][] simpleClientBuildersWithDirectHttps() {
-        return simpleClientBuildersWithDirect(Protocol.HTTPS);
+        return simpleClientBuildersWithDirect(true, Protocol.HTTPS);
     }
 
-    private static Object[][] simpleClientBuildersWithDirect(Protocol... protocols) {
+    private static Object[][] simpleClientBuildersWithDirect(boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         logger.info("Max test consistency to use is [{}]", accountConsistency);
         List<ConsistencyLevel> testConsistencies = ImmutableList.of(ConsistencyLevel.EVENTUAL);
 
         boolean isMultiMasterEnabled = preferredLocations != null && accountConsistency == ConsistencyLevel.SESSION;
 
         List<Builder> builders = new ArrayList<>();
-        builders.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null));
+        builders.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, contentResponseOnWriteEnabled));
 
         for (Protocol protocol : protocols) {
             testConsistencies.forEach(consistencyLevel -> builders.add(createDirectRxDocumentClient(consistencyLevel,
                                                                                                     protocol,
                                                                                                     isMultiMasterEnabled,
-                                                                                                    preferredLocations)));
+                                                                                                    preferredLocations, contentResponseOnWriteEnabled)));
         }
 
         builders.forEach(b -> logger.info("Will Use ConnectionMode [{}], Consistency [{}], Protocol [{}]",
@@ -838,12 +838,12 @@ static Protocol[] toArray(List<Protocol> protocols) {
     private static Object[][] clientBuildersWithDirectSession(Protocol... protocols) {
         return clientBuildersWithDirect(new ArrayList<ConsistencyLevel>() {{
             add(ConsistencyLevel.SESSION);
-        }}, protocols);
+        }}, true, protocols);
     }
 
     private static Object[][] clientBuildersWithDirectAllConsistencies(Protocol... protocols) {
         logger.info("Max test consistency to use is [{}]", accountConsistency);
-        return clientBuildersWithDirect(desiredConsistencies, protocols);
+        return clientBuildersWithDirect(desiredConsistencies, true, protocols);
     }
 
     static List<ConsistencyLevel> parseDesiredConsistencies(String consistencies) {
@@ -884,17 +884,17 @@ static List<ConsistencyLevel> allEqualOrLowerConsistencies(ConsistencyLevel acco
         return testConsistencies;
     }
 
-    private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testConsistencies, Protocol... protocols) {
+    private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testConsistencies, boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         boolean isMultiMasterEnabled = preferredLocations != null && accountConsistency == ConsistencyLevel.SESSION;
 
         List<Builder> builders = new ArrayList<>();
-        builders.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, isMultiMasterEnabled, preferredLocations));
+        builders.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, isMultiMasterEnabled, preferredLocations, contentResponseOnWriteEnabled));
 
         for (Protocol protocol : protocols) {
             testConsistencies.forEach(consistencyLevel -> builders.add(createDirectRxDocumentClient(consistencyLevel,
                                                                                                     protocol,
                                                                                                     isMultiMasterEnabled,
-                                                                                                    preferredLocations)));
+                                                                                                    preferredLocations, contentResponseOnWriteEnabled)));
         }
 
         builders.forEach(b -> logger.info("Will Use ConnectionMode [{}], Consistency [{}], Protocol [{}]",
@@ -915,28 +915,30 @@ static protected Builder createGatewayHouseKeepingDocumentClient() {
         return new Builder().withServiceEndpoint(TestConfigurations.HOST)
                 .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                 .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(ConsistencyLevel.SESSION);
+                .withConsistencyLevel(ConsistencyLevel.SESSION).withContentResponseOnWriteEnabled(true);
     }
 
-    static protected Builder createGatewayRxDocumentClient(ConsistencyLevel consistencyLevel, boolean multiMasterEnabled, List<String> preferredLocations) {
+    static protected Builder createGatewayRxDocumentClient(ConsistencyLevel consistencyLevel, boolean multiMasterEnabled, List<String> preferredLocations, boolean contentResponseOnWriteEnabled) {
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.GATEWAY);
         connectionPolicy.setUsingMultipleWriteRegions(multiMasterEnabled);
         connectionPolicy.setPreferredRegions(preferredLocations);
         return new Builder().withServiceEndpoint(TestConfigurations.HOST)
-                .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
-                .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(consistencyLevel);
+                            .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+                            .withConnectionPolicy(connectionPolicy)
+                            .withConsistencyLevel(consistencyLevel)
+                            .withContentResponseOnWriteEnabled(contentResponseOnWriteEnabled);
     }
 
     static protected Builder createGatewayRxDocumentClient() {
-        return createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null);
+        return createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true);
     }
 
     static protected Builder createDirectRxDocumentClient(ConsistencyLevel consistencyLevel,
-                                                                              Protocol protocol,
-                                                                              boolean multiMasterEnabled,
-                                                                              List<String> preferredRegions) {
+                                                          Protocol protocol,
+                                                          boolean multiMasterEnabled,
+                                                          List<String> preferredRegions,
+                                                          boolean contentResponseOnWriteEnabled) {
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.DIRECT);
 
@@ -952,10 +954,11 @@ static protected Builder createDirectRxDocumentClient(ConsistencyLevel consisten
         doAnswer((Answer<Protocol>)invocation -> protocol).when(configs).getProtocol();
 
         return new Builder().withServiceEndpoint(TestConfigurations.HOST)
-                .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
-                .withConnectionPolicy(connectionPolicy)
-                .withConsistencyLevel(consistencyLevel)
-                .withConfigs(configs);
+                            .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+                            .withConnectionPolicy(connectionPolicy)
+                            .withConsistencyLevel(consistencyLevel)
+                            .withConfigs(configs)
+                            .withContentResponseOnWriteEnabled(contentResponseOnWriteEnabled);
     }
 
     protected int expectedNumberOfPages(int totalExpectedResult, int maxPageSize) {
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/directconnectivity/DCDocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/directconnectivity/DCDocumentCrudTest.java
index 78249af3f22f..bdade11a4cef 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/directconnectivity/DCDocumentCrudTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/implementation/directconnectivity/DCDocumentCrudTest.java
@@ -80,6 +80,7 @@ static Builder createDCBuilder(Protocol protocol) {
             .withConfigs(configs)
             .withConnectionPolicy(connectionPolicy)
             .withConsistencyLevel(ConsistencyLevel.SESSION)
+            .withContentResponseOnWriteEnabled(true)
             .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY);
     }
 
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java
index 8879e18c3056..decbcbda007a 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/AggregateQueryTests.java
@@ -188,8 +188,6 @@ public void afterClass() {
         safeClose(client);
     }
 
-    // TODO (DANOBLE) AggregateQueryTests initialization intermittently fails due to collection truncation error.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6346
     @BeforeClass(groups = { "simple" }, timeOut = 4 * SETUP_TIMEOUT)
     public void before_AggregateQueryTests() throws Throwable {
         client = this.getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAuthorizationTokenResolverTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAuthorizationTokenResolverTest.java
index 411f68df0372..131536ac8fb8 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAuthorizationTokenResolverTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosAuthorizationTokenResolverTest.java
@@ -239,6 +239,7 @@ public void verifyingAuthTokenAPISequence(ConnectionMode connectionMode) {
                     .withTokenResolver(getTokenResolver(null)) //TokenResolver always generating invalid token.
                     .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                     .withPermissionFeed(permissionFeed)
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             RequestOptions requestOptions = new RequestOptions();
             requestOptions.setPartitionKey(new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(resourceResponse.getResource(), "mypk")));
@@ -254,6 +255,7 @@ public void verifyingAuthTokenAPISequence(ConnectionMode connectionMode) {
                     .withTokenResolver(getTokenResolver(PermissionMode.READ))
                     .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
                     .withPermissionFeed(permissionFeed)
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             readObservable = asyncClientWithTokenResolver.readDocument(resourceResponse.getResource().getSelfLink(), requestOptions);
             ResourceResponseValidator<Document> sucessValidator = new ResourceResponseValidator.Builder<Document>()
@@ -267,6 +269,7 @@ public void verifyingAuthTokenAPISequence(ConnectionMode connectionMode) {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withPermissionFeed(permissionFeed)
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             readObservable = asyncClientWithTokenResolver.readDocument(resourceResponse.getResource().getSelfLink(), requestOptions);
             validateSuccess(readObservable, sucessValidator);
@@ -278,6 +281,7 @@ public void verifyingAuthTokenAPISequence(ConnectionMode connectionMode) {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
             readObservable = asyncClientWithTokenResolver.readDocument(resourceResponse.getResource().getSelfLink(), requestOptions);
             validateSuccess(readObservable, sucessValidator);
@@ -418,6 +422,7 @@ public void verifyRuntimeExceptionWhenUserModifiesProperties(ConnectionMode conn
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withTokenResolver(getBadTokenResolver())
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
 
             RequestOptions options = new RequestOptions();
@@ -445,6 +450,7 @@ public void verifyBlockListedUserThrows(ConnectionMode connectionMode) {
                     .withConnectionPolicy(connectionPolicy)
                     .withConsistencyLevel(ConsistencyLevel.SESSION)
                     .withTokenResolver(getTokenResolverWithBlockList(PermissionMode.READ, field, blockListedUser, errorMessage))
+                    .withContentResponseOnWriteEnabled(true)
                     .build();
 
             RequestOptions options = new RequestOptions();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java
index 1b62596f76c2..3aa8f7154015 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java
@@ -65,8 +65,6 @@ public void createDocument(String documentId) throws InterruptedException {
         this.validateItemSuccess(createObservable, validator);
     }
 
-    // TODO (DANOBLE) DocumentCrudTest::createLargeDocument fails in some  environments
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6335
     @Test(groups = { "simple" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
     public void createLargeDocument(String documentId) throws InterruptedException {
         CosmosItemProperties docDefinition = getDocumentDefinition(documentId);
@@ -105,8 +103,6 @@ public void createDocumentWithVeryLargePartitionKey(String documentId) throws In
         this.validateItemSuccess(createObservable, validator);
     }
 
-    // TODO (DANOBLE) DocumentCrudTest::readDocumentWithVeryLargePartitionKey test fails in some environments
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6336
     @Test(groups = { "simple" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
     public void readDocumentWithVeryLargePartitionKey(String documentId) throws InterruptedException {
         CosmosItemProperties docDefinition = getDocumentDefinition(documentId);
@@ -213,8 +209,6 @@ public void readDocument_DoesntExist(String documentId) throws InterruptedExcept
         validateItemFailure(readObservable, validator);
     }
 
-    // TODO (DANOBLE) DocumentCrudTest::deleteDocument test fails in some test environments
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6337
     @Test(groups = { "simple" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
     public void deleteDocument(String documentId) throws InterruptedException {
         CosmosItemProperties docDefinition = getDocumentDefinition(documentId);
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java
index 730700696628..58af64103a08 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/OrderbyDocumentQueryTest.java
@@ -390,8 +390,6 @@ public void beforeMethod() throws Exception {
         TimeUnit.SECONDS.sleep(10);
     }
 
-    // TODO (DANOBLE) OrderbyDocumentQueryTest initialization intermittently times out in CI environments
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6386
     @BeforeClass(groups = { "simple" }, timeOut = 4 * SETUP_TIMEOUT)
     public void before_OrderbyDocumentQueryTest() throws Exception {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java
index b652b2f0937e..58249da49e7c 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ParallelDocumentQueryTest.java
@@ -373,8 +373,6 @@ public void queryDocumentsPojo(){
 
     }
 
-    // TODO (DANOBLE) ParallelDocumentQueryTest initialization intermittently fails in CI environments
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6398
     @BeforeClass(groups = { "simple", "non-emulator" }, timeOut = 4 * SETUP_TIMEOUT)
     public void before_ParallelDocumentQueryTest() {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java
index 772a21a17aee..6f499de9d5b9 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java
@@ -74,7 +74,9 @@ public void createDocumentWithValidHttpProxy() throws Exception {
             clientWithRightProxy = new CosmosClientBuilder().endpoint(TestConfigurations.HOST)
                                                             .key(TestConfigurations.MASTER_KEY)
                                                             .connectionPolicy(connectionPolicy)
-                                                            .consistencyLevel(ConsistencyLevel.SESSION).buildAsyncClient();
+                                                            .consistencyLevel(ConsistencyLevel.SESSION)
+                                                            .contentResponseOnWriteEnabled(true)
+                                                            .buildAsyncClient();
             CosmosItemProperties docDefinition = getDocumentDefinition();
             Mono<CosmosAsyncItemResponse<CosmosItemProperties>> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId())
                     .createItem(docDefinition, new CosmosItemRequestOptions());
@@ -108,7 +110,9 @@ public void createDocumentWithValidHttpProxyWithNettyWireLogging() throws Except
             clientWithRightProxy = new CosmosClientBuilder().endpoint(TestConfigurations.HOST)
                                                             .key(TestConfigurations.MASTER_KEY)
                                                             .connectionPolicy(connectionPolicy)
-                                                            .consistencyLevel(ConsistencyLevel.SESSION).buildAsyncClient();
+                                                            .consistencyLevel(ConsistencyLevel.SESSION)
+                                                            .contentResponseOnWriteEnabled(true)
+                                                            .buildAsyncClient();
             CosmosItemProperties docDefinition = getDocumentDefinition();
             Mono<CosmosAsyncItemResponse<CosmosItemProperties>> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId())
                     .createItem(docDefinition, new CosmosItemRequestOptions());
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java
index d0a088142328..3da9aa91f652 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ReadFeedDocumentsTest.java
@@ -77,8 +77,6 @@ public void readDocuments_withoutEnableCrossPartitionQuery() {
         validateQuerySuccess(feedObservable.byPage(maxItemCount), validator, FEED_TIMEOUT);
     }
 
-    // TODO (DANOBLE) ReadFeedDocumentsTest initialization consistently times out in CI environments.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6379
     @BeforeClass(groups = { "simple" }, timeOut = 4 * SETUP_TIMEOUT, alwaysRun = true)
     public void before_ReadFeedDocumentsTest() {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java
index df1386b7e37c..75d3c0833a3a 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/SinglePartitionReadFeedDocumentsTest.java
@@ -50,8 +50,6 @@ public void readDocuments() {
         validateQuerySuccess(feedObservable.byPage(maxItemCount), validator, FEED_TIMEOUT);
     }
 
-    // TODO (DANOBLE) SinglePartitionReadFeedDocumentsTest initialization consistently times out in CI environments.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6380
     @BeforeClass(groups = { "simple" }, timeOut = 4 * SETUP_TIMEOUT)
     public void before_SinglePartitionReadFeedDocumentsTest() {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java
index 4db0d37889a0..eb10a19ac883 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java
@@ -200,7 +200,7 @@ public static void beforeSuite() {
 
         logger.info("beforeSuite Started");
 
-        try (CosmosAsyncClient houseKeepingClient = createGatewayHouseKeepingDocumentClient().buildAsyncClient()) {
+        try (CosmosAsyncClient houseKeepingClient = createGatewayHouseKeepingDocumentClient(true).buildAsyncClient()) {
             CosmosDatabaseForTest dbForTest = CosmosDatabaseForTest.create(DatabaseManagerImpl.getInstance(houseKeepingClient));
             SHARED_DATABASE = dbForTest.createdDatabase;
             CosmosContainerRequestOptions options = new CosmosContainerRequestOptions();
@@ -216,7 +216,7 @@ public static void afterSuite() {
 
         logger.info("afterSuite Started");
 
-        try (CosmosAsyncClient houseKeepingClient = createGatewayHouseKeepingDocumentClient().buildAsyncClient()) {
+        try (CosmosAsyncClient houseKeepingClient = createGatewayHouseKeepingDocumentClient(true).buildAsyncClient()) {
             safeDeleteDatabase(SHARED_DATABASE);
             CosmosDatabaseForTest.cleanupStaleTestDatabases(DatabaseManagerImpl.getInstance(houseKeepingClient));
         }
@@ -844,15 +844,15 @@ public static <T extends Resource> void validateQueryFailure(Flux<FeedResponse<T
 
     @DataProvider
     public static Object[][] clientBuilders() {
-        return new Object[][]{{createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null)}};
+        return new Object[][]{{createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true)}};
     }
 
     @DataProvider
     public static Object[][] clientBuildersWithSessionConsistency() {
         return new Object[][]{
-            {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.HTTPS, false, null)},
-            {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.TCP, false, null)},
-            {createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null)}
+            {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.HTTPS, false, null, true)},
+            {createDirectRxDocumentClient(ConsistencyLevel.SESSION, Protocol.TCP, false, null, true)},
+            {createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true)}
         };
     }
 
@@ -900,15 +900,25 @@ static List<Protocol> parseProtocols(String protocols) {
 
     @DataProvider
     public static Object[][] simpleClientBuildersWithDirect() {
-        return simpleClientBuildersWithDirect(toArray(protocols));
+        return simpleClientBuildersWithDirect(true, toArray(protocols));
     }
 
     @DataProvider
     public static Object[][] simpleClientBuildersWithDirectHttps() {
-        return simpleClientBuildersWithDirect(Protocol.HTTPS);
+        return simpleClientBuildersWithDirect(true, Protocol.HTTPS);
     }
 
-    private static Object[][] simpleClientBuildersWithDirect(Protocol... protocols) {
+    @DataProvider
+    public static Object[][] simpleClientBuildersWithDirectTcp() {
+        return simpleClientBuildersWithDirect(true, Protocol.TCP);
+    }
+
+    @DataProvider
+    public static Object[][] simpleClientBuildersWithDirectTcpWithContentResponseOnWriteDisabled() {
+        return simpleClientBuildersWithDirect(false, Protocol.TCP);
+    }
+
+    private static Object[][] simpleClientBuildersWithDirect(boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         logger.info("Max test consistency to use is [{}]", accountConsistency);
         List<ConsistencyLevel> testConsistencies = ImmutableList.of(ConsistencyLevel.EVENTUAL);
 
@@ -921,7 +931,8 @@ private static Object[][] simpleClientBuildersWithDirect(Protocol... protocols)
                 consistencyLevel,
                 protocol,
                 isMultiMasterEnabled,
-                preferredLocations)));
+                preferredLocations,
+                contentResponseOnWriteEnabled)));
         }
 
         cosmosConfigurations.forEach(c -> {
@@ -934,39 +945,49 @@ private static Object[][] simpleClientBuildersWithDirect(Protocol... protocols)
             );
         });
 
-        cosmosConfigurations.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null));
+        cosmosConfigurations.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, contentResponseOnWriteEnabled));
 
         return cosmosConfigurations.stream().map(b -> new Object[]{b}).collect(Collectors.toList()).toArray(new Object[0][]);
     }
 
     @DataProvider
     public static Object[][] clientBuildersWithDirect() {
-        return clientBuildersWithDirectAllConsistencies(toArray(protocols));
+        return clientBuildersWithDirectAllConsistencies(true, toArray(protocols));
     }
 
     @DataProvider
     public static Object[][] clientBuildersWithDirectHttps() {
-        return clientBuildersWithDirectAllConsistencies(Protocol.HTTPS);
+        return clientBuildersWithDirectAllConsistencies(true, Protocol.HTTPS);
+    }
+
+    @DataProvider
+    public static Object[][] clientBuildersWithDirectTcp() {
+        return clientBuildersWithDirectAllConsistencies(true, Protocol.TCP);
+    }
+
+    @DataProvider
+    public static Object[][] clientBuildersWithDirectTcpWithContentResponseOnWriteDisabled() {
+        return clientBuildersWithDirectAllConsistencies(false, Protocol.TCP);
     }
 
     @DataProvider
     public static Object[][] clientBuildersWithDirectSession() {
-        return clientBuildersWithDirectSession(toArray(protocols));
+        return clientBuildersWithDirectSession(true, toArray(protocols));
     }
 
     static Protocol[] toArray(List<Protocol> protocols) {
         return protocols.toArray(new Protocol[protocols.size()]);
     }
 
-    private static Object[][] clientBuildersWithDirectSession(Protocol... protocols) {
+    private static Object[][] clientBuildersWithDirectSession(boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         return clientBuildersWithDirect(new ArrayList<ConsistencyLevel>() {{
             add(ConsistencyLevel.SESSION);
-        }}, protocols);
+        }}, contentResponseOnWriteEnabled, protocols);
     }
 
-    private static Object[][] clientBuildersWithDirectAllConsistencies(Protocol... protocols) {
+    private static Object[][] clientBuildersWithDirectAllConsistencies(boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         logger.info("Max test consistency to use is [{}]", accountConsistency);
-        return clientBuildersWithDirect(desiredConsistencies, protocols);
+        return clientBuildersWithDirect(desiredConsistencies, contentResponseOnWriteEnabled, protocols);
     }
 
     static List<ConsistencyLevel> parseDesiredConsistencies(String consistencies) {
@@ -1008,7 +1029,7 @@ static List<ConsistencyLevel> allEqualOrLowerConsistencies(ConsistencyLevel acco
         return testConsistencies;
     }
 
-    private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testConsistencies, Protocol... protocols) {
+    private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testConsistencies, boolean contentResponseOnWriteEnabled, Protocol... protocols) {
         boolean isMultiMasterEnabled = preferredLocations != null && accountConsistency == ConsistencyLevel.SESSION;
 
         List<CosmosClientBuilder> cosmosConfigurations = new ArrayList<>();
@@ -1017,7 +1038,8 @@ private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testCo
             testConsistencies.forEach(consistencyLevel -> cosmosConfigurations.add(createDirectRxDocumentClient(consistencyLevel,
                 protocol,
                 isMultiMasterEnabled,
-                preferredLocations)));
+                preferredLocations,
+                contentResponseOnWriteEnabled)));
         }
 
         cosmosConfigurations.forEach(c -> {
@@ -1030,42 +1052,46 @@ private static Object[][] clientBuildersWithDirect(List<ConsistencyLevel> testCo
             );
         });
 
-        cosmosConfigurations.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, isMultiMasterEnabled, preferredLocations));
+        cosmosConfigurations.add(createGatewayRxDocumentClient(ConsistencyLevel.SESSION, isMultiMasterEnabled, preferredLocations, contentResponseOnWriteEnabled));
 
         return cosmosConfigurations.stream().map(c -> new Object[]{c}).collect(Collectors.toList()).toArray(new Object[0][]);
     }
 
-    static protected CosmosClientBuilder createGatewayHouseKeepingDocumentClient() {
+    static protected CosmosClientBuilder createGatewayHouseKeepingDocumentClient(boolean contentResponseOnWriteEnabled) {
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.GATEWAY);
         ThrottlingRetryOptions options = new ThrottlingRetryOptions();
         options.setMaxRetryWaitTime(Duration.ofSeconds(SUITE_SETUP_TIMEOUT));
         connectionPolicy.setThrottlingRetryOptions(options);
         return new CosmosClientBuilder().endpoint(TestConfigurations.HOST)
-            .keyCredential(cosmosKeyCredential)
-            .connectionPolicy(connectionPolicy)
-            .consistencyLevel(ConsistencyLevel.SESSION);
+                                        .keyCredential(cosmosKeyCredential)
+                                        .connectionPolicy(connectionPolicy)
+                                        .contentResponseOnWriteEnabled(contentResponseOnWriteEnabled)
+                                        .consistencyLevel(ConsistencyLevel.SESSION);
     }
 
-    static protected CosmosClientBuilder createGatewayRxDocumentClient(ConsistencyLevel consistencyLevel, boolean multiMasterEnabled, List<String> preferredRegions) {
+    static protected CosmosClientBuilder createGatewayRxDocumentClient(ConsistencyLevel consistencyLevel, boolean multiMasterEnabled,
+                                                                       List<String> preferredRegions, boolean contentResponseOnWriteEnabled) {
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.GATEWAY);
         connectionPolicy.setUsingMultipleWriteRegions(multiMasterEnabled);
         connectionPolicy.setPreferredRegions(preferredRegions);
         return new CosmosClientBuilder().endpoint(TestConfigurations.HOST)
-            .keyCredential(cosmosKeyCredential)
-            .connectionPolicy(connectionPolicy)
-            .consistencyLevel(consistencyLevel);
+                                        .keyCredential(cosmosKeyCredential)
+                                        .connectionPolicy(connectionPolicy)
+                                        .contentResponseOnWriteEnabled(contentResponseOnWriteEnabled)
+                                        .consistencyLevel(consistencyLevel);
     }
 
     static protected CosmosClientBuilder createGatewayRxDocumentClient() {
-        return createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null);
+        return createGatewayRxDocumentClient(ConsistencyLevel.SESSION, false, null, true);
     }
 
     static protected CosmosClientBuilder createDirectRxDocumentClient(ConsistencyLevel consistencyLevel,
                                                                       Protocol protocol,
                                                                       boolean multiMasterEnabled,
-                                                                      List<String> preferredRegions) {
+                                                                      List<String> preferredRegions,
+                                                                      boolean contentResponseOnWriteEnabled) {
         ConnectionPolicy connectionPolicy = new ConnectionPolicy();
         connectionPolicy.setConnectionMode(ConnectionMode.DIRECT);
 
@@ -1081,9 +1107,10 @@ static protected CosmosClientBuilder createDirectRxDocumentClient(ConsistencyLev
         doAnswer((Answer<Protocol>)invocation -> protocol).when(configs).getProtocol();
 
         CosmosClientBuilder builder = new CosmosClientBuilder().endpoint(TestConfigurations.HOST)
-            .keyCredential(cosmosKeyCredential)
-            .connectionPolicy(connectionPolicy)
-            .consistencyLevel(consistencyLevel);
+                                                               .keyCredential(cosmosKeyCredential)
+                                                               .connectionPolicy(connectionPolicy)
+                                                               .contentResponseOnWriteEnabled(contentResponseOnWriteEnabled)
+                                                               .consistencyLevel(consistencyLevel);
 
         return injectConfigs(builder, configs);
     }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java
index 1e500fe5d716..4a71ad9c734f 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UniqueIndexTest.java
@@ -16,7 +16,6 @@
 import com.azure.cosmos.models.CosmosItemRequestOptions;
 import com.azure.cosmos.models.DataType;
 import com.azure.cosmos.models.ExcludedPath;
-import com.azure.cosmos.models.HashIndex;
 import com.azure.cosmos.models.IncludedPath;
 import com.azure.cosmos.models.Index;
 import com.azure.cosmos.models.IndexingMode;
@@ -224,7 +223,9 @@ public void before_UniqueIndexTest() {
             .endpoint(TestConfigurations.HOST)
             .key(TestConfigurations.MASTER_KEY)
             .connectionPolicy(ConnectionPolicy.getDefaultPolicy())
-            .consistencyLevel(ConsistencyLevel.SESSION).buildAsyncClient();
+            .consistencyLevel(ConsistencyLevel.SESSION)
+            .contentResponseOnWriteEnabled(true)
+            .buildAsyncClient();
 
         database = createDatabase(client, databaseId);
     }
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java
index 2b91a91ae316..880c1b99eb89 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/UserDefinedFunctionUpsertReplaceTest.java
@@ -65,8 +65,6 @@ public void replaceUserDefinedFunction() throws Exception {
         validateSuccess(replaceObservable, validatorForReplace);
     }
 
-    // TODO (DANOBLE) UserDefinedFunctionUpsertReplaceTest initialization consistently times out in CI environments.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6383
     @BeforeClass(groups = { "simple" }, timeOut = 4 * SETUP_TIMEOUT)
     public void before_UserDefinedFunctionUpsertReplaceTest() {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java
index 7745887c51ed..66e652ab76cc 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java
@@ -39,9 +39,6 @@ public VeryLargeDocumentQueryTest(CosmosClientBuilder clientBuilder) {
         super(clientBuilder);
     }
 
-    // TODO (DANOBLE) VeryLargeDocumentQueryTest::queryLargeDocuments intermittently times out
-    //  Move this test back into the emulator group after we've addressed query performance on 4.X.
-    //  see https://github.com/Azure/azure-sdk-for-java/issues/6377
     @Test(groups = { "simple" }, timeOut = 2 * TIMEOUT)
     public void queryLargeDocuments() {
 
@@ -83,8 +80,6 @@ private void createLargeDocument() {
                     .verify(Duration.ofMillis(subscriberValidationTimeout));
     }
 
-    // TODO (DANOBLE) beforeClass method intermittently times out within the SETUP_TIMEOUT interval.
-    //  see see https://github.com/Azure/azure-sdk-for-java/issues/6377
     @BeforeClass(groups = { "simple" }, timeOut = 2 * SETUP_TIMEOUT)
     public void before_VeryLargeDocumentQueryTest() {
         client = getClientBuilder().buildAsyncClient();

From e5a6380dbf51cf491d9f0d7d5e2cf35a47c4e5ff Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Thu, 7 May 2020 10:31:52 -0700
Subject: [PATCH 23/41] Increment package version after release of com.azure
 azure-ai-formrecognizer (#10844)

---
 eng/jacoco-test-coverage/pom.xml                        | 2 +-
 eng/versioning/version_client.txt                       | 2 +-
 sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md | 3 +++
 sdk/formrecognizer/azure-ai-formrecognizer/pom.xml      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index d04257b07b24..eaf139b86543 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-ai-formrecognizer</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
+      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 6868415b26ca..d3d659b84370 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -4,7 +4,7 @@
 com.azure:azure-sdk-all;1.0.0;1.0.0
 com.azure:azure-sdk-parent;1.6.0;1.6.0
 com.azure:azure-client-sdk-parent;1.7.0;1.7.0
-com.azure:azure-ai-formrecognizer;1.0.0-beta.1;1.0.0-beta.2
+com.azure:azure-ai-formrecognizer;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-ai-textanalytics;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-core;1.5.0;1.6.0-beta.1
 com.azure:azure-core-amqp;1.1.0;1.1.1
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
index 3c2e00b52909..ab7df47266ef 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.0.0-beta.3 (Unreleased)
+
+
 ## 1.0.0-beta.2 (2020-05-06)
 - Fixed Receipt type bug to select the valueString field via fieldValue.
 - Rename `apiKey()` to `credential()` on FormRecognizerClientBuilder.
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
index 72b87984540d..f258c9b723a1 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-ai-formrecognizer</artifactId>
-  <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
+  <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-ai-formrecognizer;current} -->
 
   <name>Microsoft Azure client library for Form Recognizer</name>
   <description>This package contains the Microsoft Azure Cognitive Services Form Recognizer SDK.</description>

From 91c6331c28061c28272785576348375315feaeb8 Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Thu, 7 May 2020 11:43:50 -0700
Subject: [PATCH 24/41] Fix link size error after reconnection (#10825)

* Fix link size error after reconnection

* Change visibility of internal method

* Fix checkstyle
---
 .../amqp/implementation/ReactorSender.java    | 173 +++++++++--------
 .../amqp/implementation/ReactorSession.java   |   2 +-
 .../implementation/ReactorSenderTest.java     | 182 ++++++++++++++++++
 3 files changed, 272 insertions(+), 85 deletions(-)
 create mode 100644 sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorSenderTest.java

diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSender.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSender.java
index 53b714032703..8230223b058c 100644
--- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSender.java
+++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSender.java
@@ -77,7 +77,6 @@ class ReactorSender implements AmqpSendLink {
         ReplayProcessor.cacheLastOrDefault(AmqpEndpointState.UNINITIALIZED);
     private FluxSink<AmqpEndpointState> endpointStateSink = endpointStates.sink(FluxSink.OverflowStrategy.BUFFER);
 
-
     private final TokenManager tokenManager;
     private final MessageSerializer messageSerializer;
     private final AmqpRetryPolicy retry;
@@ -88,16 +87,10 @@ class ReactorSender implements AmqpSendLink {
 
     private volatile Exception lastKnownLinkError;
     private volatile Instant lastKnownErrorReportedAt;
-
-    /**
-     * Max message size can change from its initial value. When the send link is opened, we query for the remote link
-     * capacity.
-     */
-    private volatile int maxMessageSize;
+    private volatile int linkSize;
 
     ReactorSender(String entityPath, Sender sender, SendLinkHandler handler, ReactorProvider reactorProvider,
-        TokenManager tokenManager, MessageSerializer messageSerializer, Duration timeout, AmqpRetryPolicy retry,
-        int maxMessageSize) {
+        TokenManager tokenManager, MessageSerializer messageSerializer, Duration timeout, AmqpRetryPolicy retry) {
         this.entityPath = entityPath;
         this.sender = sender;
         this.handler = handler;
@@ -106,7 +99,6 @@ class ReactorSender implements AmqpSendLink {
         this.messageSerializer = messageSerializer;
         this.retry = retry;
         this.timeout = timeout;
-        this.maxMessageSize = maxMessageSize;
 
         this.subscriptions = Disposables.composite(
             this.handler.getDeliveredMessages().subscribe(this::processDeliveredMessage),
@@ -155,26 +147,27 @@ public Flux<AmqpEndpointState> getEndpointStates() {
 
     @Override
     public Mono<Void> send(Message message) {
-        final int payloadSize = messageSerializer.getSize(message);
-        final int allocationSize =
-            Math.min(payloadSize + MAX_AMQP_HEADER_SIZE_BYTES, maxMessageSize);
-        final byte[] bytes = new byte[allocationSize];
-
-        int encodedSize;
-        try {
-            encodedSize = message.encode(bytes, 0, allocationSize);
-        } catch (BufferOverflowException exception) {
-            final String errorMessage =
-                String.format(Locale.US,
-                    "Error sending. Size of the payload exceeded maximum message size: %s kb",
-                    maxMessageSize / 1024);
-            final Throwable error = new AmqpException(false, AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED,
-                errorMessage, exception, handler.getErrorContext(sender));
-
-            return Mono.error(error);
-        }
-
-        return send(bytes, encodedSize, DeliveryImpl.DEFAULT_MESSAGE_FORMAT);
+        return getLinkSize()
+            .flatMap(maxMessageSize -> {
+                final int payloadSize = messageSerializer.getSize(message);
+                final int allocationSize =
+                    Math.min(payloadSize + MAX_AMQP_HEADER_SIZE_BYTES, maxMessageSize);
+                final byte[] bytes = new byte[allocationSize];
+
+                int encodedSize;
+                try {
+                    encodedSize = message.encode(bytes, 0, allocationSize);
+                } catch (BufferOverflowException exception) {
+                    final String errorMessage =
+                        String.format(Locale.US,
+                            "Error sending. Size of the payload exceeded maximum message size: %s kb",
+                            maxMessageSize / 1024);
+                    final Throwable error = new AmqpException(false, AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED,
+                        errorMessage, exception, handler.getErrorContext(sender));
+                    return Mono.error(error);
+                }
+                return send(bytes, encodedSize, DeliveryImpl.DEFAULT_MESSAGE_FORMAT);
+            });
     }
 
     @Override
@@ -183,48 +176,54 @@ public Mono<Void> send(List<Message> messageBatch) {
             return send(messageBatch.get(0));
         }
 
-        final Message firstMessage = messageBatch.get(0);
-
-        // proton-j doesn't support multiple dataSections to be part of AmqpMessage
-        // here's the alternate approach provided by them: https://github.com/apache/qpid-proton/pull/54
-        final Message batchMessage = Proton.message();
-        batchMessage.setMessageAnnotations(firstMessage.getMessageAnnotations());
-
-        final int maxMessageSizeTemp = this.maxMessageSize;
-
-        final byte[] bytes = new byte[maxMessageSizeTemp];
-        int encodedSize = batchMessage.encode(bytes, 0, maxMessageSizeTemp);
-        int byteArrayOffset = encodedSize;
-
-        for (final Message amqpMessage : messageBatch) {
-            final Message messageWrappedByData = Proton.message();
+        return getLinkSize()
+            .flatMap(maxMessageSize -> {
+                final Message firstMessage = messageBatch.get(0);
+
+                // proton-j doesn't support multiple dataSections to be part of AmqpMessage
+                // here's the alternate approach provided by them: https://github.com/apache/qpid-proton/pull/54
+                final Message batchMessage = Proton.message();
+                batchMessage.setMessageAnnotations(firstMessage.getMessageAnnotations());
+
+                final int maxMessageSizeTemp = maxMessageSize;
+
+                final byte[] bytes = new byte[maxMessageSizeTemp];
+                int encodedSize = batchMessage.encode(bytes, 0, maxMessageSizeTemp);
+                int byteArrayOffset = encodedSize;
+
+                for (final Message amqpMessage : messageBatch) {
+                    final Message messageWrappedByData = Proton.message();
+
+                    int payloadSize = messageSerializer.getSize(amqpMessage);
+                    int allocationSize =
+                        Math.min(payloadSize + MAX_AMQP_HEADER_SIZE_BYTES, maxMessageSizeTemp);
+
+                    byte[] messageBytes = new byte[allocationSize];
+                    int messageSizeBytes = amqpMessage.encode(messageBytes, 0, allocationSize);
+                    messageWrappedByData.setBody(new Data(new Binary(messageBytes, 0, messageSizeBytes)));
+
+                    try {
+                        encodedSize =
+                            messageWrappedByData
+                                .encode(bytes, byteArrayOffset, maxMessageSizeTemp - byteArrayOffset - 1);
+                    } catch (BufferOverflowException exception) {
+                        final String message =
+                            String.format(Locale.US,
+                                "Size of the payload exceeded maximum message size: %s kb",
+                                maxMessageSizeTemp / 1024);
+                        final AmqpException error = new AmqpException(false,
+                            AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED, message, exception,
+                            handler.getErrorContext(sender));
+
+                        return Mono.error(error);
+                    }
 
-            int payloadSize = messageSerializer.getSize(amqpMessage);
-            int allocationSize =
-                Math.min(payloadSize + MAX_AMQP_HEADER_SIZE_BYTES, maxMessageSizeTemp);
+                    byteArrayOffset = byteArrayOffset + encodedSize;
+                }
 
-            byte[] messageBytes = new byte[allocationSize];
-            int messageSizeBytes = amqpMessage.encode(messageBytes, 0, allocationSize);
-            messageWrappedByData.setBody(new Data(new Binary(messageBytes, 0, messageSizeBytes)));
+                return send(bytes, byteArrayOffset, AmqpConstants.AMQP_BATCH_MESSAGE_FORMAT);
+            });
 
-            try {
-                encodedSize =
-                    messageWrappedByData.encode(bytes, byteArrayOffset, maxMessageSizeTemp - byteArrayOffset - 1);
-            } catch (BufferOverflowException exception) {
-                final String message =
-                    String.format(Locale.US,
-                        "Size of the payload exceeded maximum message size: %s kb",
-                        maxMessageSizeTemp / 1024);
-                final AmqpException error = new AmqpException(false, AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED,
-                    message, exception, handler.getErrorContext(sender));
-
-                return Mono.error(error);
-            }
-
-            byteArrayOffset = byteArrayOffset + encodedSize;
-        }
-
-        return send(bytes, byteArrayOffset, AmqpConstants.AMQP_BATCH_MESSAGE_FORMAT);
     }
 
     @Override
@@ -249,23 +248,29 @@ public String getHostname() {
 
     @Override
     public Mono<Integer> getLinkSize() {
-        if (this.hasConnected.get() && this.maxMessageSize > 0) {
-            return Mono.just(maxMessageSize);
+        if (linkSize > 0) {
+            return Mono.just(this.linkSize);
         }
 
-        return RetryUtil.withRetry(
-            getEndpointStates()
-                .takeUntil(state -> state == AmqpEndpointState.ACTIVE)
-                .then(Mono.fromCallable(() -> {
-                    final UnsignedLong remoteMaxMessageSize = sender.getRemoteMaxMessageSize();
-
-                    if (remoteMaxMessageSize != null) {
-                        this.maxMessageSize = remoteMaxMessageSize.intValue();
-                    }
+        synchronized (this) {
+            if (linkSize > 0) {
+                return Mono.just(this.linkSize);
+            }
 
-                    return this.maxMessageSize;
-                })),
-            timeout, retry);
+            return RetryUtil.withRetry(
+                getEndpointStates()
+                    .takeUntil(state -> state == AmqpEndpointState.ACTIVE)
+                    .then(Mono.fromCallable(() -> {
+                        final UnsignedLong remoteMaxMessageSize = sender.getRemoteMaxMessageSize();
+
+                        if (remoteMaxMessageSize != null) {
+                            this.linkSize = remoteMaxMessageSize.intValue();
+                        }
+
+                        return this.linkSize;
+                    })),
+                timeout, retry);
+        }
     }
 
     @Override
@@ -284,7 +289,7 @@ public void dispose() {
         tokenManager.close();
     }
 
-    private Mono<Void> send(byte[] bytes, int arrayOffset, int messageFormat) {
+    Mono<Void> send(byte[] bytes, int arrayOffset, int messageFormat) {
         if (hasConnected.get()) {
             return Mono.create(sink -> send(new RetriableWorkItem(bytes, arrayOffset, messageFormat, sink, timeout)));
         } else {
diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSession.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSession.java
index 0f52af5038f0..6308e628c7b7 100644
--- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSession.java
+++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorSession.java
@@ -336,7 +336,7 @@ private LinkSubscription<AmqpSendLink> getSubscription(String linkName, String e
         sender.open();
 
         final ReactorSender reactorSender = new ReactorSender(entityPath, sender, sendLinkHandler, provider,
-            tokenManager, messageSerializer, timeout, retry, ClientConstants.MAX_MESSAGE_LENGTH_BYTES);
+            tokenManager, messageSerializer, timeout, retry);
 
         final Disposable subscription = reactorSender.getEndpointStates().subscribe(state -> {
         }, error -> {
diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorSenderTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorSenderTest.java
new file mode 100644
index 000000000000..58cf1b7a341d
--- /dev/null
+++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorSenderTest.java
@@ -0,0 +1,182 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.core.amqp.implementation;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.azure.core.amqp.AmqpRetryOptions;
+import com.azure.core.amqp.ExponentialAmqpRetryPolicy;
+import com.azure.core.amqp.exception.AmqpException;
+import com.azure.core.amqp.exception.AmqpResponseCode;
+import com.azure.core.amqp.implementation.handler.SendLinkHandler;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import org.apache.qpid.proton.Proton;
+import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
+import org.apache.qpid.proton.engine.Delivery;
+import org.apache.qpid.proton.engine.EndpointState;
+import org.apache.qpid.proton.engine.Record;
+import org.apache.qpid.proton.engine.Sender;
+import org.apache.qpid.proton.message.Message;
+import org.apache.qpid.proton.reactor.Reactor;
+import org.apache.qpid.proton.reactor.Selectable;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+/**
+ * Unit tests for {@link ReactorSender}
+ */
+public class ReactorSenderTest {
+
+    private String entityPath = "entity-path";
+
+    @Mock
+    private Sender sender;
+    @Mock
+    private SendLinkHandler handler;
+    @Mock
+    private ReactorProvider reactorProvider;
+    @Mock
+    private TokenManager tokenManager;
+    @Mock
+    private Reactor reactor;
+    @Mock
+    private Selectable selectable;
+    @Mock
+    private MessageSerializer messageSerializer;
+
+    @BeforeEach
+    public void setup() throws IOException {
+        MockitoAnnotations.initMocks(this);
+
+        Delivery delivery = mock(Delivery.class);
+        when(delivery.getRemoteState()).thenReturn(Accepted.getInstance());
+        when(delivery.getTag()).thenReturn("tag".getBytes());
+        when(handler.getDeliveredMessages()).thenReturn(Flux.just(delivery));
+        when(reactor.selectable()).thenReturn(selectable);
+
+        when(handler.getLinkCredits()).thenReturn(Flux.just(100));
+        when(handler.getEndpointStates()).thenReturn(Flux.just(EndpointState.ACTIVE));
+        when(handler.getErrors()).thenReturn(Flux.empty());
+        when(tokenManager.getAuthorizationResults()).thenReturn(Flux.just(AmqpResponseCode.ACCEPTED));
+        when(sender.getCredit()).thenReturn(0);
+        doNothing().when(selectable).setChannel(any());
+        doNothing().when(selectable).onReadable(any());
+        doNothing().when(selectable).onFree(any());
+        doNothing().when(selectable).setReading(true);
+        doNothing().when(reactor).update(selectable);
+        ReactorDispatcher reactorDispatcher = new ReactorDispatcher(reactor);
+        when(reactor.attachments()).thenReturn(new Record() {
+            @Override
+            public <T> T get(Object o, Class<T> aClass) {
+                return null;
+            }
+
+            @Override
+            public <T> void set(Object o, Class<T> aClass, T t) {
+
+            }
+
+            @Override
+            public void clear() {
+
+            }
+        });
+        when(reactorProvider.getReactorDispatcher()).thenReturn(reactorDispatcher);
+        when(sender.getRemoteMaxMessageSize()).thenReturn(UnsignedLong.valueOf(1000));
+    }
+
+    @Test
+    public void testLinkSize() throws IOException {
+        ReactorSender reactorSender = new ReactorSender(entityPath, sender, handler, reactorProvider, tokenManager,
+            messageSerializer, Duration.ofSeconds(1), new ExponentialAmqpRetryPolicy(new AmqpRetryOptions()));
+        StepVerifier.create(reactorSender.getLinkSize())
+            .expectNext(1000)
+            .verifyComplete();
+        StepVerifier.create(reactorSender.getLinkSize())
+            .expectNext(1000)
+            .verifyComplete();
+        verify(sender, times(1)).getRemoteMaxMessageSize();
+    }
+
+    @Test
+    public void testSend() {
+        Message message = Proton.message();
+        message.setMessageId("id");
+        message.setBody(new AmqpValue("hello"));
+        ReactorSender reactorSender = new ReactorSender(entityPath, sender, handler, reactorProvider, tokenManager,
+            messageSerializer, Duration.ofSeconds(1), new ExponentialAmqpRetryPolicy(new AmqpRetryOptions()));
+        ReactorSender spyReactorSender = spy(reactorSender);
+
+        doReturn(Mono.empty()).when(spyReactorSender).send(any(byte[].class), anyInt(), anyInt());
+        StepVerifier.create(spyReactorSender.send(message))
+            .verifyComplete();
+        StepVerifier.create(spyReactorSender.send(message))
+            .verifyComplete();
+        verify(sender, times(1)).getRemoteMaxMessageSize();
+        verify(spyReactorSender, times(2)).send(any(byte[].class), anyInt(), anyInt());
+    }
+
+    @Test
+    public void testSendBatch() {
+        Message message = Proton.message();
+        message.setMessageId("id1");
+        message.setBody(new AmqpValue("hello"));
+
+        Message message2 = Proton.message();
+        message2.setMessageId("id2");
+        message2.setBody(new AmqpValue("world"));
+
+        ReactorSender reactorSender = new ReactorSender(entityPath, sender, handler, reactorProvider, tokenManager,
+            messageSerializer, Duration.ofSeconds(1), new ExponentialAmqpRetryPolicy(new AmqpRetryOptions()));
+        ReactorSender spyReactorSender = spy(reactorSender);
+
+        doReturn(Mono.empty()).when(spyReactorSender).send(any(byte[].class), anyInt(), anyInt());
+        StepVerifier.create(spyReactorSender.send(Arrays.asList(message, message2)))
+            .verifyComplete();
+        StepVerifier.create(spyReactorSender.send(Arrays.asList(message, message2)))
+            .verifyComplete();
+        verify(sender, times(1)).getRemoteMaxMessageSize();
+        verify(spyReactorSender, times(2)).send(any(byte[].class), anyInt(), anyInt());
+    }
+
+    @Test
+    public void testLinkSizeSmallerThanMessageSize() {
+        when(sender.getRemoteMaxMessageSize()).thenReturn(UnsignedLong.valueOf(10));
+        Message message = Proton.message();
+        message.setMessageId("id");
+        message.setBody(new AmqpValue("hello"));
+        ReactorSender reactorSender = new ReactorSender(entityPath, sender, handler, reactorProvider, tokenManager,
+            messageSerializer, Duration.ofSeconds(1), new ExponentialAmqpRetryPolicy(new AmqpRetryOptions()));
+        ReactorSender spyReactorSender = spy(reactorSender);
+
+        doReturn(Mono.empty()).when(spyReactorSender).send(any(byte[].class), anyInt(), anyInt());
+        StepVerifier.create(spyReactorSender.send(message))
+            .verifyErrorSatisfies(throwable -> {
+                Assertions.assertTrue(throwable instanceof AmqpException);
+                Assertions.assertTrue(throwable.getMessage().startsWith("Error sending. Size of the payload exceeded "
+                    + "maximum message size"));
+            });
+        verify(sender, times(1)).getRemoteMaxMessageSize();
+        verify(spyReactorSender, times(0)).send(any(byte[].class), anyInt(), anyInt());
+    }
+
+}

From d9b9ab5e99388e2b5c487e4f1eee7f2ca930ea97 Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Thu, 7 May 2020 11:46:19 -0700
Subject: [PATCH 25/41] Update changelog (#10901)

---
 .../azure-messaging-servicebus/CHANGELOG.md           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
index 9c2fb0cf29b1..eba6c5777c96 100644
--- a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
+++ b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
@@ -3,12 +3,15 @@
 ## 7.0.0-beta.2 (2020-05-07)
 
 - Add support for receiving messages from specific sessions
-- Add support for processing messages from multiple sessions
+- Add support for receiving messages from multiple sessions
 - Add missing schedule and cancel APIs in ServiceBusSenderClient
-- Add support to send a collection of messages at once
-- Change return type from `ServiceBusReceivedMessage` to `ServiceBusReceivedMessageContext` when calling `receive()`
+- Add support to send a collection of messages at once without needing to create a `ServiceBusMessageBatch` first. This
+  will throw an error/exception will the messages cannot fit as per batch size restrictions
+- Change return type from `ServiceBusReceivedMessage` to `ServiceBusReceivedMessageContext` when calling `receive()` so
+  users can distinguish between transient failure scenarios where receiving continues and an actual terminal signal that
+  is signaled through the downstream `onError`.
 - Fix message settlement to occur on receive link
-- Various bug fixes
+- Fix issue where backpressure is not properly supported
 
 ## 7.0.0-beta.1 (2020-04-06)
 

From b0ed22d04ba60856c841d0e6579abe921acf8a93 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Thu, 7 May 2020 13:56:00 -0700
Subject: [PATCH 26/41] Increment package version after release of com.azure
 azure-core-amqp (#10912)

---
 eng/jacoco-test-coverage/pom.xml      | 2 +-
 eng/versioning/version_client.txt     | 2 +-
 sdk/core/azure-core-amqp/CHANGELOG.md | 3 +++
 sdk/core/azure-core-amqp/pom.xml      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index eaf139b86543..917e3fbc14f3 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
+      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index d3d659b84370..47322524d680 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -7,7 +7,7 @@ com.azure:azure-client-sdk-parent;1.7.0;1.7.0
 com.azure:azure-ai-formrecognizer;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-ai-textanalytics;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-core;1.5.0;1.6.0-beta.1
-com.azure:azure-core-amqp;1.1.0;1.1.1
+com.azure:azure-core-amqp;1.1.1;1.2.0-beta.1
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-http-netty;1.5.1;1.6.0-beta.1
 com.azure:azure-core-http-okhttp;1.2.2;1.3.0-beta.1
diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md
index 3be470179800..b5713e7fb93e 100644
--- a/sdk/core/azure-core-amqp/CHANGELOG.md
+++ b/sdk/core/azure-core-amqp/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.2.0-beta.1 (Unreleased)
+
+
 ## 1.1.1 (2020-05-07)
 - Bug fix to get link size from service the first time before sending message from `ReactorSender`.
 
diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
index 3d4af2f99744..9781cc97670a 100644
--- a/sdk/core/azure-core-amqp/pom.xml
+++ b/sdk/core/azure-core-amqp/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-amqp</artifactId>
-  <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
+  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Java Core AMQP Library</name>

From 6ea230ecefff540fa11a7af5fc1bc9301f106f2b Mon Sep 17 00:00:00 2001
From: Hemant Tanwar <hemant_tanwar@hotmail.com>
Date: Thu, 7 May 2020 15:02:04 -0700
Subject: [PATCH 27/41] SyncClient: Bug fix - Multiple Receive on same client
 (#10734)

* SyncReceiverClient: Should be able to call receive() multiple times on same receiver client.
---
 .../ServiceBusReceiverAsyncClient.java        |  7 +++
 .../servicebus/ServiceBusReceiverClient.java  | 39 ++++++++++++----
 ...rviceBusReceiverClientIntegrationTest.java | 44 +++++++++++++------
 .../ServiceBusReceiverClientTest.java         |  7 ++-
 4 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java
index 563bc090759a..70262794a3ee 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java
@@ -999,6 +999,13 @@ private ServiceBusAsyncConsumer getOrCreateConsumer(ReceiveAsyncOptions options)
         }
     }
 
+    /**
+     *
+     * @return receiver options set by user;
+     */
+    ReceiverOptions getReceiverOptions() {
+        return receiverOptions;
+    }
     /**
      * Renews the message lock, and updates its value in the container.
      */
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java
index f92f35180abf..ef7c67dc9d2d 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java
@@ -9,6 +9,7 @@
 import com.azure.messaging.servicebus.models.DeadLetterOptions;
 import com.azure.messaging.servicebus.models.ReceiveAsyncOptions;
 import com.azure.messaging.servicebus.models.ReceiveMode;
+import reactor.core.publisher.EmitterProcessor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 
@@ -17,6 +18,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * A <b>synchronous</b> receiver responsible for receiving {@link ServiceBusReceivedMessage} from a specific queue or
@@ -34,10 +36,14 @@ public final class ServiceBusReceiverClient implements AutoCloseable {
     private final AtomicInteger idGenerator = new AtomicInteger();
     private final ServiceBusReceiverAsyncClient asyncClient;
     private final Duration operationTimeout;
+    private final Object lock = new Object();
     private static final ReceiveAsyncOptions DEFAULT_RECEIVE_OPTIONS = new ReceiveAsyncOptions()
         .setIsAutoCompleteEnabled(false)
         .setMaxAutoLockRenewalDuration(Duration.ZERO);
 
+    private final AtomicReference<EmitterProcessor<ServiceBusReceivedMessageContext>> messageProcessor =
+        new AtomicReference<>();
+
     /**
      * Creates a synchronous receiver given its asynchronous counterpart.
      *
@@ -606,20 +612,35 @@ public void setSessionState(String sessionId, byte[] sessionState) {
     @Override
     public void close() {
         asyncClient.close();
+
+        EmitterProcessor<ServiceBusReceivedMessageContext> processor = messageProcessor.getAndSet(null);
+        if (processor != null) {
+            processor.onComplete();
+        }
     }
 
     /**
-     * Given an {@code emitter}, queues that work in {@link SynchronousMessageSubscriber}. If the synchronous job has
-     * not been created, will initialise it.
+     * Given an {@code emitter}, creates a {@link SynchronousMessageSubscriber} to receive messages from Service Bus
+     * entity.
      */
     private void queueWork(int maximumMessageCount, Duration maxWaitTime,
         FluxSink<ServiceBusReceivedMessageContext> emitter) {
-        final long id = idGenerator.getAndIncrement();
-        final SynchronousReceiveWork work = new SynchronousReceiveWork(id, maximumMessageCount, maxWaitTime,
-            emitter);
-        final SynchronousMessageSubscriber syncSubscriber = new SynchronousMessageSubscriber(work);
-
-        logger.info("[{}]: Started synchronous message subscriber.", id);
-        asyncClient.receive(DEFAULT_RECEIVE_OPTIONS).subscribeWith(syncSubscriber);
+        synchronized (lock) {
+            final long id = idGenerator.getAndIncrement();
+            EmitterProcessor<ServiceBusReceivedMessageContext> emitterProcessor = messageProcessor.get();
+
+            final SynchronousReceiveWork work = new SynchronousReceiveWork(id, maximumMessageCount, maxWaitTime,
+                emitter);
+            final SynchronousMessageSubscriber syncSubscriber = new SynchronousMessageSubscriber(work);
+            logger.info("[{}]: Started synchronous message subscriber.", id);
+
+            if (emitterProcessor == null) {
+                emitterProcessor = this.asyncClient.receive(DEFAULT_RECEIVE_OPTIONS)
+                    .subscribeWith(EmitterProcessor.create(asyncClient.getReceiverOptions().getPrefetchCount(), false));
+                messageProcessor.set(emitterProcessor);
+            }
+
+            emitterProcessor.subscribe(syncSubscriber);
+        }
     }
 }
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java
index 256c128f9587..e69d9f2794c4 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java
@@ -27,7 +27,6 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -71,7 +70,7 @@ protected void afterTest() {
         if (pending > 0) {
             try {
                 IterableStream<ServiceBusReceivedMessageContext> removedMessage = receiveAndDeleteReceiver.receive(
-                    pending + BUFFER_MESSAGES_TO_REMOVE, Duration.ofSeconds(15));
+                    pending, Duration.ofSeconds(15));
 
                 removedMessage.stream().forEach(context -> {
                     ServiceBusReceivedMessage message = context.getMessage();
@@ -98,7 +97,7 @@ protected void afterTest() {
     }
 
     /**
-     * Verifies that we can only call receive() once only.
+     * Verifies that we can only call receive() multiple times.
      */
     @MethodSource("messagingEntityWithSessions")
     @ParameterizedTest
@@ -106,16 +105,35 @@ void receiveByTwoSubscriber(MessagingEntityType entityType, boolean isSessionEna
         // Arrange
         setSenderAndReceiver(entityType, isSessionEnabled);
         final int maxMessages = 1;
-        final Duration shortTimeOut = Duration.ofSeconds(5);
+        final int totalReceive = 3;
+        final Duration shortTimeOut = Duration.ofSeconds(8);
 
-        // Act & Assert
-        final IterableStream<ServiceBusReceivedMessageContext> messages = receiver.receive(maxMessages, shortTimeOut);
+        final String messageId = UUID.randomUUID().toString();
+        final ServiceBusMessage message = getMessage(messageId, isSessionEnabled);
 
-        final long receivedMessages = messages.stream().count();
-        assertEquals(0L, receivedMessages);
+        for (int i = 0; i < totalReceive * maxMessages; ++i) {
+            sendMessage(message);
+        }
+
+        // Act & Assert
+        IterableStream<ServiceBusReceivedMessageContext> messages;
+
+        int receivedMessageCount;
+        int totalReceivedCount = 0;
+        for (int i = 0; i < totalReceive; ++i) {
+            messages = receiver.receive(maxMessages, shortTimeOut);
+            receivedMessageCount = 0;
+            for (ServiceBusReceivedMessageContext receivedMessage : messages) {
+                assertMessageEquals(receivedMessage, messageId, isSessionEnabled);
+                receiver.complete(receivedMessage.getMessage());
+                messagesPending.decrementAndGet();
+                ++receivedMessageCount;
+            }
+            assertEquals(maxMessages, receivedMessageCount);
+            totalReceivedCount += receivedMessageCount;
+        }
 
-        // Second time user try to receive, it should throw exception.
-        assertThrows(IllegalStateException.class, () -> receiver.receive(maxMessages, shortTimeOut));
+        assertEquals(totalReceive * maxMessages, totalReceivedCount);
     }
 
     /**
@@ -580,10 +598,8 @@ private void setSenderAndReceiver(MessagingEntityType entityType, boolean isSess
                 .buildClient();
         } else {
             receiver = getReceiverBuilder(false, entityType).buildClient();
-
-            receiveAndDeleteReceiver = getSessionReceiverBuilder(false, entityType,
-                Function.identity(),
-                builder -> builder.sessionId(sessionId).receiveMode(ReceiveMode.RECEIVE_AND_DELETE))
+            receiveAndDeleteReceiver = getReceiverBuilder(false, entityType).
+                receiveMode(ReceiveMode.RECEIVE_AND_DELETE)
                 .buildClient();
         }
     }
diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java
index 635f5e6d91d3..6747d6a08cf4 100644
--- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java
+++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java
@@ -7,6 +7,7 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.servicebus.models.DeadLetterOptions;
 import com.azure.messaging.servicebus.models.ReceiveAsyncOptions;
+import com.azure.messaging.servicebus.models.ReceiveMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -64,6 +65,7 @@ void setup() {
 
         when(asyncClient.getEntityPath()).thenReturn(ENTITY_PATH);
         when(asyncClient.getFullyQualifiedNamespace()).thenReturn(NAMESPACE);
+        when(asyncClient.getReceiverOptions()).thenReturn(new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1));
 
         when(messageLockToken.getLockToken()).thenReturn(LOCK_TOKEN);
 
@@ -382,9 +384,9 @@ void receiveMessagesWithUserSpecifiedTimeout() {
         final int maxMessages = 10;
         final int numberToEmit = 5;
         final Duration receiveTimeout = Duration.ofSeconds(2);
+        final AtomicInteger emittedMessages = new AtomicInteger();
         Flux<ServiceBusReceivedMessageContext> messageSink = Flux.create(sink -> {
             sink.onRequest(e -> {
-                final AtomicInteger emittedMessages = new AtomicInteger();
                 if (emittedMessages.get() >= numberToEmit) {
                     logger.info("Cannot emit more. Reached max already. Emitted: {}. Max: {}",
                         emittedMessages.get(), numberToEmit);
@@ -475,9 +477,10 @@ void receiveMessagesTimeout() {
         // Arrange
         final int maxMessages = 10;
         final int numberToEmit = 5;
+
+        final AtomicInteger emittedMessages = new AtomicInteger();
         Flux<ServiceBusReceivedMessageContext> messageSink = Flux.create(sink -> {
             sink.onRequest(e -> {
-                final AtomicInteger emittedMessages = new AtomicInteger();
                 if (emittedMessages.get() >= numberToEmit) {
                     logger.info("Cannot emit more. Reached max already. Emitted: {}. Max: {}",
                         emittedMessages.get(), numberToEmit);

From 9ae1c74e56714b5a7754e30329dad680b484c918 Mon Sep 17 00:00:00 2001
From: Tanyi Chen <tanchen@microsoft.com>
Date: Fri, 8 May 2020 11:27:14 +0800
Subject: [PATCH 28/41] Mgmt generate: subscription 2019 10 pre (#10937)

* feat: add subscription api spec

* feat: generate subs 2019 10 pre

* feat: add ci and pom

* feat: update pom
---
 eng/mgmt/api-specs.json                       |   4 +
 sdk/subscription/ci.mgmt.yml                  |  32 +
 .../mgmt-v2019_10_01_preview/pom.xml          | 135 +++
 .../v2019_10_01_preview/AdPrincipal.java      |  43 +
 .../CanceledSubscriptionId.java               |  25 +
 .../EnabledSubscriptionId.java                |  25 +
 .../v2019_10_01_preview/ErrorResponse.java    |  69 ++
 .../ErrorResponseException.java               |  44 +
 ...dernCspSubscriptionCreationParameters.java |  97 ++
 .../ModernSubscriptionCreationParameters.java | 181 ++++
 .../v2019_10_01_preview/OfferType.java        |  41 +
 .../v2019_10_01_preview/OperationDisplay.java |  95 ++
 .../OperationListResult.java                  |  32 +
 .../v2019_10_01_preview/Operations.java       |  27 +
 .../RenamedSubscriptionId.java                |  25 +
 ...scriptionCreateCspSubscriptionHeaders.java |  70 ++
 ...SubscriptionCreateSubscriptionHeaders.java |  70 ++
 ...ubscriptionInEnrollmentAccountHeaders.java |  70 ++
 .../SubscriptionCreationParameters.java       | 156 +++
 .../SubscriptionCreationResult.java           |  25 +
 .../v2019_10_01_preview/SubscriptionName.java |  43 +
 .../SubscriptionOperationGetHeaders.java      |  70 ++
 .../SubscriptionOperations.java               |  28 +
 .../v2019_10_01_preview/Subscriptions.java    |  77 ++
 .../implementation/BillingManager.java        | 120 +++
 .../CanceledSubscriptionIdImpl.java           |  31 +
 .../CanceledSubscriptionIdInner.java          |  32 +
 .../EnabledSubscriptionIdImpl.java            |  31 +
 .../EnabledSubscriptionIdInner.java           |  32 +
 .../implementation/IdParsingUtils.java        |  57 ++
 .../implementation/OperationInner.java        |  70 ++
 .../OperationListResultImpl.java              |  37 +
 .../OperationListResultInner.java             |  71 ++
 .../implementation/OperationsImpl.java        |  42 +
 .../implementation/OperationsInner.java       | 128 +++
 .../RenamedSubscriptionIdImpl.java            |  31 +
 .../RenamedSubscriptionIdInner.java           |  32 +
 .../SubscriptionClientImpl.java               | 201 ++++
 .../SubscriptionCreationResultImpl.java       |  31 +
 .../SubscriptionCreationResultInner.java      |  44 +
 .../SubscriptionOperationsImpl.java           |  42 +
 .../SubscriptionOperationsInner.java          | 138 +++
 .../implementation/SubscriptionsImpl.java     | 108 +++
 .../implementation/SubscriptionsInner.java    | 906 ++++++++++++++++++
 .../implementation/package-info.java          |  11 +
 .../v2019_10_01_preview/package-info.java     |  11 +
 sdk/subscription/pom.mgmt.xml                 |  14 +
 47 files changed, 3704 insertions(+)
 create mode 100644 sdk/subscription/ci.mgmt.yml
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/pom.xml
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/AdPrincipal.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/CanceledSubscriptionId.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/EnabledSubscriptionId.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponse.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponseException.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernCspSubscriptionCreationParameters.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernSubscriptionCreationParameters.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OfferType.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationDisplay.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationListResult.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Operations.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/RenamedSubscriptionId.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateCspSubscriptionHeaders.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionHeaders.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationParameters.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationResult.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionName.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperationGetHeaders.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperations.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Subscriptions.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/BillingManager.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/IdParsingUtils.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionClientImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsImpl.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsInner.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/package-info.java
 create mode 100644 sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/package-info.java
 create mode 100644 sdk/subscription/pom.mgmt.xml

diff --git a/eng/mgmt/api-specs.json b/eng/mgmt/api-specs.json
index 8a7ec28d1fc0..e75afdddce60 100644
--- a/eng/mgmt/api-specs.json
+++ b/eng/mgmt/api-specs.json
@@ -327,6 +327,10 @@
       "\"moduleName\"": "\"StreamAnalytics\""
     }
   },
+  "subscription/resource-manager": {
+    "source": "specification/subscription/resource-manager/readme.md",
+    "args": "--multiapi --fluent"
+  },
   "support/resource-manager": {
     "source": "specification/support/resource-manager/readme.md",
     "args": "--multiapi --fluent"
diff --git a/sdk/subscription/ci.mgmt.yml b/sdk/subscription/ci.mgmt.yml
new file mode 100644
index 000000000000..c27318bf32a7
--- /dev/null
+++ b/sdk/subscription/ci.mgmt.yml
@@ -0,0 +1,32 @@
+resources:
+  repositories:
+    - repository: azure-sdk-build-tools
+      type: git
+      name: internal/azure-sdk-build-tools
+
+trigger:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/subscription/
+
+pr:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/subscription/
+
+stages:
+  - template: ../../eng/pipelines/templates/stages/archetype-sdk-management.yml
+    parameters:
+      ServiceDirectory: subscription
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/pom.xml b/sdk/subscription/mgmt-v2019_10_01_preview/pom.xml
new file mode 100644
index 000000000000..bba480236916
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/pom.xml
@@ -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.
+-->
+<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.subscription.v2019_10_01_preview</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>1.3.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-billing</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Billing Management</name>
+    <description>This package contains Microsoft Billing Management SDK.</description>
+    <url>https://github.com/Azure/azure-sdk-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-sdk-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-sdk-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>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <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/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/AdPrincipal.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/AdPrincipal.java
new file mode 100644
index 000000000000..338b0c684bd1
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/AdPrincipal.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Active Directory Principal who’ll get owner access on the new subscription.
+ */
+public class AdPrincipal {
+    /**
+     * Object id of the Principal.
+     */
+    @JsonProperty(value = "objectId", required = true)
+    private String objectId;
+
+    /**
+     * Get object id of the Principal.
+     *
+     * @return the objectId value
+     */
+    public String objectId() {
+        return this.objectId;
+    }
+
+    /**
+     * Set object id of the Principal.
+     *
+     * @param objectId the objectId value to set
+     * @return the AdPrincipal object itself.
+     */
+    public AdPrincipal withObjectId(String objectId) {
+        this.objectId = objectId;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/CanceledSubscriptionId.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/CanceledSubscriptionId.java
new file mode 100644
index 000000000000..3b2cacfb6e3c
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/CanceledSubscriptionId.java
@@ -0,0 +1,25 @@
+/**
+ * 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.subscription.v2019_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.BillingManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.CanceledSubscriptionIdInner;
+
+/**
+ * Type representing CanceledSubscriptionId.
+ */
+public interface CanceledSubscriptionId extends HasInner<CanceledSubscriptionIdInner>, HasManager<BillingManager> {
+    /**
+     * @return the value value.
+     */
+    String value();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/EnabledSubscriptionId.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/EnabledSubscriptionId.java
new file mode 100644
index 000000000000..3160923843e9
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/EnabledSubscriptionId.java
@@ -0,0 +1,25 @@
+/**
+ * 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.subscription.v2019_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.BillingManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.EnabledSubscriptionIdInner;
+
+/**
+ * Type representing EnabledSubscriptionId.
+ */
+public interface EnabledSubscriptionId extends HasInner<EnabledSubscriptionIdInner>, HasManager<BillingManager> {
+    /**
+     * @return the value value.
+     */
+    String value();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponse.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponse.java
new file mode 100644
index 000000000000..d72d936ee314
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponse.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the format of Error response.
+ */
+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/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponseException.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ErrorResponseException.java
new file mode 100644
index 000000000000..dbc5484a13f0
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_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.subscription.v2019_10_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/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernCspSubscriptionCreationParameters.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernCspSubscriptionCreationParameters.java
new file mode 100644
index 000000000000..c618ea1618ee
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernCspSubscriptionCreationParameters.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters required to create a new CSP subscription.
+ */
+public class ModernCspSubscriptionCreationParameters {
+    /**
+     * The friendly name of the subscription.
+     */
+    @JsonProperty(value = "displayName", required = true)
+    private String displayName;
+
+    /**
+     * The SKU ID of the Azure plan. Azure plan determines the pricing and
+     * service-level agreement of the subscription.  Use 001 for Microsoft
+     * Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     */
+    @JsonProperty(value = "skuId", required = true)
+    private String skuId;
+
+    /**
+     * Reseller ID, basically MPN Id.
+     */
+    @JsonProperty(value = "resellerId")
+    private String resellerId;
+
+    /**
+     * Get the friendly name of the subscription.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the friendly name of the subscription.
+     *
+     * @param displayName the displayName value to set
+     * @return the ModernCspSubscriptionCreationParameters object itself.
+     */
+    public ModernCspSubscriptionCreationParameters withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     *
+     * @return the skuId value
+     */
+    public String skuId() {
+        return this.skuId;
+    }
+
+    /**
+     * Set the SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     *
+     * @param skuId the skuId value to set
+     * @return the ModernCspSubscriptionCreationParameters object itself.
+     */
+    public ModernCspSubscriptionCreationParameters withSkuId(String skuId) {
+        this.skuId = skuId;
+        return this;
+    }
+
+    /**
+     * Get reseller ID, basically MPN Id.
+     *
+     * @return the resellerId value
+     */
+    public String resellerId() {
+        return this.resellerId;
+    }
+
+    /**
+     * Set reseller ID, basically MPN Id.
+     *
+     * @param resellerId the resellerId value to set
+     * @return the ModernCspSubscriptionCreationParameters object itself.
+     */
+    public ModernCspSubscriptionCreationParameters withResellerId(String resellerId) {
+        this.resellerId = resellerId;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernSubscriptionCreationParameters.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernSubscriptionCreationParameters.java
new file mode 100644
index 000000000000..26d2ac1b0f90
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/ModernSubscriptionCreationParameters.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.subscription.v2019_10_01_preview;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters required to create a new subscription.
+ */
+public class ModernSubscriptionCreationParameters {
+    /**
+     * The friendly name of the subscription.
+     */
+    @JsonProperty(value = "displayName", required = true)
+    private String displayName;
+
+    /**
+     * The SKU ID of the Azure plan. Azure plan determines the pricing and
+     * service-level agreement of the subscription.  Use 001 for Microsoft
+     * Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     */
+    @JsonProperty(value = "skuId", required = true)
+    private String skuId;
+
+    /**
+     * If set, the cost center will show up on the Azure usage and charges
+     * file.
+     */
+    @JsonProperty(value = "costCenter")
+    private String costCenter;
+
+    /**
+     * If specified, the AD principal will get owner access to the
+     * subscription, along with the user who is performing the create
+     * subscription operation.
+     */
+    @JsonProperty(value = "owner")
+    private AdPrincipal owner;
+
+    /**
+     * The identifier of the management group to which this subscription will
+     * be associated.
+     */
+    @JsonProperty(value = "managementGroupId")
+    private String managementGroupId;
+
+    /**
+     * Additional, untyped parameters to support custom subscription creation
+     * scenarios.
+     */
+    @JsonProperty(value = "additionalParameters")
+    private Map<String, Object> additionalParameters;
+
+    /**
+     * Get the friendly name of the subscription.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the friendly name of the subscription.
+     *
+     * @param displayName the displayName value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     *
+     * @return the skuId value
+     */
+    public String skuId() {
+        return this.skuId;
+    }
+
+    /**
+     * Set the SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
+     *
+     * @param skuId the skuId value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withSkuId(String skuId) {
+        this.skuId = skuId;
+        return this;
+    }
+
+    /**
+     * Get if set, the cost center will show up on the Azure usage and charges file.
+     *
+     * @return the costCenter value
+     */
+    public String costCenter() {
+        return this.costCenter;
+    }
+
+    /**
+     * Set if set, the cost center will show up on the Azure usage and charges file.
+     *
+     * @param costCenter the costCenter value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withCostCenter(String costCenter) {
+        this.costCenter = costCenter;
+        return this;
+    }
+
+    /**
+     * Get if specified, the AD principal will get owner access to the subscription, along with the user who is performing the create subscription operation.
+     *
+     * @return the owner value
+     */
+    public AdPrincipal owner() {
+        return this.owner;
+    }
+
+    /**
+     * Set if specified, the AD principal will get owner access to the subscription, along with the user who is performing the create subscription operation.
+     *
+     * @param owner the owner value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withOwner(AdPrincipal owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    /**
+     * Get the identifier of the management group to which this subscription will be associated.
+     *
+     * @return the managementGroupId value
+     */
+    public String managementGroupId() {
+        return this.managementGroupId;
+    }
+
+    /**
+     * Set the identifier of the management group to which this subscription will be associated.
+     *
+     * @param managementGroupId the managementGroupId value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withManagementGroupId(String managementGroupId) {
+        this.managementGroupId = managementGroupId;
+        return this;
+    }
+
+    /**
+     * Get additional, untyped parameters to support custom subscription creation scenarios.
+     *
+     * @return the additionalParameters value
+     */
+    public Map<String, Object> additionalParameters() {
+        return this.additionalParameters;
+    }
+
+    /**
+     * Set additional, untyped parameters to support custom subscription creation scenarios.
+     *
+     * @param additionalParameters the additionalParameters value to set
+     * @return the ModernSubscriptionCreationParameters object itself.
+     */
+    public ModernSubscriptionCreationParameters withAdditionalParameters(Map<String, Object> additionalParameters) {
+        this.additionalParameters = additionalParameters;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OfferType.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OfferType.java
new file mode 100644
index 000000000000..9caaa7f46a2e
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OfferType.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.subscription.v2019_10_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OfferType.
+ */
+public final class OfferType extends ExpandableStringEnum<OfferType> {
+    /** Static value MS-AZR-0017P for OfferType. */
+    public static final OfferType MS_AZR_0017P = fromString("MS-AZR-0017P");
+
+    /** Static value MS-AZR-0148P for OfferType. */
+    public static final OfferType MS_AZR_0148P = fromString("MS-AZR-0148P");
+
+    /**
+     * Creates or finds a OfferType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OfferType
+     */
+    @JsonCreator
+    public static OfferType fromString(String name) {
+        return fromString(name, OfferType.class);
+    }
+
+    /**
+     * @return known OfferType values
+     */
+    public static Collection<OfferType> values() {
+        return values(OfferType.class);
+    }
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationDisplay.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationDisplay.java
new file mode 100644
index 000000000000..8af062a00a1d
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationDisplay.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.Subscription.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Profile, endpoint, etc.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.Subscription.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set service provider: Microsoft.Subscription.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set operation type: Read, write, delete, etc.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationListResult.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationListResult.java
new file mode 100644
index 000000000000..b88ffee9defb
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/OperationListResult.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.subscription.v2019_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.BillingManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.OperationListResultInner;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.OperationInner;
+import java.util.List;
+
+/**
+ * Type representing OperationListResult.
+ */
+public interface OperationListResult extends HasInner<OperationListResultInner>, HasManager<BillingManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<OperationInner> value();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Operations.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Operations.java
new file mode 100644
index 000000000000..965fab462f95
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_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.subscription.v2019_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.subscription.v2019_10_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 Microsoft.Subscription API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OperationListResult> listAsync();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/RenamedSubscriptionId.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/RenamedSubscriptionId.java
new file mode 100644
index 000000000000..c48b097aad73
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/RenamedSubscriptionId.java
@@ -0,0 +1,25 @@
+/**
+ * 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.subscription.v2019_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.BillingManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.RenamedSubscriptionIdInner;
+
+/**
+ * Type representing RenamedSubscriptionId.
+ */
+public interface RenamedSubscriptionId extends HasInner<RenamedSubscriptionIdInner>, HasManager<BillingManager> {
+    /**
+     * @return the value value.
+     */
+    String value();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateCspSubscriptionHeaders.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateCspSubscriptionHeaders.java
new file mode 100644
index 000000000000..54ec991ca488
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateCspSubscriptionHeaders.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for CreateCspSubscription operation.
+ */
+public class SubscriptionCreateCspSubscriptionHeaders {
+    /**
+     * GET this URL to retrieve the status of the asynchronous operation.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * The amount of delay to use while the status of the operation is checked.
+     * The value is expressed in seconds.
+     */
+    @JsonProperty(value = "Retry-After")
+    private Integer retryAfter;
+
+    /**
+     * Get gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @param location the location value to set
+     * @return the SubscriptionCreateCspSubscriptionHeaders object itself.
+     */
+    public SubscriptionCreateCspSubscriptionHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @return the retryAfter value
+     */
+    public Integer retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the SubscriptionCreateCspSubscriptionHeaders object itself.
+     */
+    public SubscriptionCreateCspSubscriptionHeaders withRetryAfter(Integer retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionHeaders.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionHeaders.java
new file mode 100644
index 000000000000..f66254412edb
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionHeaders.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for CreateSubscription operation.
+ */
+public class SubscriptionCreateSubscriptionHeaders {
+    /**
+     * GET this URL to retrieve the status of the asynchronous operation.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * The amount of delay to use while the status of the operation is checked.
+     * The value is expressed in seconds.
+     */
+    @JsonProperty(value = "Retry-After")
+    private Integer retryAfter;
+
+    /**
+     * Get gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @param location the location value to set
+     * @return the SubscriptionCreateSubscriptionHeaders object itself.
+     */
+    public SubscriptionCreateSubscriptionHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @return the retryAfter value
+     */
+    public Integer retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the SubscriptionCreateSubscriptionHeaders object itself.
+     */
+    public SubscriptionCreateSubscriptionHeaders withRetryAfter(Integer retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.java
new file mode 100644
index 000000000000..e28a31406b9b
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for CreateSubscriptionInEnrollmentAccount operation.
+ */
+public class SubscriptionCreateSubscriptionInEnrollmentAccountHeaders {
+    /**
+     * GET this URL to retrieve the status of the asynchronous operation.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * The amount of delay to use while the status of the operation is checked.
+     * The value is expressed in seconds.
+     */
+    @JsonProperty(value = "Retry-After")
+    private String retryAfter;
+
+    /**
+     * Get gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set gET this URL to retrieve the status of the asynchronous operation.
+     *
+     * @param location the location value to set
+     * @return the SubscriptionCreateSubscriptionInEnrollmentAccountHeaders object itself.
+     */
+    public SubscriptionCreateSubscriptionInEnrollmentAccountHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @return the retryAfter value
+     */
+    public String retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the SubscriptionCreateSubscriptionInEnrollmentAccountHeaders object itself.
+     */
+    public SubscriptionCreateSubscriptionInEnrollmentAccountHeaders withRetryAfter(String retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationParameters.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationParameters.java
new file mode 100644
index 000000000000..ddbb0ebab561
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationParameters.java
@@ -0,0 +1,156 @@
+/**
+ * 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.subscription.v2019_10_01_preview;
+
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Subscription Creation Parameters required to create a new Azure
+ * subscription.
+ */
+public class SubscriptionCreationParameters {
+    /**
+     * The display name of the subscription.
+     */
+    @JsonProperty(value = "displayName")
+    private String displayName;
+
+    /**
+     * The Management Group Id.
+     */
+    @JsonProperty(value = "managementGroupId")
+    private String managementGroupId;
+
+    /**
+     * The list of principals that should be granted Owner access on the
+     * subscription. Principals should be of type User, Service Principal or
+     * Security Group.
+     */
+    @JsonProperty(value = "owners")
+    private List<AdPrincipal> owners;
+
+    /**
+     * The offer type of the subscription. For example, MS-AZR-0017P
+     * (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are
+     * available. Only valid when creating a subscription in a enrollment
+     * account scope. Possible values include: 'MS-AZR-0017P', 'MS-AZR-0148P'.
+     */
+    @JsonProperty(value = "offerType")
+    private OfferType offerType;
+
+    /**
+     * Additional, untyped parameters to support custom subscription creation
+     * scenarios.
+     */
+    @JsonProperty(value = "additionalParameters")
+    private Map<String, Object> additionalParameters;
+
+    /**
+     * Get the display name of the subscription.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the subscription.
+     *
+     * @param displayName the displayName value to set
+     * @return the SubscriptionCreationParameters object itself.
+     */
+    public SubscriptionCreationParameters withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the Management Group Id.
+     *
+     * @return the managementGroupId value
+     */
+    public String managementGroupId() {
+        return this.managementGroupId;
+    }
+
+    /**
+     * Set the Management Group Id.
+     *
+     * @param managementGroupId the managementGroupId value to set
+     * @return the SubscriptionCreationParameters object itself.
+     */
+    public SubscriptionCreationParameters withManagementGroupId(String managementGroupId) {
+        this.managementGroupId = managementGroupId;
+        return this;
+    }
+
+    /**
+     * Get the list of principals that should be granted Owner access on the subscription. Principals should be of type User, Service Principal or Security Group.
+     *
+     * @return the owners value
+     */
+    public List<AdPrincipal> owners() {
+        return this.owners;
+    }
+
+    /**
+     * Set the list of principals that should be granted Owner access on the subscription. Principals should be of type User, Service Principal or Security Group.
+     *
+     * @param owners the owners value to set
+     * @return the SubscriptionCreationParameters object itself.
+     */
+    public SubscriptionCreationParameters withOwners(List<AdPrincipal> owners) {
+        this.owners = owners;
+        return this;
+    }
+
+    /**
+     * Get the offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available. Only valid when creating a subscription in a enrollment account scope. Possible values include: 'MS-AZR-0017P', 'MS-AZR-0148P'.
+     *
+     * @return the offerType value
+     */
+    public OfferType offerType() {
+        return this.offerType;
+    }
+
+    /**
+     * Set the offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available. Only valid when creating a subscription in a enrollment account scope. Possible values include: 'MS-AZR-0017P', 'MS-AZR-0148P'.
+     *
+     * @param offerType the offerType value to set
+     * @return the SubscriptionCreationParameters object itself.
+     */
+    public SubscriptionCreationParameters withOfferType(OfferType offerType) {
+        this.offerType = offerType;
+        return this;
+    }
+
+    /**
+     * Get additional, untyped parameters to support custom subscription creation scenarios.
+     *
+     * @return the additionalParameters value
+     */
+    public Map<String, Object> additionalParameters() {
+        return this.additionalParameters;
+    }
+
+    /**
+     * Set additional, untyped parameters to support custom subscription creation scenarios.
+     *
+     * @param additionalParameters the additionalParameters value to set
+     * @return the SubscriptionCreationParameters object itself.
+     */
+    public SubscriptionCreationParameters withAdditionalParameters(Map<String, Object> additionalParameters) {
+        this.additionalParameters = additionalParameters;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationResult.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationResult.java
new file mode 100644
index 000000000000..99003c2d22f5
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionCreationResult.java
@@ -0,0 +1,25 @@
+/**
+ * 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.subscription.v2019_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.BillingManager;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.SubscriptionCreationResultInner;
+
+/**
+ * Type representing SubscriptionCreationResult.
+ */
+public interface SubscriptionCreationResult extends HasInner<SubscriptionCreationResultInner>, HasManager<BillingManager> {
+    /**
+     * @return the subscriptionLink value.
+     */
+    String subscriptionLink();
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionName.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionName.java
new file mode 100644
index 000000000000..ec61398b4666
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionName.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The new name of the subscription.
+ */
+public class SubscriptionName {
+    /**
+     * New subscription name.
+     */
+    @JsonProperty(value = "subscriptionName")
+    private String subscriptionName;
+
+    /**
+     * Get new subscription name.
+     *
+     * @return the subscriptionName value
+     */
+    public String subscriptionName() {
+        return this.subscriptionName;
+    }
+
+    /**
+     * Set new subscription name.
+     *
+     * @param subscriptionName the subscriptionName value to set
+     * @return the SubscriptionName object itself.
+     */
+    public SubscriptionName withSubscriptionName(String subscriptionName) {
+        this.subscriptionName = subscriptionName;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperationGetHeaders.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperationGetHeaders.java
new file mode 100644
index 000000000000..7e19cbe9b2c2
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperationGetHeaders.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.subscription.v2019_10_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class SubscriptionOperationGetHeaders {
+    /**
+     * The URL where the status of the asynchronous operation can be checked.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * The amount of delay to use while the status of the operation is checked.
+     * The value is expressed in seconds.
+     */
+    @JsonProperty(value = "Retry-After")
+    private Integer retryAfter;
+
+    /**
+     * Get the URL where the status of the asynchronous operation can be checked.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set the URL where the status of the asynchronous operation can be checked.
+     *
+     * @param location the location value to set
+     * @return the SubscriptionOperationGetHeaders object itself.
+     */
+    public SubscriptionOperationGetHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @return the retryAfter value
+     */
+    public Integer retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set the amount of delay to use while the status of the operation is checked. The value is expressed in seconds.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the SubscriptionOperationGetHeaders object itself.
+     */
+    public SubscriptionOperationGetHeaders withRetryAfter(Integer retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperations.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperations.java
new file mode 100644
index 000000000000..be556bf376f0
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/SubscriptionOperations.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.subscription.v2019_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation.SubscriptionOperationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing SubscriptionOperations.
+ */
+public interface SubscriptionOperations extends HasInner<SubscriptionOperationsInner> {
+    /**
+     * Get the status of the pending Microsoft.Subscription API operations.
+     *
+     * @param operationId The operation ID, which can be found from the Location field in the generate recommendation response header.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SubscriptionCreationResult> getAsync(String operationId);
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Subscriptions.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Subscriptions.java
new file mode 100644
index 000000000000..bf9dc5f32bed
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/Subscriptions.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.subscription.v2019_10_01_preview;
+
+import rx.Observable;
+
+/**
+ * Type representing Subscriptions.
+ */
+public interface Subscriptions {
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SubscriptionCreationResult> createSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body);
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SubscriptionCreationResult> createSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body);
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SubscriptionCreationResult> createCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body);
+
+    /**
+     * The operation to cancel a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CanceledSubscriptionId> cancelAsync(String subscriptionId);
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RenamedSubscriptionId> renameAsync(String subscriptionId);
+
+    /**
+     * The operation to enable a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EnabledSubscriptionId> enableAsync(String subscriptionId);
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/BillingManager.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/BillingManager.java
new file mode 100644
index 000000000000..57a84aacb8bc
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/BillingManager.java
@@ -0,0 +1,120 @@
+/**
+ * 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.subscription.v2019_10_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.subscription.v2019_10_01_preview.Subscriptions;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionOperations;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.Operations;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Billing resource management.
+ */
+public final class BillingManager extends ManagerCore<BillingManager, SubscriptionClientImpl> {
+    private Subscriptions subscriptions;
+    private SubscriptionOperations subscriptionOperations;
+    private Operations operations;
+    /**
+    * Get a Configurable instance that can be used to create BillingManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new BillingManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of BillingManager that exposes Billing resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @return the BillingManager
+    */
+    public static BillingManager authenticate(AzureTokenCredentials credentials) {
+        return new BillingManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build());
+    }
+    /**
+    * Creates an instance of BillingManager that exposes Billing resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @return the BillingManager
+    */
+    public static BillingManager authenticate(RestClient restClient) {
+        return new BillingManager(restClient);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of BillingManager that exposes Billing management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @return the interface exposing Billing management API entry points that work across subscriptions
+        */
+        BillingManager authenticate(AzureTokenCredentials credentials);
+    }
+
+    /**
+     * @return Entry point to manage Subscriptions.
+     */
+    public Subscriptions subscriptions() {
+        if (this.subscriptions == null) {
+            this.subscriptions = new SubscriptionsImpl(this);
+        }
+        return this.subscriptions;
+    }
+
+    /**
+     * @return Entry point to manage SubscriptionOperations.
+     */
+    public SubscriptionOperations subscriptionOperations() {
+        if (this.subscriptionOperations == null) {
+            this.subscriptionOperations = new SubscriptionOperationsImpl(this);
+        }
+        return this.subscriptionOperations;
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public BillingManager authenticate(AzureTokenCredentials credentials) {
+           return BillingManager.authenticate(buildRestClient(credentials));
+        }
+     }
+    private BillingManager(RestClient restClient) {
+        super(
+            restClient,
+            null,
+            new SubscriptionClientImpl(restClient));
+    }
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdImpl.java
new file mode 100644
index 000000000000..882cbf0c955f
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.CanceledSubscriptionId;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class CanceledSubscriptionIdImpl extends WrapperImpl<CanceledSubscriptionIdInner> implements CanceledSubscriptionId {
+    private final BillingManager manager;
+    CanceledSubscriptionIdImpl(CanceledSubscriptionIdInner inner, BillingManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdInner.java
new file mode 100644
index 000000000000..e25b459165d8
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/CanceledSubscriptionIdInner.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.subscription.v2019_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ID of the canceled subscription.
+ */
+public class CanceledSubscriptionIdInner {
+    /**
+     * The ID of the canceled subscription.
+     */
+    @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
+    private String value;
+
+    /**
+     * Get the ID of the canceled subscription.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdImpl.java
new file mode 100644
index 000000000000..5f20630a7f4d
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.EnabledSubscriptionId;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class EnabledSubscriptionIdImpl extends WrapperImpl<EnabledSubscriptionIdInner> implements EnabledSubscriptionId {
+    private final BillingManager manager;
+    EnabledSubscriptionIdImpl(EnabledSubscriptionIdInner inner, BillingManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdInner.java
new file mode 100644
index 000000000000..385402832aa8
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/EnabledSubscriptionIdInner.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.subscription.v2019_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ID of the subscriptions that is being enabled.
+ */
+public class EnabledSubscriptionIdInner {
+    /**
+     * The ID of the subscriptions that is being enabled.
+     */
+    @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
+    private String value;
+
+    /**
+     * Get the ID of the subscriptions that is being enabled.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/IdParsingUtils.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..ebf951acf814
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_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.subscription.v2019_10_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/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationInner.java
new file mode 100644
index 000000000000..74cb7be32c9c
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationInner.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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * REST API operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name")
+    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;
+    }
+
+    /**
+     * Set operation name: {provider}/{resource}/{operation}.
+     *
+     * @param name the name value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * 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/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultImpl.java
new file mode 100644
index 000000000000..45d8ad597c8b
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultImpl.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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.OperationListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class OperationListResultImpl extends WrapperImpl<OperationListResultInner> implements OperationListResult {
+    private final BillingManager manager;
+    OperationListResultImpl(OperationListResultInner inner, BillingManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<OperationInner> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultInner.java
new file mode 100644
index 000000000000..67ab4a6a167f
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationListResultInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Result of the request to list operations. It contains a list of operations
+ * and a URL link to get the next set of results.
+ */
+public class OperationListResultInner {
+    /**
+     * List of operations.
+     */
+    @JsonProperty(value = "value")
+    private List<OperationInner> value;
+
+    /**
+     * URL to get the next set of operation list results if there are any.
+     */
+    @JsonProperty(value = "nextLink")
+    private String nextLink;
+
+    /**
+     * Get list of operations.
+     *
+     * @return the value value
+     */
+    public List<OperationInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set list of operations.
+     *
+     * @param value the value value to set
+     * @return the OperationListResultInner object itself.
+     */
+    public OperationListResultInner withValue(List<OperationInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get uRL to get the next set of operation list results if there are any.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set uRL to get the next set of operation list results if there are any.
+     *
+     * @param nextLink the nextLink value to set
+     * @return the OperationListResultInner object itself.
+     */
+    public OperationListResultInner withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..2d03ea68fd96
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.OperationListResult;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final BillingManager manager;
+
+    OperationsImpl(BillingManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<OperationListResult> listAsync() {
+        OperationsInner client = this.inner();
+        return client.listAsync()
+        .map(new Func1<OperationListResultInner, OperationListResult>() {
+            @Override
+            public OperationListResult call(OperationListResultInner inner) {
+                return new OperationListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsInner.java
new file mode 100644
index 000000000000..265b72eb5bff
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/OperationsInner.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.subscription.v2019_10_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ErrorResponseException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+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 Operations.
+ */
+public class OperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private OperationsService service;
+    /** The service client containing this operation class. */
+    private SubscriptionClientImpl 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, SubscriptionClientImpl 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.subscription.v2019_10_01_preview.Operations list" })
+        @GET("providers/Microsoft.Subscription/operations")
+        Observable<Response<ResponseBody>> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Microsoft.Subscription 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 OperationListResultInner object if successful.
+     */
+    public OperationListResultInner list() {
+        return listWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists all of the available Microsoft.Subscription 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<OperationListResultInner> listAsync(final ServiceCallback<OperationListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Subscription API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OperationListResultInner object
+     */
+    public Observable<OperationListResultInner> listAsync() {
+        return listWithServiceResponseAsync().map(new Func1<ServiceResponse<OperationListResultInner>, OperationListResultInner>() {
+            @Override
+            public OperationListResultInner call(ServiceResponse<OperationListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Subscription API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OperationListResultInner object
+     */
+    public Observable<ServiceResponse<OperationListResultInner>> listWithServiceResponseAsync() {
+        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<OperationListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OperationListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OperationListResultInner> clientResponse = listDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OperationListResultInner> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OperationListResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OperationListResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdImpl.java
new file mode 100644
index 000000000000..14eabc0865e2
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.RenamedSubscriptionId;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class RenamedSubscriptionIdImpl extends WrapperImpl<RenamedSubscriptionIdInner> implements RenamedSubscriptionId {
+    private final BillingManager manager;
+    RenamedSubscriptionIdImpl(RenamedSubscriptionIdInner inner, BillingManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdInner.java
new file mode 100644
index 000000000000..1a21ce6000ea
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/RenamedSubscriptionIdInner.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.subscription.v2019_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ID of the subscriptions that is being renamed.
+ */
+public class RenamedSubscriptionIdInner {
+    /**
+     * The ID of the subscriptions that is being renamed.
+     */
+    @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
+    private String value;
+
+    /**
+     * Get the ID of the subscriptions that is being renamed.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionClientImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionClientImpl.java
new file mode 100644
index 000000000000..f51e001615f3
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionClientImpl.java
@@ -0,0 +1,201 @@
+/**
+ * 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.subscription.v2019_10_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 SubscriptionClientImpl class.
+ */
+public class SubscriptionClientImpl 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;
+    }
+
+    /** Version of the API to be used with the client request. Current version is 2019-10-01-preview. */
+    private String apiVersion;
+
+    /**
+     * Gets Version of the API to be used with the client request. Current version is 2019-10-01-preview.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** The preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets The preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets The preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public SubscriptionClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * 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 SubscriptionClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** Whether a unique x-ms-client-request-id should be generated. 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 Whether a unique x-ms-client-request-id should be generated. 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 Whether a unique x-ms-client-request-id should be generated. 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 SubscriptionClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The SubscriptionsInner object to access its operations.
+     */
+    private SubscriptionsInner subscriptions;
+
+    /**
+     * Gets the SubscriptionsInner object to access its operations.
+     * @return the SubscriptionsInner object.
+     */
+    public SubscriptionsInner subscriptions() {
+        return this.subscriptions;
+    }
+
+    /**
+     * The SubscriptionOperationsInner object to access its operations.
+     */
+    private SubscriptionOperationsInner subscriptionOperations;
+
+    /**
+     * Gets the SubscriptionOperationsInner object to access its operations.
+     * @return the SubscriptionOperationsInner object.
+     */
+    public SubscriptionOperationsInner subscriptionOperations() {
+        return this.subscriptionOperations;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Initializes an instance of SubscriptionClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public SubscriptionClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of SubscriptionClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public SubscriptionClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of SubscriptionClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public SubscriptionClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2019-10-01-preview";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.subscriptions = new SubscriptionsInner(restClient().retrofit(), this);
+        this.subscriptionOperations = new SubscriptionOperationsInner(restClient().retrofit(), this);
+        this.operations = new OperationsInner(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, auto-generated)", super.userAgent(), "SubscriptionClient", "2019-10-01-preview");
+    }
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultImpl.java
new file mode 100644
index 000000000000..a2f58b1f7541
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreationResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class SubscriptionCreationResultImpl extends WrapperImpl<SubscriptionCreationResultInner> implements SubscriptionCreationResult {
+    private final BillingManager manager;
+    SubscriptionCreationResultImpl(SubscriptionCreationResultInner inner, BillingManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String subscriptionLink() {
+        return this.inner().subscriptionLink();
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultInner.java
new file mode 100644
index 000000000000..95e25ac76410
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionCreationResultInner.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.subscription.v2019_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The created subscription object.
+ */
+public class SubscriptionCreationResultInner {
+    /**
+     * The link to the new subscription. Use this link to check the status of
+     * subscription creation operation.
+     */
+    @JsonProperty(value = "subscriptionLink")
+    private String subscriptionLink;
+
+    /**
+     * Get the link to the new subscription. Use this link to check the status of subscription creation operation.
+     *
+     * @return the subscriptionLink value
+     */
+    public String subscriptionLink() {
+        return this.subscriptionLink;
+    }
+
+    /**
+     * Set the link to the new subscription. Use this link to check the status of subscription creation operation.
+     *
+     * @param subscriptionLink the subscriptionLink value to set
+     * @return the SubscriptionCreationResultInner object itself.
+     */
+    public SubscriptionCreationResultInner withSubscriptionLink(String subscriptionLink) {
+        this.subscriptionLink = subscriptionLink;
+        return this;
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsImpl.java
new file mode 100644
index 000000000000..9af1a0402d82
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionOperations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreationResult;
+
+class SubscriptionOperationsImpl extends WrapperImpl<SubscriptionOperationsInner> implements SubscriptionOperations {
+    private final BillingManager manager;
+
+    SubscriptionOperationsImpl(BillingManager manager) {
+        super(manager.inner().subscriptionOperations());
+        this.manager = manager;
+    }
+
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<SubscriptionCreationResult> getAsync(String operationId) {
+        SubscriptionOperationsInner client = this.inner();
+        return client.getAsync(operationId)
+        .map(new Func1<SubscriptionCreationResultInner, SubscriptionCreationResult>() {
+            @Override
+            public SubscriptionCreationResult call(SubscriptionCreationResultInner inner) {
+                return new SubscriptionCreationResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsInner.java
new file mode 100644
index 000000000000..19e52c0e0bb8
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionOperationsInner.java
@@ -0,0 +1,138 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionOperationGetHeaders;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import java.io.IOException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in SubscriptionOperations.
+ */
+public class SubscriptionOperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private SubscriptionOperationsService service;
+    /** The service client containing this operation class. */
+    private SubscriptionClientImpl client;
+
+    /**
+     * Initializes an instance of SubscriptionOperationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SubscriptionOperationsInner(Retrofit retrofit, SubscriptionClientImpl client) {
+        this.service = retrofit.create(SubscriptionOperationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SubscriptionOperations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SubscriptionOperationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionOperations get" })
+        @GET("providers/Microsoft.Subscription/subscriptionOperations/{operationId}")
+        Observable<Response<ResponseBody>> get(@Path("operationId") String operationId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get the status of the pending Microsoft.Subscription API operations.
+     *
+     * @param operationId The operation ID, which can be found from the Location field in the generate recommendation response header.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner get(String operationId) {
+        return getWithServiceResponseAsync(operationId).toBlocking().single().body();
+    }
+
+    /**
+     * Get the status of the pending Microsoft.Subscription API operations.
+     *
+     * @param operationId The operation ID, which can be found from the Location field in the generate recommendation response header.
+     * @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<SubscriptionCreationResultInner> getAsync(String operationId, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(operationId), serviceCallback);
+    }
+
+    /**
+     * Get the status of the pending Microsoft.Subscription API operations.
+     *
+     * @param operationId The operation ID, which can be found from the Location field in the generate recommendation response header.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<SubscriptionCreationResultInner> getAsync(String operationId) {
+        return getWithServiceResponseAsync(operationId).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the status of the pending Microsoft.Subscription API operations.
+     *
+     * @param operationId The operation ID, which can be found from the Location field in the generate recommendation response header.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders>> getWithServiceResponseAsync(String operationId) {
+        if (operationId == null) {
+            throw new IllegalArgumentException("Parameter operationId 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(operationId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionOperationGetHeaders> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubscriptionCreationResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubscriptionCreationResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .buildWithHeaders(response, SubscriptionOperationGetHeaders.class);
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsImpl.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsImpl.java
new file mode 100644
index 000000000000..269eb759b1ad
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.Subscriptions;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreationResult;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ModernSubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ModernCspSubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.CanceledSubscriptionId;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.RenamedSubscriptionId;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.EnabledSubscriptionId;
+
+class SubscriptionsImpl extends WrapperImpl<SubscriptionsInner> implements Subscriptions {
+    private final BillingManager manager;
+
+    SubscriptionsImpl(BillingManager manager) {
+        super(manager.inner().subscriptions());
+        this.manager = manager;
+    }
+
+    public BillingManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<SubscriptionCreationResult> createSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        SubscriptionsInner client = this.inner();
+        return client.createSubscriptionInEnrollmentAccountAsync(enrollmentAccountName, body)
+        .map(new Func1<SubscriptionCreationResultInner, SubscriptionCreationResult>() {
+            @Override
+            public SubscriptionCreationResult call(SubscriptionCreationResultInner inner) {
+                return new SubscriptionCreationResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<SubscriptionCreationResult> createSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        SubscriptionsInner client = this.inner();
+        return client.createSubscriptionAsync(billingAccountName, billingProfileName, invoiceSectionName, body)
+        .map(new Func1<SubscriptionCreationResultInner, SubscriptionCreationResult>() {
+            @Override
+            public SubscriptionCreationResult call(SubscriptionCreationResultInner inner) {
+                return new SubscriptionCreationResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<SubscriptionCreationResult> createCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        SubscriptionsInner client = this.inner();
+        return client.createCspSubscriptionAsync(billingAccountName, customerName, body)
+        .map(new Func1<SubscriptionCreationResultInner, SubscriptionCreationResult>() {
+            @Override
+            public SubscriptionCreationResult call(SubscriptionCreationResultInner inner) {
+                return new SubscriptionCreationResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<CanceledSubscriptionId> cancelAsync(String subscriptionId) {
+        SubscriptionsInner client = this.inner();
+        return client.cancelAsync(subscriptionId)
+        .map(new Func1<CanceledSubscriptionIdInner, CanceledSubscriptionId>() {
+            @Override
+            public CanceledSubscriptionId call(CanceledSubscriptionIdInner inner) {
+                return new CanceledSubscriptionIdImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<RenamedSubscriptionId> renameAsync(String subscriptionId) {
+        SubscriptionsInner client = this.inner();
+        return client.renameAsync(subscriptionId)
+        .map(new Func1<RenamedSubscriptionIdInner, RenamedSubscriptionId>() {
+            @Override
+            public RenamedSubscriptionId call(RenamedSubscriptionIdInner inner) {
+                return new RenamedSubscriptionIdImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<EnabledSubscriptionId> enableAsync(String subscriptionId) {
+        SubscriptionsInner client = this.inner();
+        return client.enableAsync(subscriptionId)
+        .map(new Func1<EnabledSubscriptionIdInner, EnabledSubscriptionId>() {
+            @Override
+            public EnabledSubscriptionId call(EnabledSubscriptionIdInner inner) {
+                return new EnabledSubscriptionIdImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsInner.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsInner.java
new file mode 100644
index 000000000000..b56326140b26
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/SubscriptionsInner.java
@@ -0,0 +1,906 @@
+/**
+ * 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.subscription.v2019_10_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ErrorResponseException;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ModernCspSubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.ModernSubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreateCspSubscriptionHeaders;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreateSubscriptionHeaders;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreateSubscriptionInEnrollmentAccountHeaders;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionCreationParameters;
+import com.microsoft.azure.management.subscription.v2019_10_01_preview.SubscriptionName;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+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 Subscriptions.
+ */
+public class SubscriptionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private SubscriptionsService service;
+    /** The service client containing this operation class. */
+    private SubscriptionClientImpl client;
+
+    /**
+     * Initializes an instance of SubscriptionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SubscriptionsInner(Retrofit retrofit, SubscriptionClientImpl client) {
+        this.service = retrofit.create(SubscriptionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Subscriptions to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SubscriptionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.subscription.v2019_10_01_preview.Subscriptions createSubscriptionInEnrollmentAccount" })
+        @POST("providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> createSubscriptionInEnrollmentAccount(@Path("enrollmentAccountName") String enrollmentAccountName, @Query("api-version") String apiVersion, @Body SubscriptionCreationParameters body, @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.subscription.v2019_10_01_preview.Subscriptions beginCreateSubscriptionInEnrollmentAccount" })
+        @POST("providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> beginCreateSubscriptionInEnrollmentAccount(@Path("enrollmentAccountName") String enrollmentAccountName, @Query("api-version") String apiVersion, @Body SubscriptionCreationParameters body, @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.subscription.v2019_10_01_preview.Subscriptions cancel" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Subscription/cancel")
+        Observable<Response<ResponseBody>> cancel(@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.subscription.v2019_10_01_preview.Subscriptions rename" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Subscription/rename")
+        Observable<Response<ResponseBody>> rename(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body SubscriptionName body, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.subscription.v2019_10_01_preview.Subscriptions enable" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Subscription/enable")
+        Observable<Response<ResponseBody>> enable(@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.subscription.v2019_10_01_preview.Subscriptions createSubscription" })
+        @POST("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> createSubscription(@Path("billingAccountName") String billingAccountName, @Path("billingProfileName") String billingProfileName, @Path("invoiceSectionName") String invoiceSectionName, @Query("api-version") String apiVersion, @Body ModernSubscriptionCreationParameters body, @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.subscription.v2019_10_01_preview.Subscriptions beginCreateSubscription" })
+        @POST("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> beginCreateSubscription(@Path("billingAccountName") String billingAccountName, @Path("billingProfileName") String billingProfileName, @Path("invoiceSectionName") String invoiceSectionName, @Query("api-version") String apiVersion, @Body ModernSubscriptionCreationParameters body, @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.subscription.v2019_10_01_preview.Subscriptions createCspSubscription" })
+        @POST("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> createCspSubscription(@Path("billingAccountName") String billingAccountName, @Path("customerName") String customerName, @Query("api-version") String apiVersion, @Body ModernCspSubscriptionCreationParameters body, @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.subscription.v2019_10_01_preview.Subscriptions beginCreateCspSubscription" })
+        @POST("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/providers/Microsoft.Subscription/createSubscription")
+        Observable<Response<ResponseBody>> beginCreateCspSubscription(@Path("billingAccountName") String billingAccountName, @Path("customerName") String customerName, @Query("api-version") String apiVersion, @Body ModernCspSubscriptionCreationParameters body, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner createSubscriptionInEnrollmentAccount(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        return createSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body).toBlocking().last().body();
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> createSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body), serviceCallback);
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SubscriptionCreationResultInner> createSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        return createSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>> createSubscriptionInEnrollmentAccountWithServiceResponseAsync(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        if (enrollmentAccountName == null) {
+            throw new IllegalArgumentException("Parameter enrollmentAccountName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        Observable<Response<ResponseBody>> observable = service.createSubscriptionInEnrollmentAccount(enrollmentAccountName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<SubscriptionCreationResultInner>() { }.getType(), SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.class);
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner beginCreateSubscriptionInEnrollmentAccount(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        return beginCreateSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body).toBlocking().single().body();
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> beginCreateSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body), serviceCallback);
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<SubscriptionCreationResultInner> beginCreateSubscriptionInEnrollmentAccountAsync(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        return beginCreateSubscriptionInEnrollmentAccountWithServiceResponseAsync(enrollmentAccountName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates an Azure subscription.
+     *
+     * @param enrollmentAccountName The name of the enrollment account to which the subscription will be billed.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>> beginCreateSubscriptionInEnrollmentAccountWithServiceResponseAsync(String enrollmentAccountName, SubscriptionCreationParameters body) {
+        if (enrollmentAccountName == null) {
+            throw new IllegalArgumentException("Parameter enrollmentAccountName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        return service.beginCreateSubscriptionInEnrollmentAccount(enrollmentAccountName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders> clientResponse = beginCreateSubscriptionInEnrollmentAccountDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders> beginCreateSubscriptionInEnrollmentAccountDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubscriptionCreationResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubscriptionCreationResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .buildWithHeaders(response, SubscriptionCreateSubscriptionInEnrollmentAccountHeaders.class);
+    }
+
+    /**
+     * The operation to cancel a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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 CanceledSubscriptionIdInner object if successful.
+     */
+    public CanceledSubscriptionIdInner cancel(String subscriptionId) {
+        return cancelWithServiceResponseAsync(subscriptionId).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to cancel a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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<CanceledSubscriptionIdInner> cancelAsync(String subscriptionId, final ServiceCallback<CanceledSubscriptionIdInner> serviceCallback) {
+        return ServiceFuture.fromResponse(cancelWithServiceResponseAsync(subscriptionId), serviceCallback);
+    }
+
+    /**
+     * The operation to cancel a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CanceledSubscriptionIdInner object
+     */
+    public Observable<CanceledSubscriptionIdInner> cancelAsync(String subscriptionId) {
+        return cancelWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<CanceledSubscriptionIdInner>, CanceledSubscriptionIdInner>() {
+            @Override
+            public CanceledSubscriptionIdInner call(ServiceResponse<CanceledSubscriptionIdInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to cancel a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CanceledSubscriptionIdInner object
+     */
+    public Observable<ServiceResponse<CanceledSubscriptionIdInner>> cancelWithServiceResponseAsync(String subscriptionId) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter 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.cancel(subscriptionId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CanceledSubscriptionIdInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CanceledSubscriptionIdInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CanceledSubscriptionIdInner> clientResponse = cancelDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CanceledSubscriptionIdInner> cancelDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CanceledSubscriptionIdInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CanceledSubscriptionIdInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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 RenamedSubscriptionIdInner object if successful.
+     */
+    public RenamedSubscriptionIdInner rename(String subscriptionId) {
+        return renameWithServiceResponseAsync(subscriptionId).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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<RenamedSubscriptionIdInner> renameAsync(String subscriptionId, final ServiceCallback<RenamedSubscriptionIdInner> serviceCallback) {
+        return ServiceFuture.fromResponse(renameWithServiceResponseAsync(subscriptionId), serviceCallback);
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RenamedSubscriptionIdInner object
+     */
+    public Observable<RenamedSubscriptionIdInner> renameAsync(String subscriptionId) {
+        return renameWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<RenamedSubscriptionIdInner>, RenamedSubscriptionIdInner>() {
+            @Override
+            public RenamedSubscriptionIdInner call(ServiceResponse<RenamedSubscriptionIdInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RenamedSubscriptionIdInner object
+     */
+    public Observable<ServiceResponse<RenamedSubscriptionIdInner>> renameWithServiceResponseAsync(String subscriptionId) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter 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 subscriptionName = null;
+        SubscriptionName body = new SubscriptionName();
+        body.withSubscriptionName(null);
+        return service.rename(subscriptionId, this.client.apiVersion(), this.client.acceptLanguage(), body, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RenamedSubscriptionIdInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RenamedSubscriptionIdInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RenamedSubscriptionIdInner> clientResponse = renameDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @param subscriptionName New subscription 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 RenamedSubscriptionIdInner object if successful.
+     */
+    public RenamedSubscriptionIdInner rename(String subscriptionId, String subscriptionName) {
+        return renameWithServiceResponseAsync(subscriptionId, subscriptionName).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @param subscriptionName New subscription 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<RenamedSubscriptionIdInner> renameAsync(String subscriptionId, String subscriptionName, final ServiceCallback<RenamedSubscriptionIdInner> serviceCallback) {
+        return ServiceFuture.fromResponse(renameWithServiceResponseAsync(subscriptionId, subscriptionName), serviceCallback);
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @param subscriptionName New subscription name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RenamedSubscriptionIdInner object
+     */
+    public Observable<RenamedSubscriptionIdInner> renameAsync(String subscriptionId, String subscriptionName) {
+        return renameWithServiceResponseAsync(subscriptionId, subscriptionName).map(new Func1<ServiceResponse<RenamedSubscriptionIdInner>, RenamedSubscriptionIdInner>() {
+            @Override
+            public RenamedSubscriptionIdInner call(ServiceResponse<RenamedSubscriptionIdInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to rename a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @param subscriptionName New subscription name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RenamedSubscriptionIdInner object
+     */
+    public Observable<ServiceResponse<RenamedSubscriptionIdInner>> renameWithServiceResponseAsync(String subscriptionId, String subscriptionName) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter 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.");
+        }
+        SubscriptionName body = new SubscriptionName();
+        body.withSubscriptionName(subscriptionName);
+        return service.rename(subscriptionId, this.client.apiVersion(), this.client.acceptLanguage(), body, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RenamedSubscriptionIdInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RenamedSubscriptionIdInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RenamedSubscriptionIdInner> clientResponse = renameDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RenamedSubscriptionIdInner> renameDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RenamedSubscriptionIdInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RenamedSubscriptionIdInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * The operation to enable a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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 EnabledSubscriptionIdInner object if successful.
+     */
+    public EnabledSubscriptionIdInner enable(String subscriptionId) {
+        return enableWithServiceResponseAsync(subscriptionId).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to enable a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @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<EnabledSubscriptionIdInner> enableAsync(String subscriptionId, final ServiceCallback<EnabledSubscriptionIdInner> serviceCallback) {
+        return ServiceFuture.fromResponse(enableWithServiceResponseAsync(subscriptionId), serviceCallback);
+    }
+
+    /**
+     * The operation to enable a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EnabledSubscriptionIdInner object
+     */
+    public Observable<EnabledSubscriptionIdInner> enableAsync(String subscriptionId) {
+        return enableWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<EnabledSubscriptionIdInner>, EnabledSubscriptionIdInner>() {
+            @Override
+            public EnabledSubscriptionIdInner call(ServiceResponse<EnabledSubscriptionIdInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to enable a subscription.
+     *
+     * @param subscriptionId Subscription Id.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EnabledSubscriptionIdInner object
+     */
+    public Observable<ServiceResponse<EnabledSubscriptionIdInner>> enableWithServiceResponseAsync(String subscriptionId) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter 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.enable(subscriptionId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EnabledSubscriptionIdInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EnabledSubscriptionIdInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EnabledSubscriptionIdInner> clientResponse = enableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EnabledSubscriptionIdInner> enableDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EnabledSubscriptionIdInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EnabledSubscriptionIdInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner createSubscription(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        return createSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body).toBlocking().last().body();
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> createSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body), serviceCallback);
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SubscriptionCreationResultInner> createSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        return createSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>> createSubscriptionWithServiceResponseAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        if (billingAccountName == null) {
+            throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
+        }
+        if (billingProfileName == null) {
+            throw new IllegalArgumentException("Parameter billingProfileName is required and cannot be null.");
+        }
+        if (invoiceSectionName == null) {
+            throw new IllegalArgumentException("Parameter invoiceSectionName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        Observable<Response<ResponseBody>> observable = service.createSubscription(billingAccountName, billingProfileName, invoiceSectionName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<SubscriptionCreationResultInner>() { }.getType(), SubscriptionCreateSubscriptionHeaders.class);
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner beginCreateSubscription(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        return beginCreateSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> beginCreateSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body), serviceCallback);
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<SubscriptionCreationResultInner> beginCreateSubscriptionAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        return beginCreateSubscriptionWithServiceResponseAsync(billingAccountName, billingProfileName, invoiceSectionName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to create a new WebDirect or EA Azure subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param billingProfileName The name of the billing profile in the billing account for which you want to create the subscription.
+     * @param invoiceSectionName The name of the invoice section in the billing account for which you want to create the subscription.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>> beginCreateSubscriptionWithServiceResponseAsync(String billingAccountName, String billingProfileName, String invoiceSectionName, ModernSubscriptionCreationParameters body) {
+        if (billingAccountName == null) {
+            throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
+        }
+        if (billingProfileName == null) {
+            throw new IllegalArgumentException("Parameter billingProfileName is required and cannot be null.");
+        }
+        if (invoiceSectionName == null) {
+            throw new IllegalArgumentException("Parameter invoiceSectionName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        return service.beginCreateSubscription(billingAccountName, billingProfileName, invoiceSectionName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders> clientResponse = beginCreateSubscriptionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateSubscriptionHeaders> beginCreateSubscriptionDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubscriptionCreationResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubscriptionCreationResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .buildWithHeaders(response, SubscriptionCreateSubscriptionHeaders.class);
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner createCspSubscription(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        return createCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body).toBlocking().last().body();
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> createCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body), serviceCallback);
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SubscriptionCreationResultInner> createCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        return createCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>> createCspSubscriptionWithServiceResponseAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        if (billingAccountName == null) {
+            throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
+        }
+        if (customerName == null) {
+            throw new IllegalArgumentException("Parameter customerName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        Observable<Response<ResponseBody>> observable = service.createCspSubscription(billingAccountName, customerName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<SubscriptionCreationResultInner>() { }.getType(), SubscriptionCreateCspSubscriptionHeaders.class);
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @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 SubscriptionCreationResultInner object if successful.
+     */
+    public SubscriptionCreationResultInner beginCreateCspSubscription(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        return beginCreateCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body).toBlocking().single().body();
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @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<SubscriptionCreationResultInner> beginCreateCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body, final ServiceCallback<SubscriptionCreationResultInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body), serviceCallback);
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<SubscriptionCreationResultInner> beginCreateCspSubscriptionAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        return beginCreateCspSubscriptionWithServiceResponseAsync(billingAccountName, customerName, body).map(new Func1<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>, SubscriptionCreationResultInner>() {
+            @Override
+            public SubscriptionCreationResultInner call(ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The operation to create a new CSP subscription.
+     *
+     * @param billingAccountName The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
+     * @param customerName The name of the customer.
+     * @param body The subscription creation parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubscriptionCreationResultInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>> beginCreateCspSubscriptionWithServiceResponseAsync(String billingAccountName, String customerName, ModernCspSubscriptionCreationParameters body) {
+        if (billingAccountName == null) {
+            throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
+        }
+        if (customerName == null) {
+            throw new IllegalArgumentException("Parameter customerName 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 (body == null) {
+            throw new IllegalArgumentException("Parameter body is required and cannot be null.");
+        }
+        Validator.validate(body);
+        return service.beginCreateCspSubscription(billingAccountName, customerName, this.client.apiVersion(), body, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders> clientResponse = beginCreateCspSubscriptionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SubscriptionCreationResultInner, SubscriptionCreateCspSubscriptionHeaders> beginCreateCspSubscriptionDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubscriptionCreationResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubscriptionCreationResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .buildWithHeaders(response, SubscriptionCreateCspSubscriptionHeaders.class);
+    }
+
+}
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/package-info.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/implementation/package-info.java
new file mode 100644
index 000000000000..d43727c40600
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_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 SubscriptionClient.
+ * The subscription client.
+ */
+package com.microsoft.azure.management.subscription.v2019_10_01_preview.implementation;
diff --git a/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/package-info.java b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_01_preview/package-info.java
new file mode 100644
index 000000000000..c7ca24ae402f
--- /dev/null
+++ b/sdk/subscription/mgmt-v2019_10_01_preview/src/main/java/com/microsoft/azure/management/subscription/v2019_10_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 SubscriptionClient.
+ * The subscription client.
+ */
+package com.microsoft.azure.management.subscription.v2019_10_01_preview;
diff --git a/sdk/subscription/pom.mgmt.xml b/sdk/subscription/pom.mgmt.xml
new file mode 100644
index 000000000000..14c12542d765
--- /dev/null
+++ b/sdk/subscription/pom.mgmt.xml
@@ -0,0 +1,14 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved.
+     Licensed under the MIT License. -->
+<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.azure</groupId>
+  <artifactId>azure-subscription-management</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <modules>
+    <module>mgmt-v2019_10_01_preview</module>
+  </modules>
+</project>

From 9f72595a41c8ec22ee298355efdca3366cc653a8 Mon Sep 17 00:00:00 2001
From: Chuang <54572251+xccc-msft@users.noreply.github.com>
Date: Fri, 8 May 2020 13:49:55 +0800
Subject: [PATCH 29/41] mgmt samples spotbugs errors clean (#10889)

---
 .../ManageLinuxWebAppWithTrafficManager.java  | 103 ++++++-----------
 .../ManageWebAppWithTrafficManager.java       | 105 ++++++------------
 .../CreateVirtualMachinesInParallel.java      |  16 +--
 .../compute/samples/ListComputeSkus.java      |   1 -
 .../compute/samples/ManageManagedDisks.java   |   8 +-
 ...etUserAssignedMSIFromServicePrincipal.java |  18 ++-
 .../ManageVirtualMachineScaleSetAsync.java    |   4 +
 .../ManageZonalVirtualMachineScaleSet.java    |   4 +-
 .../management/dns/samples/ManageDns.java     |   1 -
 .../com/azure/management/samples/Utils.java   |   8 +-
 .../samples/AppServiceSampleTests.java        |  20 ++--
 11 files changed, 119 insertions(+), 169 deletions(-)

diff --git a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppWithTrafficManager.java b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppWithTrafficManager.java
index af9bd314d93f..febb456be14d 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppWithTrafficManager.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppWithTrafficManager.java
@@ -1,45 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-
-package com.azure.management.appservice.samples;
-
-import com.azure.core.credential.TokenCredential;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.management.AzureEnvironment;
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.management.Azure;
-import com.azure.management.resources.fluentcore.profile.AzureProfile;
-
+//
+//package com.azure.management.appservice.samples;
+//
+//import com.azure.core.credential.TokenCredential;
+//import com.azure.core.http.policy.HttpLogDetailLevel;
+//import com.azure.core.management.AzureEnvironment;
+//import com.azure.identity.DefaultAzureCredentialBuilder;
+//import com.azure.management.Azure;
+//import com.azure.management.resources.fluentcore.profile.AzureProfile;
+//
 //import com.azure.management.trafficmanager.TrafficManagerProfile;
 //import com.azure.management.trafficmanager.TrafficRoutingMethod;
-
-
-/**
- * Azure App Service sample for managing web apps.
- *  - Create a domain
- *  - Create a self-signed certificate for the domain
- *  - Create 3 app service plans in 3 different regions
- *  - Create 5 web apps under the 3 plans, bound to the domain and the certificate
- *  - Create a traffic manager in front of the web apps
- *  - Scale up the app service plans to twice the capacity
- */
-public final class ManageLinuxWebAppWithTrafficManager {
+//
+//
+///**
+// * Azure App Service sample for managing web apps.
+// *  - Create a domain
+// *  - Create a self-signed certificate for the domain
+// *  - Create 3 app service plans in 3 different regions
+// *  - Create 5 web apps under the 3 plans, bound to the domain and the certificate
+// *  - Create a traffic manager in front of the web apps
+// *  - Scale up the app service plans to twice the capacity
+// */
+//public final class ManageLinuxWebAppWithTrafficManager {
 //    private static String rgName;
-    // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")]
-    private static final String CERT_PASSWORD = "StrongPass!12";
-
-    private static Azure azure;
+//    [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")]
+//    private static final String CERT_PASSWORD = "StrongPass!12";
+//
+//    private static Azure azure;
 //    private static AppServiceDomain domain;
 //    private static String pfxPath;
 
-    /**
-     * Main function which runs the actual sample.
-     * @param azure instance of the azure client
-     * @return true if sample runs successfully
-     */
-    public static boolean runSample(Azure azure) {
-        System.out.println("removed later");
-        return true;
+//    /**
+//     * Main function which runs the actual sample.
+//     * @param azure instance of the azure client
+//     * @return true if sample runs successfully
+//     */
+//    public static boolean runSample(Azure azure) {
+//        System.out.println("removed later");
+//        return true;
 //        RG_NAME = azure.sdkContext().randomResourceName("rgNEMV_", 24);
 //
 //        if (ManageLinuxWebAppWithTrafficManager.azure == null) {
@@ -230,38 +230,7 @@ public static boolean runSample(Azure azure) {
 //        }
 //
 //        return false;
-    }
-    /**
-     * Main entry point.
-     * @param args the parameters
-     */
-    public static void main(String[] args) {
-        try {
-
-            //=============================================================
-            // Authenticate
-
-            final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
-            final TokenCredential credential = new DefaultAzureCredentialBuilder()
-                .authorityHost(profile.environment().getActiveDirectoryEndpoint())
-                .build();
-
-            Azure azure = Azure
-                .configure()
-                .withLogLevel(HttpLogDetailLevel.BASIC)
-                .authenticate(credential, profile)
-                .withDefaultSubscription();
-
-            // Print selected subscription
-            System.out.println("Selected subscription: " + azure.subscriptionId());
-
-            runSample(azure);
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
+//
 //    private static AppServicePlan createAppServicePlan(String name, Region region) {
 //        return azure.appServicePlans().define(name)
 //                .withRegion(region)
@@ -288,4 +257,4 @@ public static void main(String[] args) {
 //                    .attach()
 //                .create();
 //    }
-}
+//}
diff --git a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppWithTrafficManager.java b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppWithTrafficManager.java
index 560c03d0e6a2..58d97c58bcdb 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppWithTrafficManager.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppWithTrafficManager.java
@@ -1,45 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-
-package com.azure.management.appservice.samples;
-
-import com.azure.core.credential.TokenCredential;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.management.AzureEnvironment;
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.management.Azure;
-import com.azure.management.resources.fluentcore.profile.AzureProfile;
-
+//
+//package com.azure.management.appservice.samples;
+//
+//import com.azure.core.credential.TokenCredential;
+//import com.azure.core.http.policy.HttpLogDetailLevel;
+//import com.azure.core.management.AzureEnvironment;
+//import com.azure.identity.DefaultAzureCredentialBuilder;
+//import com.azure.management.Azure;
+//import com.azure.management.resources.fluentcore.profile.AzureProfile;
+//
 //import com.azure.management.trafficmanager.TrafficManagerProfile;
 //import com.azure.management.trafficmanager.TrafficRoutingMethod;
-
-
-/**
- * Azure App Service sample for managing web apps.
- *  - Create a domain
- *  - Create a self-signed certificate for the domain
- *  - Create 3 app service plans in 3 different regions
- *  - Create 5 web apps under the 3 plans, bound to the domain and the certificate
- *  - Create a traffic manager in front of the web apps
- *  - Scale up the app service plans to twice the capacity
- */
-public final class ManageWebAppWithTrafficManager {
+//
+//
+///**
+// * Azure App Service sample for managing web apps.
+// *  - Create a domain
+// *  - Create a self-signed certificate for the domain
+// *  - Create 3 app service plans in 3 different regions
+// *  - Create 5 web apps under the 3 plans, bound to the domain and the certificate
+// *  - Create a traffic manager in front of the web apps
+// *  - Scale up the app service plans to twice the capacity
+// */
+//public final class ManageWebAppWithTrafficManager {
 //    private static String rgName;
-    // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")]
-    private static final String CERT_PASSWORD = "StrongPass!12";
-
-    private static Azure azure;
+//    [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")]
+//    private static final String CERT_PASSWORD = "StrongPass!12";
+//
+//    private static Azure azure;
 //    private static AppServiceDomain domain;
 //    private static String pfxPath;
-
-    /**
-     * Main function which runs the actual sample.
-     * @param azure instance of the azure client
-     * @return true if sample runs successfully
-     */
-    public static boolean runSample(Azure azure) {
-        System.out.println("removed later");
-        return true;
+//
+//    /**
+//     * Main function which runs the actual sample.
+//     * @param azure instance of the azure client
+//     * @return true if sample runs successfully
+//     */
+//    public static boolean runSample(Azure azure) {
+//        System.out.println("removed later");
+//        return true;
 //        RG_NAME = azure.sdkContext().randomResourceName("rgNEMV_", 24);
 //
 //        if (ManageWebAppWithTrafficManager.azure == null) {
@@ -230,38 +230,7 @@ public static boolean runSample(Azure azure) {
 //        }
 //
 //        return false;
-    }
-    /**
-     * Main entry point.
-     * @param args the parameters
-     */
-    public static void main(String[] args) {
-        try {
-
-            //=============================================================
-            // Authenticate
-
-            final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
-            final TokenCredential credential = new DefaultAzureCredentialBuilder()
-                .authorityHost(profile.environment().getActiveDirectoryEndpoint())
-                .build();
-
-            Azure azure = Azure
-                .configure()
-                .withLogLevel(HttpLogDetailLevel.BASIC)
-                .authenticate(credential, profile)
-                .withDefaultSubscription();
-
-            // Print selected subscription
-            System.out.println("Selected subscription: " + azure.subscriptionId());
-
-            runSample(azure);
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
+//
 //    private static AppServicePlan createAppServicePlan(String name, Region region) {
 //        return azure.appServicePlans().define(name)
 //                .withRegion(region)
@@ -287,4 +256,4 @@ public static void main(String[] args) {
 //                    .attach()
 //                .create();
 //    }
-}
+//}
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java
index 285d521e6389..93a7ed7c05fa 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java
@@ -75,7 +75,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Created a new resource group - " + resourceGroup.id());
 
-            List<String> publicIpCreatableKeys = new ArrayList<>();
+//            List<String> publicIpCreatableKeys = new ArrayList<>();
             // Prepare a batch of Creatable definitions
             //
             List<Creatable<VirtualMachine>> creatableVirtualMachines = new ArrayList<>();
@@ -114,7 +114,7 @@ public static boolean runSample(Azure azure) {
                                 .withExistingResourceGroup(resourceGroup)
                                 .withLeafDomainLabel(azure.sdkContext().randomResourceName("pip", 10));
 
-                    publicIpCreatableKeys.add(publicIPAddressCreatable.key());
+//                    publicIpCreatableKeys.add(publicIPAddressCreatable.key());
 
                     //=============================================================
                     // Create 1 virtual machine creatable
@@ -153,12 +153,12 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Virtual Machines created: (took " + (stopwatch.getTime() / 1000) + " seconds to create) == " + virtualMachines.size() + " == virtual machines");
 
-            List<String> publicIpResourceIds = new ArrayList<>();
-            for (String publicIpCreatableKey : publicIpCreatableKeys) {
-                PublicIPAddress pip = (PublicIPAddress) virtualMachines.createdRelatedResource(publicIpCreatableKey);
-                publicIpResourceIds.add(pip.id());
-            }
-
+//            List<String> publicIpResourceIds = new ArrayList<>();
+//            for (String publicIpCreatableKey : publicIpCreatableKeys) {
+//                PublicIPAddress pip = (PublicIPAddress) virtualMachines.createdRelatedResource(publicIpCreatableKey);
+//                publicIpResourceIds.add(pip.id());
+//            }
+//
 //            //=============================================================
 //            // Create 1 Traffic Manager Profile
 //            //
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ListComputeSkus.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ListComputeSkus.java
index b647decf5873..19cad7574c07 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ListComputeSkus.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ListComputeSkus.java
@@ -55,7 +55,6 @@ public static boolean runSample(Azure azure) {
             } else if (sku.resourceType().equals(ComputeResourceType.SNAPSHOTS)) {
                 size = sku.diskSkuType().toString();
             }
-            Map<Region, Set<AvailabilityZoneId>> regionZones = sku.zones();
             System.out.println(String.format(format, sku.name(), sku.resourceType(), size, regionZoneToString(sku.zones())));
         }
 
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageManagedDisks.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageManagedDisks.java
index ec93a9083cbc..e05c63710a42 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageManagedDisks.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageManagedDisks.java
@@ -72,7 +72,7 @@ public static boolean runSample(Azure azure) {
                     .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
                     .create();
 
-            System.out.println("Created VM [with an implicit Managed OS disk and explicit Managed data disk]");
+            System.out.println("Created VM [with an implicit Managed OS disk and explicit Managed data disk]: " + linuxVM1.id());
 
             // Creation is simplified with implicit creation of managed disks without specifying all the disk details. You will notice that you do not require storage accounts
             // ::== Update the VM
@@ -186,7 +186,7 @@ public static boolean runSample(Azure azure) {
                     .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
                     .create();
 
-            System.out.println("Created VM [from custom image]");
+            System.out.println("Created VM [from custom image]: " + linuxVM3.id());
 
             // Create a VM from a VHD (Create Virtual Machine Using Specialized VHD)
 
@@ -207,7 +207,7 @@ public static boolean runSample(Azure azure) {
                     .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
                     .create();
 
-            System.out.println("Created VM [by attaching un-managed disk]");
+            System.out.println("Created VM [by attaching un-managed disk]: " + linuxVM4.id());
 
             // Create a Snapshot (Create Virtual Machine using specialized disks from snapshot)
 
@@ -292,7 +292,7 @@ public static boolean runSample(Azure azure) {
                     .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
                     .create();
 
-            System.out.println("Created VM [with specialized OS managed disk]");
+            System.out.println("Created VM [with specialized OS managed disk]: " + linuxVM6.id());
 
             // ::== Migrate a VM to managed disks with a single reboot
 
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java
index 7489367bb568..e353668140a0 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java
@@ -142,13 +142,21 @@ public static boolean runSample(Azure.Authenticated authenticated) {
             System.out.println(e.getMessage());
             e.printStackTrace();
         } finally {
-            azure.resourceGroups().beginDeleteByName(rgName);
-            try {
-                authenticated.servicePrincipals().deleteById(servicePrincipal.id());
-            } catch (Exception e) { }
+            if (azure != null) {
+                azure.resourceGroups().beginDeleteByName(rgName);
+                try {
+                    authenticated.servicePrincipals().deleteById(servicePrincipal.id());
+                } catch (Exception e) {
+                    System.out.println(e.getMessage());
+                    e.printStackTrace();
+                }
+            }
             try {
                 authenticated.activeDirectoryApplications().deleteById(authenticated.activeDirectoryApplications().getByName(servicePrincipal.applicationId()).id());
-            } catch (Exception e) { }
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+                e.printStackTrace();
+            }
         }
         return false;
     }
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachineScaleSetAsync.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachineScaleSetAsync.java
index d26c529d62ac..7a86912559be 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachineScaleSetAsync.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachineScaleSetAsync.java
@@ -255,6 +255,10 @@ public static boolean runSample(final Azure azure) {
                     })
                     .last().block();
 
+            if (virtualMachineScaleSet == null) {
+                return false;
+            }
+
             final String pipFqdn = publicIPAddress.fqdn();
             //=============================================================
             // List virtual machine scale set instance network interfaces and SSH connection string
diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageZonalVirtualMachineScaleSet.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageZonalVirtualMachineScaleSet.java
index 8bb327693ad3..4c50d4adb875 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageZonalVirtualMachineScaleSet.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageZonalVirtualMachineScaleSet.java
@@ -183,7 +183,7 @@ public static boolean runSample(Azure azure) {
                     .withAvailabilityZone(AvailabilityZoneId.ZONE_1)
                     .create();
 
-            System.out.println("Created zone aware virtual machine scale set");
+            System.out.println("Created zone aware virtual machine scale set: " + virtualMachineScaleSet1.id());
 
             //=============================================================
             // Create a zone aware virtual machine scale set
@@ -208,7 +208,7 @@ public static boolean runSample(Azure azure) {
                     .withAvailabilityZone(AvailabilityZoneId.ZONE_1)
                     .create();
 
-            System.out.println("Created zone aware virtual machine scale set");
+            System.out.println("Created zone aware virtual machine scale set: " + virtualMachineScaleSet2.id());
 
             return true;
         } catch (Exception f) {
diff --git a/sdk/management/samples/src/main/java/com/azure/management/dns/samples/ManageDns.java b/sdk/management/samples/src/main/java/com/azure/management/dns/samples/ManageDns.java
index 9ac76004d94c..4aef2b95815a 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/dns/samples/ManageDns.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/dns/samples/ManageDns.java
@@ -49,7 +49,6 @@ public class ManageDns {
     public static boolean runSample(Azure azure) {
         final String customDomainName         = "THE CUSTOM DOMAIN THAT YOU OWN (e.g. contoso.com)";
         final String rgName                   = azure.sdkContext().randomResourceName("rgNEMV_", 24);
-        final String appServicePlanName       = azure.sdkContext().randomResourceName("jplan1_", 15);
         final String webAppName               = azure.sdkContext().randomResourceName("webapp1-", 20);
 
         try {
diff --git a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
index 8f9fff292bb2..05af896f68c5 100644
--- a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
+++ b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java
@@ -172,6 +172,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -3086,9 +3087,10 @@ private interface WebAppTestClient {
 
     public static synchronized <T> int getSize(Iterable<T> iterable) {
         int res = 0;
-
-        for (T t : iterable) {
-            res++;
+        Iterator<T> iterator = iterable.iterator();
+        while (iterator.hasNext()) {
+            iterator.next();
+            ++res;
         }
         return res;
     }
diff --git a/sdk/management/samples/src/test/java/com/azure/management/samples/AppServiceSampleTests.java b/sdk/management/samples/src/test/java/com/azure/management/samples/AppServiceSampleTests.java
index 1a304d7ee239..d4f123b2c59a 100644
--- a/sdk/management/samples/src/test/java/com/azure/management/samples/AppServiceSampleTests.java
+++ b/sdk/management/samples/src/test/java/com/azure/management/samples/AppServiceSampleTests.java
@@ -8,13 +8,13 @@
 import com.azure.management.appservice.samples.ManageLinuxWebAppBasic;
 import com.azure.management.appservice.samples.ManageLinuxWebAppSqlConnection;
 import com.azure.management.appservice.samples.ManageLinuxWebAppWithDomainSsl;
-import com.azure.management.appservice.samples.ManageLinuxWebAppWithTrafficManager;
+//import com.azure.management.appservice.samples.ManageLinuxWebAppWithTrafficManager;
 import com.azure.management.appservice.samples.ManageWebAppBasic;
 import com.azure.management.appservice.samples.ManageWebAppSlots;
 import com.azure.management.appservice.samples.ManageWebAppSourceControlAsync;
 import com.azure.management.appservice.samples.ManageWebAppSqlConnection;
 import com.azure.management.appservice.samples.ManageWebAppWithDomainSsl;
-import com.azure.management.appservice.samples.ManageWebAppWithTrafficManager;
+//import com.azure.management.appservice.samples.ManageWebAppWithTrafficManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -48,10 +48,10 @@ public void testManageWebAppWithDomainSsl() {
         Assertions.assertTrue(ManageWebAppWithDomainSsl.runSample(azure));
     }
 
-    @Test
-    public void testManageWebAppWithTrafficManager() {
-        Assertions.assertTrue(ManageWebAppWithTrafficManager.runSample(azure));
-    }
+//    @Test
+//    public void testManageWebAppWithTrafficManager() {
+//        Assertions.assertTrue(ManageWebAppWithTrafficManager.runSample(azure));
+//    }
 
     @Test
     public void testManageLinuxWebAppBasic() {
@@ -69,10 +69,10 @@ public void testManageLinuxWebAppWithDomainSsl() {
         Assertions.assertTrue(ManageLinuxWebAppWithDomainSsl.runSample(azure));
     }
 
-    @Test
-    public void testManageLinuxWebAppWithTrafficManager() {
-        Assertions.assertTrue(ManageLinuxWebAppWithTrafficManager.runSample(azure));
-    }
+//    @Test
+//    public void testManageLinuxWebAppWithTrafficManager() {
+//        Assertions.assertTrue(ManageLinuxWebAppWithTrafficManager.runSample(azure));
+//    }
 
     @Test
     public void testManageFunctionAppBasic() {

From e963343551bad18e850024c5a9f819b2fb53cc0f Mon Sep 17 00:00:00 2001
From: Tanyi Chen <tanchen@microsoft.com>
Date: Fri, 8 May 2020 16:17:04 +0800
Subject: [PATCH 30/41] Mgmt generate: network 2020 04 (#10797)

* feat: generate network 2020 04

* feat: update pom

* fix: compile error
---
 sdk/network/mgmt-v2020_04_01/pom.xml          |  135 +
 .../AadAuthenticationParameters.java          |   95 +
 .../network/v2020_04_01/Access.java           |   41 +
 .../network/v2020_04_01/AddressSpace.java     |   46 +
 .../v2020_04_01/ApplicationGateway.java       |  815 +++
 ...ationGatewayAuthenticationCertificate.java |  119 +
 ...licationGatewayAutoscaleConfiguration.java |   69 +
 ...ApplicationGatewayAvailableSslOptions.java |   68 +
 ...tionGatewayAvailableWafRuleSetsResult.java |   26 +
 .../ApplicationGatewayBackendAddress.java     |   69 +
 .../ApplicationGatewayBackendAddressPool.java |  136 +
 .../ApplicationGatewayBackendHealth.java      |   26 +
 ...ationGatewayBackendHealthHttpSettings.java |   70 +
 ...plicationGatewayBackendHealthOnDemand.java |   30 +
 .../ApplicationGatewayBackendHealthPool.java  |   70 +
 ...ApplicationGatewayBackendHealthServer.java |  123 +
 ...ationGatewayBackendHealthServerHealth.java |   50 +
 ...ApplicationGatewayBackendHttpSettings.java |  437 ++
 .../ApplicationGatewayConnectionDraining.java |   72 +
 ...ApplicationGatewayCookieBasedAffinity.java |   41 +
 .../ApplicationGatewayCustomError.java        |   70 +
 ...plicationGatewayCustomErrorStatusCode.java |   41 +
 ...ationGatewayFirewallDisabledRuleGroup.java |   71 +
 .../ApplicationGatewayFirewallExclusion.java  |   97 +
 .../ApplicationGatewayFirewallMode.java       |   41 +
 .../ApplicationGatewayFirewallRule.java       |   69 +
 .../ApplicationGatewayFirewallRuleGroup.java  |   96 +
 .../ApplicationGatewayFirewallRuleSet.java    |  143 +
 ...icationGatewayFrontendIPConfiguration.java |  198 +
 .../ApplicationGatewayFrontendPort.java       |  118 +
 ...ApplicationGatewayHeaderConfiguration.java |   69 +
 .../ApplicationGatewayHttpListener.java       |  328 ++
 .../ApplicationGatewayIPConfiguration.java    |  122 +
 .../ApplicationGatewayOnDemandProbe.java      |  233 +
 .../ApplicationGatewayOperationalState.java   |   47 +
 .../ApplicationGatewayPathRule.java           |  249 +
 .../v2020_04_01/ApplicationGatewayProbe.java  |  365 ++
 ...cationGatewayProbeHealthResponseMatch.java |   72 +
 .../ApplicationGatewayProtocol.java           |   41 +
 ...plicationGatewayRedirectConfiguration.java |  287 ++
 .../ApplicationGatewayRedirectType.java       |   47 +
 .../ApplicationGatewayRequestRoutingRule.java |  301 ++
 ...licationGatewayRequestRoutingRuleType.java |   41 +
 .../ApplicationGatewayRewriteRule.java        |  123 +
 ...pplicationGatewayRewriteRuleActionSet.java |   96 +
 ...pplicationGatewayRewriteRuleCondition.java |  124 +
 .../ApplicationGatewayRewriteRuleSet.java     |  105 +
 .../v2020_04_01/ApplicationGatewaySku.java    |   98 +
 .../ApplicationGatewaySkuName.java            |   56 +
 .../ApplicationGatewaySslCertificate.java     |  189 +
 .../ApplicationGatewaySslCipherSuite.java     |  119 +
 .../ApplicationGatewaySslPolicy.java          |  152 +
 .../ApplicationGatewaySslPolicyName.java      |   44 +
 .../ApplicationGatewaySslPolicyType.java      |   41 +
 ...ApplicationGatewaySslPredefinedPolicy.java |   41 +
 .../ApplicationGatewaySslProtocol.java        |   44 +
 .../v2020_04_01/ApplicationGatewayTier.java   |   47 +
 ...licationGatewayTrustedRootCertificate.java |  146 +
 .../ApplicationGatewayUrlConfiguration.java   |   98 +
 .../ApplicationGatewayUrlPathMap.java         |  224 +
 ...ayWebApplicationFirewallConfiguration.java |  280 +
 .../v2020_04_01/ApplicationGateways.java      |  124 +
 .../v2020_04_01/ApplicationRuleCondition.java |  204 +
 .../v2020_04_01/ApplicationSecurityGroup.java |   83 +
 .../ApplicationSecurityGroups.java            |   25 +
 .../network/v2020_04_01/AssociationType.java  |   41 +
 .../v2020_04_01/AuthenticationMethod.java     |   41 +
 .../v2020_04_01/AuthorizationUseStatus.java   |   41 +
 .../AutoApprovedPrivateLinkService.java       |   25 +
 .../network/v2020_04_01/Availability.java     |   95 +
 .../v2020_04_01/AvailableDelegations.java     |   28 +
 .../AvailableEndpointServices.java            |   28 +
 .../AvailablePrivateEndpointType.java         |   40 +
 .../AvailablePrivateEndpointTypes.java        |   38 +
 .../v2020_04_01/AvailableProvidersList.java   |   26 +
 .../AvailableProvidersListCity.java           |   70 +
 .../AvailableProvidersListCountry.java        |   96 +
 .../AvailableProvidersListParameters.java     |  122 +
 .../AvailableProvidersListState.java          |   96 +
 .../AvailableResourceGroupDelegations.java    |   29 +
 .../v2020_04_01/AvailableServiceAlias.java    |   40 +
 .../v2020_04_01/AvailableServiceAliases.java  |   38 +
 .../AzureAsyncOperationResult.java            |   77 +
 .../network/v2020_04_01/AzureFirewall.java    |  410 ++
 .../AzureFirewallApplicationRule.java         |  200 +
 ...zureFirewallApplicationRuleCollection.java |  157 +
 .../AzureFirewallApplicationRuleProtocol.java |   70 +
 ...reFirewallApplicationRuleProtocolType.java |   44 +
 .../v2020_04_01/AzureFirewallFqdnTag.java     |   38 +
 .../v2020_04_01/AzureFirewallFqdnTags.java    |   19 +
 .../AzureFirewallIPConfiguration.java         |  163 +
 .../v2020_04_01/AzureFirewallIpGroups.java    |   47 +
 .../v2020_04_01/AzureFirewallNatRCAction.java |   43 +
 .../AzureFirewallNatRCActionType.java         |   41 +
 .../v2020_04_01/AzureFirewallNatRule.java     |  279 +
 .../AzureFirewallNatRuleCollection.java       |  157 +
 .../v2020_04_01/AzureFirewallNetworkRule.java |  252 +
 .../AzureFirewallNetworkRuleCollection.java   |  157 +
 .../AzureFirewallNetworkRuleProtocol.java     |   47 +
 .../AzureFirewallPublicIPAddress.java         |   43 +
 .../v2020_04_01/AzureFirewallRCAction.java    |   43 +
 .../AzureFirewallRCActionType.java            |   41 +
 .../network/v2020_04_01/AzureFirewallSku.java |   71 +
 .../v2020_04_01/AzureFirewallSkuName.java     |   41 +
 .../v2020_04_01/AzureFirewallSkuTier.java     |   41 +
 .../AzureFirewallThreatIntelMode.java         |   44 +
 .../network/v2020_04_01/AzureFirewalls.java   |   25 +
 .../v2020_04_01/AzureReachabilityReport.java  |   36 +
 .../AzureReachabilityReportItem.java          |   96 +
 .../AzureReachabilityReportLatencyInfo.java   |   71 +
 .../AzureReachabilityReportLocation.java      |   95 +
 .../AzureReachabilityReportParameters.java    |  149 +
 .../network/v2020_04_01/BGPCommunity.java     |  175 +
 .../v2020_04_01/BackendAddressPool.java       |  197 +
 .../v2020_04_01/BastionConnectProtocol.java   |   41 +
 .../network/v2020_04_01/BastionHost.java      |  137 +
 .../BastionHostIPConfiguration.java           |  172 +
 .../network/v2020_04_01/BastionHosts.java     |   25 +
 .../BastionShareableLinkListRequest.java      |   45 +
 .../network/v2020_04_01/BgpPeerState.java     |   50 +
 .../network/v2020_04_01/BgpPeerStatus.java    |  138 +
 .../v2020_04_01/BgpPeerStatusListResult.java  |   26 +
 .../v2020_04_01/BgpServiceCommunities.java    |   19 +
 .../v2020_04_01/BgpServiceCommunity.java      |   34 +
 .../network/v2020_04_01/BgpSettings.java      |  123 +
 ...ckPrivateLinkServiceVisibilityRequest.java |   43 +
 .../v2020_04_01/CircuitConnectionStatus.java  |   44 +
 .../ConnectionMonitorDestination.java         |   95 +
 .../ConnectionMonitorEndpoint.java            |  121 +
 .../ConnectionMonitorEndpointFilter.java      |   71 +
 .../ConnectionMonitorEndpointFilterItem.java  |   70 +
 ...nnectionMonitorEndpointFilterItemType.java |   38 +
 .../ConnectionMonitorEndpointFilterType.java  |   38 +
 .../ConnectionMonitorHttpConfiguration.java   |  176 +
 .../ConnectionMonitorIcmpConfiguration.java   |   44 +
 .../v2020_04_01/ConnectionMonitorOutput.java  |   71 +
 .../ConnectionMonitorParameters.java          |  253 +
 .../ConnectionMonitorQueryResult.java         |   31 +
 .../v2020_04_01/ConnectionMonitorResult.java  |  435 ++
 .../v2020_04_01/ConnectionMonitorSource.java  |   69 +
 .../ConnectionMonitorSourceStatus.java        |   44 +
 .../ConnectionMonitorSuccessThreshold.java    |   71 +
 .../ConnectionMonitorTcpConfiguration.java    |   70 +
 .../ConnectionMonitorTestConfiguration.java   |  228 +
 ...ctionMonitorTestConfigurationProtocol.java |   44 +
 .../ConnectionMonitorTestGroup.java           |  148 +
 .../v2020_04_01/ConnectionMonitorType.java    |   41 +
 .../ConnectionMonitorWorkspaceSettings.java   |   43 +
 .../v2020_04_01/ConnectionMonitors.java       |   86 +
 .../v2020_04_01/ConnectionResetSharedKey.java |   25 +
 .../v2020_04_01/ConnectionSharedKey.java      |   30 +
 .../network/v2020_04_01/ConnectionState.java  |   44 +
 .../v2020_04_01/ConnectionStateSnapshot.java  |  270 +
 .../network/v2020_04_01/ConnectionStatus.java |   47 +
 .../v2020_04_01/ConnectivityDestination.java  |   96 +
 .../network/v2020_04_01/ConnectivityHop.java  |  108 +
 .../v2020_04_01/ConnectivityInformation.java  |   56 +
 .../v2020_04_01/ConnectivityIssue.java        |   83 +
 .../v2020_04_01/ConnectivityParameters.java   |  149 +
 .../v2020_04_01/ConnectivitySource.java       |   70 +
 .../network/v2020_04_01/Container.java        |   17 +
 .../ContainerNetworkInterface.java            |  151 +
 ...ontainerNetworkInterfaceConfiguration.java |  148 +
 ...tainerNetworkInterfaceIpConfiguration.java |   92 +
 .../CustomDnsConfigPropertiesFormat.java      |   70 +
 .../v2020_04_01/DdosCustomPolicies.java       |   23 +
 .../network/v2020_04_01/DdosCustomPolicy.java |  119 +
 .../v2020_04_01/DdosCustomPolicyProtocol.java |   44 +
 ...ustomPolicyTriggerSensitivityOverride.java |   47 +
 .../v2020_04_01/DdosProtectionPlan.java       |   90 +
 .../v2020_04_01/DdosProtectionPlans.java      |   25 +
 .../network/v2020_04_01/DdosSettings.java     |   98 +
 .../DdosSettingsProtectionCoverage.java       |   41 +
 .../v2020_04_01/DefaultSecurityRules.java     |   40 +
 .../network/v2020_04_01/Delegation.java       |  121 +
 .../network/v2020_04_01/DeviceProperties.java |   95 +
 .../network/v2020_04_01/DhGroup.java          |   59 +
 .../network/v2020_04_01/DhcpOptions.java      |   46 +
 .../network/v2020_04_01/Dimension.java        |   95 +
 .../network/v2020_04_01/Direction.java        |   41 +
 .../EffectiveNetworkSecurityGroup.java        |  124 +
 ...ectiveNetworkSecurityGroupAssociation.java |   70 +
 ...fectiveNetworkSecurityGroupListResult.java |   31 +
 .../EffectiveNetworkSecurityRule.java         |  420 ++
 .../network/v2020_04_01/EffectiveRoute.java   |  205 +
 .../v2020_04_01/EffectiveRouteListResult.java |   31 +
 .../v2020_04_01/EffectiveRouteSource.java     |   47 +
 .../v2020_04_01/EffectiveRouteState.java      |   41 +
 .../EffectiveSecurityRuleProtocol.java        |   44 +
 .../v2020_04_01/EndpointServiceResult.java    |   35 +
 .../management/network/v2020_04_01/Error.java |  148 +
 .../network/v2020_04_01/ErrorDetails.java     |   95 +
 .../network/v2020_04_01/ErrorException.java   |   44 +
 .../network/v2020_04_01/ErrorResponse.java    |   44 +
 .../v2020_04_01/ErrorResponseException.java   |   44 +
 .../EvaluatedNetworkSecurityGroup.java        |  111 +
 .../network/v2020_04_01/EvaluationState.java  |   44 +
 .../v2020_04_01/ExpressRouteCircuit.java      |  464 ++
 .../ExpressRouteCircuitArpTable.java          |  121 +
 .../ExpressRouteCircuitAuthorization.java     |  204 +
 .../ExpressRouteCircuitAuthorizations.java    |   53 +
 .../ExpressRouteCircuitConnection.java        |  322 ++
 .../ExpressRouteCircuitConnections.java       |   56 +
 .../ExpressRouteCircuitPeering.java           |  653 +++
 ...uitPeeringAdvertisedPublicPrefixState.java |   47 +
 .../ExpressRouteCircuitPeeringConfig.java     |  165 +
 .../ExpressRouteCircuitPeeringId.java         |   43 +
 .../ExpressRouteCircuitPeeringState.java      |   41 +
 .../ExpressRouteCircuitPeerings.java          |   53 +
 .../ExpressRouteCircuitReference.java         |   43 +
 .../ExpressRouteCircuitRoutesTable.java       |  148 +
 ...ExpressRouteCircuitRoutesTableSummary.java |  149 +
 ...RouteCircuitServiceProviderProperties.java |   95 +
 .../v2020_04_01/ExpressRouteCircuitSku.java   |   97 +
 .../ExpressRouteCircuitSkuFamily.java         |   41 +
 .../ExpressRouteCircuitSkuTier.java           |   47 +
 .../v2020_04_01/ExpressRouteCircuitStats.java |   40 +
 .../v2020_04_01/ExpressRouteCircuits.java     |   82 +
 ...xpressRouteCircuitsArpTableListResult.java |   31 +
 ...essRouteCircuitsRoutesTableListResult.java |   31 +
 ...eCircuitsRoutesTableSummaryListResult.java |   31 +
 .../v2020_04_01/ExpressRouteConnection.java   |  257 +
 .../v2020_04_01/ExpressRouteConnectionId.java |   32 +
 .../ExpressRouteConnectionList.java           |   27 +
 .../v2020_04_01/ExpressRouteConnections.java  |   53 +
 .../ExpressRouteCrossConnection.java          |  269 +
 .../ExpressRouteCrossConnectionPeering.java   |  451 ++
 .../ExpressRouteCrossConnectionPeerings.java  |   53 +
 ...outeCrossConnectionRoutesTableSummary.java |  123 +
 .../ExpressRouteCrossConnections.java         |   59 +
 ...nnectionsRoutesTableSummaryListResult.java |   31 +
 .../v2020_04_01/ExpressRouteGateway.java      |  130 +
 ...tewayPropertiesAutoScaleConfiguration.java |   43 +
 ...ropertiesAutoScaleConfigurationBounds.java |   69 +
 .../v2020_04_01/ExpressRouteGateways.java     |   25 +
 .../network/v2020_04_01/ExpressRouteLink.java |   77 +
 .../ExpressRouteLinkAdminState.java           |   41 +
 .../ExpressRouteLinkConnectorType.java        |   41 +
 .../ExpressRouteLinkMacSecCipher.java         |   41 +
 .../ExpressRouteLinkMacSecConfig.java         |   97 +
 .../v2020_04_01/ExpressRouteLinks.java        |   40 +
 .../v2020_04_01/ExpressRoutePeeringState.java |   41 +
 .../v2020_04_01/ExpressRoutePeeringType.java  |   44 +
 .../network/v2020_04_01/ExpressRoutePort.java |  256 +
 .../v2020_04_01/ExpressRoutePorts.java        |   25 +
 .../ExpressRoutePortsEncapsulation.java       |   41 +
 .../ExpressRoutePortsLocation.java            |   44 +
 .../ExpressRoutePortsLocationBandwidths.java  |   48 +
 .../ExpressRoutePortsLocations.java           |   29 +
 .../ExpressRouteServiceProvider.java          |   39 +
 ...RouteServiceProviderBandwidthsOffered.java |   69 +
 .../ExpressRouteServiceProviders.java         |   19 +
 .../network/v2020_04_01/FirewallPolicies.java |   25 +
 .../network/v2020_04_01/FirewallPolicy.java   |  269 +
 .../FirewallPolicyCertificateAuthority.java   |   72 +
 .../v2020_04_01/FirewallPolicyFilterRule.java |   74 +
 .../FirewallPolicyFilterRuleAction.java       |   43 +
 .../FirewallPolicyFilterRuleActionType.java   |   41 +
 .../FirewallPolicyIntrusionSystemMode.java    |   41 +
 .../v2020_04_01/FirewallPolicyNatRule.java    |  125 +
 .../FirewallPolicyNatRuleAction.java          |   43 +
 .../FirewallPolicyNatRuleActionType.java      |   38 +
 .../v2020_04_01/FirewallPolicyRule.java       |   78 +
 .../FirewallPolicyRuleCondition.java          |   79 +
 ...olicyRuleConditionApplicationProtocol.java |   69 +
 ...yRuleConditionApplicationProtocolType.java |   41 +
 ...allPolicyRuleConditionNetworkProtocol.java |   47 +
 .../v2020_04_01/FirewallPolicyRuleGroup.java  |  205 +
 .../v2020_04_01/FirewallPolicyRuleGroups.java |   53 +
 .../FirewallPolicyThreatIntelWhitelist.java   |   70 +
 .../FirewallPolicyTransportSecurity.java      |   96 +
 .../FirewallPolicyTrustedRootCertificate.java |   73 +
 .../network/v2020_04_01/FlowLog.java          |  336 ++
 .../v2020_04_01/FlowLogFormatParameters.java  |   69 +
 .../v2020_04_01/FlowLogFormatType.java        |   38 +
 .../v2020_04_01/FlowLogInformation.java       |   50 +
 .../v2020_04_01/FlowLogStatusParameters.java  |   45 +
 .../network/v2020_04_01/FlowLogs.java         |   53 +
 .../v2020_04_01/FrontendIPConfiguration.java  |  104 +
 .../network/v2020_04_01/GatewayRoute.java     |  122 +
 .../v2020_04_01/GatewayRouteListResult.java   |   26 +
 .../GetVpnSitesConfigurationRequest.java      |   71 +
 .../v2020_04_01/HTTPConfiguration.java        |   96 +
 .../v2020_04_01/HTTPConfigurationMethod.java  |   41 +
 .../network/v2020_04_01/HTTPHeader.java       |   69 +
 .../network/v2020_04_01/HTTPMethod.java       |   38 +
 .../network/v2020_04_01/HubIPAddresses.java   |   70 +
 .../network/v2020_04_01/HubRoute.java         |  149 +
 .../network/v2020_04_01/HubRouteTable.java    |  216 +
 .../network/v2020_04_01/HubRouteTables.java   |   53 +
 .../HubVirtualNetworkConnection.java          |   68 +
 .../HubVirtualNetworkConnectionStatus.java    |   47 +
 .../HubVirtualNetworkConnections.java         |   40 +
 .../IPAddressAvailabilityResult.java          |   31 +
 .../v2020_04_01/IPAllocationMethod.java       |   41 +
 .../network/v2020_04_01/IPConfiguration.java  |  185 +
 .../IPConfigurationBgpPeeringAddress.java     |  102 +
 .../v2020_04_01/IPConfigurationProfile.java   |  120 +
 .../network/v2020_04_01/IPVersion.java        |   41 +
 .../network/v2020_04_01/IkeEncryption.java    |   56 +
 .../network/v2020_04_01/IkeIntegrity.java     |   53 +
 .../network/v2020_04_01/InboundNatPool.java   |  315 ++
 .../network/v2020_04_01/InboundNatRule.java   |  355 ++
 .../network/v2020_04_01/InboundNatRules.java  |   53 +
 .../network/v2020_04_01/IpAllocation.java     |  259 +
 .../network/v2020_04_01/IpAllocationType.java |   41 +
 .../network/v2020_04_01/IpAllocations.java    |   25 +
 .../network/v2020_04_01/IpFlowProtocol.java   |   41 +
 .../network/v2020_04_01/IpGroup.java          |  114 +
 .../network/v2020_04_01/IpGroups.java         |   25 +
 .../management/network/v2020_04_01/IpTag.java |   69 +
 .../network/v2020_04_01/IpsecEncryption.java  |   62 +
 .../network/v2020_04_01/IpsecIntegrity.java   |   53 +
 .../network/v2020_04_01/IpsecPolicy.java      |  236 +
 .../Ipv6CircuitConnectionConfig.java          |   59 +
 .../Ipv6ExpressRouteCircuitPeeringConfig.java |  148 +
 .../network/v2020_04_01/IssueType.java        |   62 +
 .../network/v2020_04_01/LoadBalancer.java     |  322 ++
 .../LoadBalancerBackendAddress.java           |  125 +
 .../LoadBalancerBackendAddressPools.java      |   53 +
 .../LoadBalancerFrontendIPConfigurations.java |   40 +
 .../LoadBalancerLoadBalancingRules.java       |   40 +
 .../LoadBalancerNetworkInterface.java         |  118 +
 .../LoadBalancerNetworkInterfaces.java        |   29 +
 .../LoadBalancerOutboundRuleProtocol.java     |   44 +
 .../LoadBalancerOutboundRules.java            |   40 +
 .../v2020_04_01/LoadBalancerProbes.java       |   40 +
 .../network/v2020_04_01/LoadBalancerSku.java  |   44 +
 .../v2020_04_01/LoadBalancerSkuName.java      |   41 +
 .../network/v2020_04_01/LoadBalancers.java    |   25 +
 .../v2020_04_01/LoadBalancingRule.java        |  103 +
 .../network/v2020_04_01/LoadDistribution.java |   44 +
 .../v2020_04_01/LocalNetworkGateway.java      |  199 +
 .../v2020_04_01/LocalNetworkGateways.java     |   24 +
 .../LocationAvailableDelegation.java          |   46 +
 .../LocationAvailableDelegationModel.java     |   46 +
 .../network/v2020_04_01/LogSpecification.java |   95 +
 .../v2020_04_01/ManagedRuleEnabledState.java  |   38 +
 .../v2020_04_01/ManagedRuleGroupOverride.java |   71 +
 .../v2020_04_01/ManagedRuleOverride.java      |   70 +
 .../network/v2020_04_01/ManagedRuleSet.java   |   96 +
 .../v2020_04_01/ManagedRulesDefinition.java   |   70 +
 .../v2020_04_01/ManagedServiceIdentity.java   |  108 +
 ...ceIdentityUserAssignedIdentitiesValue.java |   47 +
 .../network/v2020_04_01/MatchCondition.java   |  150 +
 .../network/v2020_04_01/MatchVariable.java    |   71 +
 .../network/v2020_04_01/MatchedRule.java      |   70 +
 .../v2020_04_01/MetricSpecification.java      |  382 ++
 .../network/v2020_04_01/NatGateway.java       |  235 +
 .../network/v2020_04_01/NatGatewaySku.java    |   43 +
 .../v2020_04_01/NatGatewaySkuName.java        |   38 +
 .../network/v2020_04_01/NatGateways.java      |   25 +
 .../network/v2020_04_01/NatRuleCondition.java |  178 +
 ...workConfigurationDiagnosticParameters.java |   98 +
 ...NetworkConfigurationDiagnosticProfile.java |  150 +
 ...etworkConfigurationDiagnosticResponse.java |   26 +
 .../NetworkConfigurationDiagnosticResult.java |   70 +
 .../v2020_04_01/NetworkIntentPolicy.java      |   61 +
 .../NetworkIntentPolicyConfiguration.java     |   71 +
 .../network/v2020_04_01/NetworkInterface.java |  262 +
 .../NetworkInterfaceAssociation.java          |   60 +
 .../NetworkInterfaceDnsSettings.java          |  125 +
 ...rationPrivateLinkConnectionProperties.java |   63 +
 .../NetworkInterfaceIPConfigurations.java     |   40 +
 .../NetworkInterfaceLoadBalancer.java         |  102 +
 .../NetworkInterfaceLoadBalancers.java        |   29 +
 ...erfaceNetworkInterfaceIPConfiguration.java |  103 +
 .../NetworkInterfaceTapConfiguration.java     |  176 +
 .../NetworkInterfaceTapConfigurations.java    |   53 +
 .../v2020_04_01/NetworkInterfaces.java        |  142 +
 .../v2020_04_01/NetworkOperationStatus.java   |   44 +
 .../network/v2020_04_01/NetworkProfile.java   |  118 +
 .../network/v2020_04_01/NetworkProfiles.java  |   25 +
 .../v2020_04_01/NetworkRuleCondition.java     |  178 +
 .../v2020_04_01/NetworkSecurityGroup.java     |  134 +
 .../NetworkSecurityGroupResult.java           |   60 +
 .../NetworkSecurityGroupSecurityRule.java     |  542 ++
 ...NetworkSecurityGroupSecurityRuleModel.java |  118 +
 .../v2020_04_01/NetworkSecurityGroups.java    |   25 +
 .../NetworkSecurityRulesEvaluationResult.java |  173 +
 .../v2020_04_01/NetworkVirtualAppliance.java  |  259 +
 .../v2020_04_01/NetworkVirtualAppliances.java |   25 +
 .../network/v2020_04_01/NetworkWatcher.java   |   78 +
 .../network/v2020_04_01/NetworkWatchers.java  |  158 +
 .../v2020_04_01/NextHopParameters.java        |  123 +
 .../network/v2020_04_01/NextHopResult.java    |   35 +
 .../network/v2020_04_01/NextHopType.java      |   53 +
 .../v2020_04_01/OfficeTrafficCategory.java    |   47 +
 .../network/v2020_04_01/Operation.java        |   40 +
 .../network/v2020_04_01/OperationDisplay.java |  121 +
 ...nPropertiesFormatServiceSpecification.java |   70 +
 .../network/v2020_04_01/Operations.java       |   27 +
 .../network/v2020_04_01/Origin.java           |   44 +
 .../network/v2020_04_01/OutboundRule.java     |   79 +
 .../network/v2020_04_01/OutputType.java       |   38 +
 .../v2020_04_01/OwaspCrsExclusionEntry.java   |  100 +
 .../OwaspCrsExclusionEntryMatchVariable.java  |   44 +
 ...rsExclusionEntrySelectorMatchOperator.java |   50 +
 .../P2SConnectionConfiguration.java           |  132 +
 .../v2020_04_01/P2SVpnConnectionHealth.java   |   25 +
 .../P2SVpnConnectionHealthRequest.java        |   71 +
 .../v2020_04_01/P2SVpnConnectionRequest.java  |   44 +
 .../network/v2020_04_01/P2SVpnGateway.java    |  230 +
 .../v2020_04_01/P2SVpnProfileParameters.java  |   44 +
 .../network/v2020_04_01/P2sVpnGateways.java   |   67 +
 .../v2020_04_01/PacketCaptureFilter.java      |  161 +
 .../v2020_04_01/PacketCaptureParameters.java  |  174 +
 .../PacketCaptureQueryStatusResult.java       |   52 +
 .../v2020_04_01/PacketCaptureResult.java      |  244 +
 .../PacketCaptureStorageLocation.java         |  100 +
 .../network/v2020_04_01/PacketCaptures.java   |   75 +
 .../network/v2020_04_01/PatchRouteFilter.java |  168 +
 .../v2020_04_01/PatchRouteFilterRule.java     |  156 +
 .../network/v2020_04_01/PcError.java          |   50 +
 .../network/v2020_04_01/PcProtocol.java       |   44 +
 .../network/v2020_04_01/PcStatus.java         |   50 +
 .../PeerExpressRouteCircuitConnection.java    |   78 +
 .../PeerExpressRouteCircuitConnections.java   |   42 +
 .../network/v2020_04_01/PfsGroup.java         |   62 +
 .../network/v2020_04_01/PolicySettings.java   |  148 +
 .../v2020_04_01/PreferredIPVersion.java       |   41 +
 .../PrepareNetworkPoliciesRequest.java        |   70 +
 .../v2020_04_01/PrivateDnsZoneConfig.java     |   89 +
 .../v2020_04_01/PrivateDnsZoneGroup.java      |  171 +
 .../v2020_04_01/PrivateDnsZoneGroups.java     |   53 +
 .../network/v2020_04_01/PrivateEndpoint.java  |  201 +
 .../PrivateEndpointConnection.java            |  111 +
 .../network/v2020_04_01/PrivateEndpoints.java |   25 +
 .../v2020_04_01/PrivateLinkService.java       |  269 +
 .../PrivateLinkServiceConnection.java         |  201 +
 .../PrivateLinkServiceConnectionState.java    |   98 +
 .../PrivateLinkServiceIpConfiguration.java    |  226 +
 ...vateLinkServicePropertiesAutoApproval.java |   16 +
 ...rivateLinkServicePropertiesVisibility.java |   16 +
 .../PrivateLinkServiceVisibility.java         |   25 +
 .../v2020_04_01/PrivateLinkServices.java      |   98 +
 .../management/network/v2020_04_01/Probe.java |   79 +
 .../network/v2020_04_01/ProbeProtocol.java    |   44 +
 .../v2020_04_01/ProcessorArchitecture.java    |   41 +
 .../v2020_04_01/PropagatedRouteTable.java     |   71 +
 .../network/v2020_04_01/Protocol.java         |   47 +
 .../v2020_04_01/ProtocolConfiguration.java    |   43 +
 .../ProtocolCustomSettingsFormat.java         |  127 +
 .../v2020_04_01/ProvisioningState.java        |   47 +
 .../network/v2020_04_01/PublicIPAddress.java  |  380 ++
 .../PublicIPAddressDnsSettings.java           |  104 +
 .../v2020_04_01/PublicIPAddressSku.java       |   44 +
 .../v2020_04_01/PublicIPAddressSkuName.java   |   41 +
 .../v2020_04_01/PublicIPAddresses.java        |   62 +
 .../network/v2020_04_01/PublicIPPrefix.java   |  245 +
 .../v2020_04_01/PublicIPPrefixSku.java        |   43 +
 .../v2020_04_01/PublicIPPrefixSkuName.java    |   38 +
 .../network/v2020_04_01/PublicIPPrefixes.java |   25 +
 .../QueryTroubleshootingParameters.java       |   43 +
 .../network/v2020_04_01/RadiusServer.java     |   95 +
 .../network/v2020_04_01/RecordSet.java        |  164 +
 .../ReferencedPublicIpAddress.java            |   43 +
 .../v2020_04_01/ResourceIdentityType.java     |   59 +
 .../v2020_04_01/ResourceNavigationLinks.java  |   30 +
 .../ResourceNavigationLinksListResult.java    |   32 +
 .../network/v2020_04_01/ResourceSet.java      |   44 +
 .../RetentionPolicyParameters.java            |   69 +
 .../management/network/v2020_04_01/Route.java |  216 +
 .../network/v2020_04_01/RouteFilter.java      |  119 +
 .../network/v2020_04_01/RouteFilterRule.java  |  222 +
 .../network/v2020_04_01/RouteFilterRules.java |   53 +
 .../network/v2020_04_01/RouteFilters.java     |   25 +
 .../network/v2020_04_01/RouteNextHopType.java |   50 +
 .../network/v2020_04_01/RouteTable.java       |  143 +
 .../network/v2020_04_01/RouteTables.java      |   25 +
 .../network/v2020_04_01/Routes.java           |   53 +
 .../v2020_04_01/RoutingConfiguration.java     |   98 +
 .../SecurityGroupNetworkInterface.java        |   69 +
 .../SecurityGroupViewParameters.java          |   43 +
 .../v2020_04_01/SecurityGroupViewResult.java  |   26 +
 .../v2020_04_01/SecurityPartnerProvider.java  |  142 +
 ...curityPartnerProviderConnectionStatus.java |   47 +
 .../v2020_04_01/SecurityPartnerProviders.java |   25 +
 .../v2020_04_01/SecurityProviderName.java     |   44 +
 .../v2020_04_01/SecurityRuleAccess.java       |   41 +
 .../v2020_04_01/SecurityRuleAssociations.java |  123 +
 .../v2020_04_01/SecurityRuleDirection.java    |   41 +
 .../v2020_04_01/SecurityRuleProtocol.java     |   53 +
 .../network/v2020_04_01/SecurityRules.java    |   53 +
 .../v2020_04_01/ServiceAssociationLinks.java  |   30 +
 .../ServiceAssociationLinksListResult.java    |   32 +
 .../v2020_04_01/ServiceEndpointPolicies.java  |   25 +
 .../v2020_04_01/ServiceEndpointPolicy.java    |  119 +
 .../ServiceEndpointPolicyDefinition.java      |  229 +
 .../ServiceEndpointPolicyDefinitions.java     |   53 +
 .../ServiceEndpointPropertiesFormat.java      |   86 +
 .../ServiceProviderProvisioningState.java     |   47 +
 .../v2020_04_01/ServiceTagInformation.java    |   62 +
 ...ServiceTagInformationPropertiesFormat.java |   78 +
 .../network/v2020_04_01/ServiceTags.java      |   28 +
 .../v2020_04_01/ServiceTagsListResult.java    |   51 +
 .../network/v2020_04_01/SessionIds.java       |   44 +
 .../network/v2020_04_01/Severity.java         |   41 +
 .../network/v2020_04_01/StaticRoute.java      |   96 +
 .../network/v2020_04_01/Subnet.java           |  497 ++
 .../v2020_04_01/SubnetAssociation.java        |   60 +
 .../network/v2020_04_01/Subnets.java          |   76 +
 .../network/v2020_04_01/TagsObject.java       |   44 +
 .../network/v2020_04_01/Topology.java         |   42 +
 .../v2020_04_01/TopologyAssociation.java      |   96 +
 .../v2020_04_01/TopologyParameters.java       |   96 +
 .../network/v2020_04_01/TopologyResource.java |  123 +
 ...afficAnalyticsConfigurationProperties.java |  148 +
 .../TrafficAnalyticsProperties.java           |   43 +
 .../v2020_04_01/TrafficSelectorPolicy.java    |   70 +
 .../v2020_04_01/TransportProtocol.java        |   44 +
 .../v2020_04_01/TroubleshootingDetails.java   |  148 +
 .../TroubleshootingParameters.java            |   97 +
 .../TroubleshootingRecommendedActions.java    |  123 +
 .../v2020_04_01/TroubleshootingResult.java    |   42 +
 .../v2020_04_01/TunnelConnectionHealth.java   |   93 +
 .../v2020_04_01/TunnelConnectionStatus.java   |   47 +
 .../UnprepareNetworkPoliciesRequest.java      |   43 +
 .../management/network/v2020_04_01/Usage.java |   45 +
 .../network/v2020_04_01/UsageName.java        |   69 +
 .../network/v2020_04_01/Usages.java           |   28 +
 .../management/network/v2020_04_01/VM.java    |   46 +
 .../network/v2020_04_01/VerbosityLevel.java   |   44 +
 .../VerificationIPFlowParameters.java         |  231 +
 .../v2020_04_01/VerificationIPFlowResult.java |   30 +
 .../VirtualApplianceNicProperties.java        |   62 +
 .../VirtualApplianceSkuProperties.java        |   95 +
 .../network/v2020_04_01/VirtualHub.java       |  430 ++
 .../network/v2020_04_01/VirtualHubId.java     |   45 +
 .../network/v2020_04_01/VirtualHubRoute.java  |   70 +
 .../v2020_04_01/VirtualHubRouteTable.java     |   44 +
 .../v2020_04_01/VirtualHubRouteTableV2.java   |  200 +
 .../v2020_04_01/VirtualHubRouteTableV2s.java  |   53 +
 .../v2020_04_01/VirtualHubRouteV2.java        |  122 +
 .../network/v2020_04_01/VirtualHubs.java      |   25 +
 ...aleSetNetworkInterfaceIPConfiguration.java |  103 +
 .../network/v2020_04_01/VirtualNetwork.java   |  348 ++
 .../VirtualNetworkBgpCommunities.java         |   59 +
 ...tualNetworkConnectionGatewayReference.java |   43 +
 .../v2020_04_01/VirtualNetworkGateway.java    |  467 ++
 .../VirtualNetworkGatewayConnection.java      |  547 ++
 ...ualNetworkGatewayConnectionListEntity.java |  153 +
 ...rtualNetworkGatewayConnectionProtocol.java |   41 +
 ...VirtualNetworkGatewayConnectionStatus.java |   47 +
 .../VirtualNetworkGatewayConnectionType.java  |   47 +
 .../VirtualNetworkGatewayConnections.java     |   77 +
 .../VirtualNetworkGatewayIPConfiguration.java |  173 +
 .../v2020_04_01/VirtualNetworkGatewaySku.java |   90 +
 .../VirtualNetworkGatewaySkuName.java         |   86 +
 .../VirtualNetworkGatewaySkuTier.java         |   86 +
 .../VirtualNetworkGatewayType.java            |   41 +
 .../v2020_04_01/VirtualNetworkGateways.java   |  202 +
 .../v2020_04_01/VirtualNetworkPeering.java    |  345 ++
 .../VirtualNetworkPeeringState.java           |   44 +
 .../v2020_04_01/VirtualNetworkPeerings.java   |   53 +
 .../v2020_04_01/VirtualNetworkTap.java        |  178 +
 .../v2020_04_01/VirtualNetworkTaps.java       |   25 +
 .../v2020_04_01/VirtualNetworkUsage.java      |   45 +
 .../v2020_04_01/VirtualNetworkUsageName.java  |   47 +
 .../network/v2020_04_01/VirtualNetworks.java  |   47 +
 .../network/v2020_04_01/VirtualRouter.java    |  201 +
 .../v2020_04_01/VirtualRouterPeering.java     |  204 +
 .../v2020_04_01/VirtualRouterPeerings.java    |   53 +
 .../network/v2020_04_01/VirtualRouters.java   |   25 +
 .../network/v2020_04_01/VirtualWAN.java       |  235 +
 .../VirtualWanSecurityProvider.java           |   96 +
 .../VirtualWanSecurityProviderType.java       |   41 +
 .../VirtualWanVpnProfileParameters.java       |   71 +
 .../network/v2020_04_01/VirtualWans.java      |   25 +
 .../network/v2020_04_01/VnetRoute.java        |   45 +
 .../v2020_04_01/VpnAuthenticationType.java    |   44 +
 .../v2020_04_01/VpnClientConfiguration.java   |  310 ++
 .../VpnClientConnectionHealth.java            |  101 +
 .../VpnClientConnectionHealthDetail.java      |  197 +
 ...lientConnectionHealthDetailListResult.java |   26 +
 .../v2020_04_01/VpnClientIPsecParameters.java |   60 +
 .../v2020_04_01/VpnClientParameters.java      |  128 +
 .../v2020_04_01/VpnClientProtocol.java        |   44 +
 .../VpnClientRevokedCertificate.java          |  104 +
 .../v2020_04_01/VpnClientRootCertificate.java |  104 +
 .../network/v2020_04_01/VpnConnection.java    |  589 +++
 .../v2020_04_01/VpnConnectionStatus.java      |   47 +
 ...ectionVpnGatewayVpnSiteLinkConnection.java |  114 +
 ...nVpnGatewayVpnSiteLinkConnectionModel.java |  112 +
 .../network/v2020_04_01/VpnConnections.java   |   53 +
 .../VpnDeviceScriptParameters.java            |   95 +
 .../network/v2020_04_01/VpnGateway.java       |  197 +
 .../v2020_04_01/VpnGatewayGeneration.java     |   44 +
 .../VpnGatewayTunnelingProtocol.java          |   41 +
 .../network/v2020_04_01/VpnGateways.java      |   35 +
 .../v2020_04_01/VpnLinkBgpSettings.java       |   69 +
 .../v2020_04_01/VpnLinkConnections.java       |   30 +
 .../VpnLinkProviderProperties.java            |   69 +
 .../VpnPacketCaptureStartParameters.java      |   43 +
 .../VpnPacketCaptureStopParameters.java       |   43 +
 .../v2020_04_01/VpnProfileResponse.java       |   25 +
 ...rverConfigRadiusClientRootCertificate.java |   69 +
 ...rverConfigRadiusServerRootCertificate.java |   69 +
 ...rverConfigVpnClientRevokedCertificate.java |   69 +
 ...nServerConfigVpnClientRootCertificate.java |   69 +
 .../v2020_04_01/VpnServerConfiguration.java   |  437 ++
 .../v2020_04_01/VpnServerConfigurations.java  |   25 +
 ...nfigurationsAssociatedWithVirtualWans.java |   29 +
 .../VpnServerConfigurationsResponse.java      |   26 +
 .../network/v2020_04_01/VpnSite.java          |  313 ++
 .../network/v2020_04_01/VpnSiteId.java        |   32 +
 .../network/v2020_04_01/VpnSiteLink.java      |   67 +
 .../v2020_04_01/VpnSiteLinkConnections.java   |   31 +
 .../network/v2020_04_01/VpnSiteLinks.java     |   40 +
 .../network/v2020_04_01/VpnSites.java         |   25 +
 .../v2020_04_01/VpnSitesConfigurations.java   |   30 +
 .../network/v2020_04_01/VpnType.java          |   41 +
 .../WebApplicationFirewallAction.java         |   44 +
 .../WebApplicationFirewallCustomRule.java     |  165 +
 .../WebApplicationFirewallEnabledState.java   |   41 +
 .../WebApplicationFirewallMatchVariable.java  |   59 +
 .../WebApplicationFirewallMode.java           |   41 +
 .../WebApplicationFirewallOperator.java       |   68 +
 .../WebApplicationFirewallPolicies.java       |   25 +
 .../WebApplicationFirewallPolicy.java         |  175 +
 ...pplicationFirewallPolicyResourceState.java |   53 +
 .../WebApplicationFirewallRuleType.java       |   41 +
 .../WebApplicationFirewallTransform.java      |   53 +
 ...icationGatewayAvailableSslOptionsImpl.java |   77 +
 ...cationGatewayAvailableSslOptionsInner.java |  159 +
 ...GatewayAvailableWafRuleSetsResultImpl.java |   33 +
 ...atewayAvailableWafRuleSetsResultInner.java |   45 +
 .../ApplicationGatewayBackendHealthImpl.java  |   33 +
 .../ApplicationGatewayBackendHealthInner.java |   45 +
 ...ationGatewayBackendHealthOnDemandImpl.java |   38 +
 ...tionGatewayBackendHealthOnDemandInner.java |   71 +
 .../ApplicationGatewayImpl.java               |  365 ++
 .../ApplicationGatewayInner.java              |  808 +++
 ...icationGatewaySslPredefinedPolicyImpl.java |   49 +
 ...cationGatewaySslPredefinedPolicyInner.java |  103 +
 .../ApplicationGatewaysImpl.java              |  268 +
 .../ApplicationGatewaysInner.java             | 2780 ++++++++++
 .../ApplicationSecurityGroupImpl.java         |   62 +
 .../ApplicationSecurityGroupInner.java        |   97 +
 .../ApplicationSecurityGroupsImpl.java        |  138 +
 .../ApplicationSecurityGroupsInner.java       | 1126 ++++
 .../AutoApprovedPrivateLinkServiceImpl.java   |   35 +
 .../AutoApprovedPrivateLinkServiceInner.java  |   43 +
 .../AvailableDelegationInner.java             |  149 +
 .../AvailableDelegationsImpl.java             |   53 +
 .../AvailableDelegationsInner.java            |  293 ++
 .../AvailableEndpointServicesImpl.java        |   53 +
 .../AvailableEndpointServicesInner.java       |  293 ++
 .../AvailablePrivateEndpointTypeImpl.java     |   50 +
 .../AvailablePrivateEndpointTypeInner.java    |  121 +
 .../AvailablePrivateEndpointTypesImpl.java    |   71 +
 .../AvailablePrivateEndpointTypesInner.java   |  533 ++
 .../AvailableProvidersListImpl.java           |   33 +
 .../AvailableProvidersListInner.java          |   45 +
 ...AvailableResourceGroupDelegationsImpl.java |   53 +
 ...vailableResourceGroupDelegationsInner.java |  301 ++
 .../AvailableServiceAliasImpl.java            |   50 +
 .../AvailableServiceAliasInner.java           |  121 +
 .../AvailableServiceAliasesImpl.java          |   71 +
 .../AvailableServiceAliasesInner.java         |  533 ++
 .../AzureFirewallFqdnTagImpl.java             |   56 +
 .../AzureFirewallFqdnTagInner.java            |   95 +
 .../AzureFirewallFqdnTagsImpl.java            |   71 +
 .../AzureFirewallFqdnTagsInner.java           |  285 +
 .../implementation/AzureFirewallImpl.java     |  199 +
 .../implementation/AzureFirewallInner.java    |  409 ++
 .../implementation/AzureFirewallsImpl.java    |  138 +
 .../implementation/AzureFirewallsInner.java   | 1274 +++++
 .../AzureReachabilityReportImpl.java          |   44 +
 .../AzureReachabilityReportInner.java         |   99 +
 .../BackendAddressPoolImpl.java               |  159 +
 .../BackendAddressPoolInner.java              |  185 +
 .../BastionActiveSessionInner.java            |  184 +
 .../implementation/BastionHostImpl.java       |   81 +
 .../implementation/BastionHostInner.java      |  134 +
 .../implementation/BastionHostsImpl.java      |  138 +
 .../implementation/BastionHostsInner.java     |  948 ++++
 .../BastionSessionStateInner.java             |   62 +
 .../BastionShareableLinkInner.java            |   90 +
 .../BgpPeerStatusListResultImpl.java          |   33 +
 .../BgpPeerStatusListResultInner.java         |   45 +
 .../BgpServiceCommunitiesImpl.java            |   71 +
 .../BgpServiceCommunitiesInner.java           |  285 +
 .../BgpServiceCommunityImpl.java              |   52 +
 .../BgpServiceCommunityInner.java             |  102 +
 .../ConnectionMonitorInner.java               |  314 ++
 .../ConnectionMonitorQueryResultImpl.java     |   39 +
 .../ConnectionMonitorQueryResultInner.java    |   73 +
 .../ConnectionMonitorResultImpl.java          |  272 +
 .../ConnectionMonitorResultInner.java         |  342 ++
 .../ConnectionMonitorsImpl.java               |  110 +
 .../ConnectionMonitorsInner.java              | 1324 +++++
 .../ConnectionResetSharedKeyImpl.java         |   31 +
 .../ConnectionResetSharedKeyInner.java        |   44 +
 .../ConnectionSharedKeyImpl.java              |   36 +
 .../ConnectionSharedKeyInner.java             |   44 +
 .../ConnectivityInformationImpl.java          |   64 +
 .../ConnectivityInformationInner.java         |  126 +
 .../DdosCustomPoliciesImpl.java               |   88 +
 .../DdosCustomPoliciesInner.java              |  663 +++
 .../implementation/DdosCustomPolicyImpl.java  |   81 +
 .../implementation/DdosCustomPolicyInner.java |  142 +
 .../DdosProtectionPlanImpl.java               |   69 +
 .../DdosProtectionPlanInner.java              |   87 +
 .../DdosProtectionPlansImpl.java              |  138 +
 .../DdosProtectionPlansInner.java             | 1126 ++++
 .../DefaultSecurityRulesImpl.java             |   69 +
 .../DefaultSecurityRulesInner.java            |  397 ++
 .../DnsNameAvailabilityResultInner.java       |   43 +
 ...iveNetworkSecurityGroupListResultImpl.java |   38 +
 ...veNetworkSecurityGroupListResultInner.java |   60 +
 .../EffectiveRouteListResultImpl.java         |   38 +
 .../EffectiveRouteListResultInner.java        |   60 +
 .../EndpointServiceResultImpl.java            |   45 +
 .../EndpointServiceResultInner.java           |   48 +
 .../ExpressRouteCircuitAuthorizationImpl.java |  140 +
 ...ExpressRouteCircuitAuthorizationInner.java |  148 +
 ...ExpressRouteCircuitAuthorizationsImpl.java |   85 +
 ...xpressRouteCircuitAuthorizationsInner.java |  764 +++
 .../ExpressRouteCircuitConnectionImpl.java    |  189 +
 .../ExpressRouteCircuitConnectionInner.java   |  255 +
 .../ExpressRouteCircuitConnectionsImpl.java   |   85 +
 .../ExpressRouteCircuitConnectionsInner.java  |  807 +++
 .../ExpressRouteCircuitImpl.java              |  225 +
 .../ExpressRouteCircuitInner.java             |  442 ++
 .../ExpressRouteCircuitPeeringImpl.java       |  342 ++
 .../ExpressRouteCircuitPeeringInner.java      |  575 +++
 .../ExpressRouteCircuitPeeringsImpl.java      |   85 +
 .../ExpressRouteCircuitPeeringsInner.java     |  764 +++
 .../ExpressRouteCircuitStatsImpl.java         |   46 +
 .../ExpressRouteCircuitStatsInner.java        |  121 +
 ...ssRouteCircuitsArpTableListResultImpl.java |   38 +
 ...sRouteCircuitsArpTableListResultInner.java |   71 +
 .../ExpressRouteCircuitsImpl.java             |  202 +
 .../ExpressRouteCircuitsInner.java            | 1876 +++++++
 ...outeCircuitsRoutesTableListResultImpl.java |   38 +
 ...uteCircuitsRoutesTableListResultInner.java |   71 +
 ...cuitsRoutesTableSummaryListResultImpl.java |   38 +
 ...uitsRoutesTableSummaryListResultInner.java |   71 +
 .../ExpressRouteConnectionImpl.java           |  164 +
 .../ExpressRouteConnectionInner.java          |  196 +
 .../ExpressRouteConnectionListImpl.java       |   32 +
 .../ExpressRouteConnectionListInner.java      |   44 +
 .../ExpressRouteConnectionsImpl.java          |   79 +
 .../ExpressRouteConnectionsInner.java         |  606 +++
 .../ExpressRouteCrossConnectionImpl.java      |  149 +
 .../ExpressRouteCrossConnectionInner.java     |  286 ++
 ...xpressRouteCrossConnectionPeeringImpl.java |  246 +
 ...pressRouteCrossConnectionPeeringInner.java |  405 ++
 ...pressRouteCrossConnectionPeeringsImpl.java |   85 +
 ...ressRouteCrossConnectionPeeringsInner.java |  764 +++
 .../ExpressRouteCrossConnectionsImpl.java     |  140 +
 .../ExpressRouteCrossConnectionsInner.java    | 1531 ++++++
 ...tionsRoutesTableSummaryListResultImpl.java |   38 +
 ...ionsRoutesTableSummaryListResultInner.java |   61 +
 .../ExpressRouteGatewayImpl.java              |   95 +
 .../ExpressRouteGatewayInner.java             |  150 +
 .../ExpressRouteGatewaysImpl.java             |  138 +
 .../ExpressRouteGatewaysInner.java            |  662 +++
 .../implementation/ExpressRouteLinkImpl.java  |  102 +
 .../implementation/ExpressRouteLinkInner.java |  211 +
 .../implementation/ExpressRouteLinksImpl.java |   69 +
 .../ExpressRouteLinksInner.java               |  397 ++
 .../implementation/ExpressRoutePortImpl.java  |  154 +
 .../implementation/ExpressRoutePortInner.java |  310 ++
 .../implementation/ExpressRoutePortsImpl.java |  138 +
 .../ExpressRoutePortsInner.java               | 1126 ++++
 .../ExpressRoutePortsLocationImpl.java        |   63 +
 .../ExpressRoutePortsLocationInner.java       |  124 +
 .../ExpressRoutePortsLocationsImpl.java       |   83 +
 .../ExpressRoutePortsLocationsInner.java      |  367 ++
 .../ExpressRouteServiceProviderImpl.java      |   58 +
 .../ExpressRouteServiceProviderInner.java     |  119 +
 .../ExpressRouteServiceProvidersImpl.java     |   71 +
 .../ExpressRouteServiceProvidersInner.java    |  285 +
 .../implementation/FirewallPoliciesImpl.java  |  138 +
 .../implementation/FirewallPoliciesInner.java | 1030 ++++
 .../implementation/FirewallPolicyImpl.java    |  145 +
 .../implementation/FirewallPolicyInner.java   |  291 ++
 .../FirewallPolicyRuleGroupImpl.java          |  141 +
 .../FirewallPolicyRuleGroupInner.java         |  148 +
 .../FirewallPolicyRuleGroupsImpl.java         |   85 +
 .../FirewallPolicyRuleGroupsInner.java        |  764 +++
 .../implementation/FlowLogImpl.java           |  208 +
 .../FlowLogInformationImpl.java               |   59 +
 .../FlowLogInformationInner.java              |  180 +
 .../implementation/FlowLogInner.java          |  254 +
 .../implementation/FlowLogsImpl.java          |   85 +
 .../implementation/FlowLogsInner.java         |  763 +++
 .../FrontendIPConfigurationImpl.java          |  140 +
 .../FrontendIPConfigurationInner.java         |  344 ++
 .../GatewayRouteListResultImpl.java           |   33 +
 .../GatewayRouteListResultInner.java          |   45 +
 .../implementation/HubRouteTableImpl.java     |  152 +
 .../implementation/HubRouteTableInner.java    |  178 +
 .../implementation/HubRouteTablesImpl.java    |   85 +
 .../implementation/HubRouteTablesInner.java   |  764 +++
 .../HubVirtualNetworkConnectionImpl.java      |   91 +
 .../HubVirtualNetworkConnectionInner.java     |  211 +
 .../HubVirtualNetworkConnectionsImpl.java     |   69 +
 .../HubVirtualNetworkConnectionsInner.java    |  397 ++
 .../IPAddressAvailabilityResultImpl.java      |   37 +
 .../IPAddressAvailabilityResultInner.java     |   71 +
 .../implementation/IdParsingUtils.java        |   57 +
 .../implementation/InboundNatRuleImpl.java    |  207 +
 .../implementation/InboundNatRuleInner.java   |  306 ++
 .../implementation/InboundNatRulesImpl.java   |   85 +
 .../implementation/InboundNatRulesInner.java  |  853 +++
 .../implementation/IpAllocationImpl.java      |  131 +
 .../implementation/IpAllocationInner.java     |  255 +
 .../implementation/IpAllocationsImpl.java     |  138 +
 .../implementation/IpAllocationsInner.java    | 1208 +++++
 .../implementation/IpGroupImpl.java           |   75 +
 .../implementation/IpGroupInner.java          |  124 +
 .../implementation/IpGroupsImpl.java          |  138 +
 .../implementation/IpGroupsInner.java         | 1208 +++++
 .../LoadBalancerBackendAddressPoolsImpl.java  |   85 +
 .../LoadBalancerBackendAddressPoolsInner.java |  764 +++
 ...dBalancerFrontendIPConfigurationsImpl.java |   69 +
 ...BalancerFrontendIPConfigurationsInner.java |  397 ++
 .../implementation/LoadBalancerImpl.java      |  196 +
 .../implementation/LoadBalancerInner.java     |  319 ++
 .../LoadBalancerLoadBalancingRulesImpl.java   |   69 +
 .../LoadBalancerLoadBalancingRulesInner.java  |  397 ++
 .../LoadBalancerNetworkInterfaceImpl.java     |  157 +
 .../LoadBalancerNetworkInterfacesImpl.java    |   53 +
 .../LoadBalancerNetworkInterfacesInner.java   |  301 ++
 .../LoadBalancerOutboundRulesImpl.java        |   69 +
 .../LoadBalancerOutboundRulesInner.java       |  397 ++
 .../LoadBalancerProbesImpl.java               |   69 +
 .../LoadBalancerProbesInner.java              |  397 ++
 .../implementation/LoadBalancersImpl.java     |  138 +
 .../implementation/LoadBalancersInner.java    | 1208 +++++
 .../implementation/LoadBalancingRuleImpl.java |  127 +
 .../LoadBalancingRuleInner.java               |  398 ++
 .../LocalNetworkGatewayImpl.java              |  108 +
 .../LocalNetworkGatewayInner.java             |  201 +
 .../LocalNetworkGatewaysImpl.java             |  114 +
 .../LocalNetworkGatewaysInner.java            |  901 ++++
 .../LocationAvailableDelegationImpl.java      |   56 +
 .../LocationAvailableDelegationModelImpl.java |   56 +
 .../implementation/NatGatewayImpl.java        |  125 +
 .../implementation/NatGatewayInner.java       |  245 +
 .../implementation/NatGatewaysImpl.java       |  138 +
 .../implementation/NatGatewaysInner.java      | 1209 +++++
 ...rkConfigurationDiagnosticResponseImpl.java |   33 +
 ...kConfigurationDiagnosticResponseInner.java |   34 +
 .../NetworkInterfaceIPConfigurationInner.java |  387 ++
 .../NetworkInterfaceIPConfigurationsImpl.java |   69 +
 ...NetworkInterfaceIPConfigurationsInner.java |  397 ++
 .../implementation/NetworkInterfaceImpl.java  |  177 +
 .../implementation/NetworkInterfaceInner.java |  319 ++
 .../NetworkInterfaceLoadBalancerImpl.java     |  158 +
 .../NetworkInterfaceLoadBalancersImpl.java    |   53 +
 .../NetworkInterfaceLoadBalancersInner.java   |  301 ++
 ...ceNetworkInterfaceIPConfigurationImpl.java |  170 +
 .../NetworkInterfaceTapConfigurationImpl.java |  134 +
 ...NetworkInterfaceTapConfigurationInner.java |  121 +
 ...NetworkInterfaceTapConfigurationsImpl.java |   85 +
 ...etworkInterfaceTapConfigurationsInner.java |  764 +++
 .../implementation/NetworkInterfacesImpl.java |  229 +
 .../NetworkInterfacesInner.java               | 2821 ++++++++++
 .../NetworkManagementClientImpl.java          | 4161 +++++++++++++++
 .../implementation/NetworkManager.java        | 1215 +++++
 .../implementation/NetworkProfileImpl.java    |   81 +
 .../implementation/NetworkProfileInner.java   |  139 +
 .../implementation/NetworkProfilesImpl.java   |  138 +
 .../implementation/NetworkProfilesInner.java  | 1111 ++++
 .../NetworkSecurityGroupImpl.java             |  129 +
 .../NetworkSecurityGroupInner.java            |  182 +
 .../NetworkSecurityGroupSecurityRuleImpl.java |  295 ++
 ...orkSecurityGroupSecurityRuleModelImpl.java |  157 +
 .../NetworkSecurityGroupsImpl.java            |  138 +
 .../NetworkSecurityGroupsInner.java           | 1208 +++++
 .../NetworkVirtualApplianceImpl.java          |  133 +
 .../NetworkVirtualApplianceInner.java         |  257 +
 .../NetworkVirtualAppliancesImpl.java         |  138 +
 .../NetworkVirtualAppliancesInner.java        | 1208 +++++
 .../implementation/NetworkWatcherImpl.java    |   57 +
 .../implementation/NetworkWatcherInner.java   |   80 +
 .../implementation/NetworkWatchersImpl.java   |  300 ++
 .../implementation/NetworkWatchersInner.java  | 2812 ++++++++++
 .../implementation/NextHopResultImpl.java     |   42 +
 .../implementation/NextHopResultInner.java    |   99 +
 .../implementation/OperationImpl.java         |   48 +
 .../implementation/OperationInner.java        |  125 +
 .../implementation/OperationsImpl.java        |   49 +
 .../implementation/OperationsInner.java       |  281 +
 .../implementation/OutboundRuleImpl.java      |  102 +
 .../implementation/OutboundRuleInner.java     |  256 +
 .../P2SVpnConnectionHealthImpl.java           |   31 +
 .../P2SVpnConnectionHealthInner.java          |   44 +
 .../implementation/P2SVpnGatewayImpl.java     |  121 +
 .../implementation/P2SVpnGatewayInner.java    |  229 +
 .../implementation/P2sVpnGatewaysImpl.java    |  183 +
 .../implementation/P2sVpnGatewaysInner.java   | 2109 ++++++++
 .../implementation/PacketCaptureInner.java    |  178 +
 .../PacketCaptureQueryStatusResultImpl.java   |   60 +
 .../PacketCaptureQueryStatusResultInner.java  |  178 +
 .../PacketCaptureResultImpl.java              |  190 +
 .../PacketCaptureResultInner.java             |  240 +
 .../implementation/PacketCapturesImpl.java    |  104 +
 .../implementation/PacketCapturesInner.java   |  959 ++++
 .../v2020_04_01/implementation/PageImpl.java  |   75 +
 .../v2020_04_01/implementation/PageImpl1.java |   75 +
 ...PeerExpressRouteCircuitConnectionImpl.java |  103 +
 ...eerExpressRouteCircuitConnectionInner.java |  257 +
 ...eerExpressRouteCircuitConnectionsImpl.java |   69 +
 ...erExpressRouteCircuitConnectionsInner.java |  412 ++
 .../PrivateDnsZoneGroupImpl.java              |  125 +
 .../PrivateDnsZoneGroupInner.java             |  108 +
 .../PrivateDnsZoneGroupsImpl.java             |   85 +
 .../PrivateDnsZoneGroupsInner.java            |  765 +++
 .../PrivateEndpointConnectionImpl.java        |  137 +
 .../PrivateEndpointConnectionInner.java       |  152 +
 .../implementation/PrivateEndpointImpl.java   |  123 +
 .../implementation/PrivateEndpointInner.java  |  205 +
 .../implementation/PrivateEndpointsImpl.java  |  138 +
 .../implementation/PrivateEndpointsInner.java | 1030 ++++
 .../PrivateLinkServiceImpl.java               |  164 +
 .../PrivateLinkServiceInner.java              |  286 ++
 .../PrivateLinkServiceVisibilityImpl.java     |   31 +
 .../PrivateLinkServiceVisibilityInner.java    |   43 +
 .../PrivateLinkServicesImpl.java              |  257 +
 .../PrivateLinkServicesInner.java             | 2539 +++++++++
 .../v2020_04_01/implementation/ProbeImpl.java |  102 +
 .../implementation/ProbeInner.java            |  254 +
 .../implementation/PublicIPAddressImpl.java   |  186 +
 .../implementation/PublicIPAddressInner.java  |  381 ++
 .../implementation/PublicIPAddressesImpl.java |  186 +
 .../PublicIPAddressesInner.java               | 1938 +++++++
 .../implementation/PublicIPPrefixImpl.java    |  138 +
 .../implementation/PublicIPPrefixInner.java   |  278 +
 .../implementation/PublicIPPrefixesImpl.java  |  138 +
 .../implementation/PublicIPPrefixesInner.java | 1208 +++++
 .../ResourceNavigationLinkInner.java          |  146 +
 .../ResourceNavigationLinksImpl.java          |   42 +
 .../ResourceNavigationLinksInner.java         |  151 +
 ...ResourceNavigationLinksListResultImpl.java |   37 +
 ...esourceNavigationLinksListResultInner.java |   59 +
 .../implementation/RouteFilterImpl.java       |  100 +
 .../implementation/RouteFilterInner.java      |  137 +
 .../implementation/RouteFilterRuleImpl.java   |  158 +
 .../implementation/RouteFilterRuleInner.java  |  195 +
 .../implementation/RouteFilterRulesImpl.java  |   85 +
 .../implementation/RouteFilterRulesInner.java |  764 +++
 .../implementation/RouteFiltersImpl.java      |  138 +
 .../implementation/RouteFiltersInner.java     | 1208 +++++
 .../v2020_04_01/implementation/RouteImpl.java |  146 +
 .../implementation/RouteInner.java            |  161 +
 .../implementation/RouteTableImpl.java        |  100 +
 .../implementation/RouteTableInner.java       |  149 +
 .../implementation/RouteTablesImpl.java       |  138 +
 .../implementation/RouteTablesInner.java      | 1208 +++++
 .../implementation/RoutesImpl.java            |   85 +
 .../implementation/RoutesInner.java           |  764 +++
 .../SecurityGroupViewResultImpl.java          |   33 +
 .../SecurityGroupViewResultInner.java         |   45 +
 .../SecurityPartnerProviderImpl.java          |   87 +
 .../SecurityPartnerProviderInner.java         |  153 +
 .../SecurityPartnerProvidersImpl.java         |  138 +
 .../SecurityPartnerProvidersInner.java        | 1126 ++++
 .../implementation/SecurityRuleInner.java     |  486 ++
 .../implementation/SecurityRulesImpl.java     |   85 +
 .../implementation/SecurityRulesInner.java    |  764 +++
 .../ServiceAssociationLinkInner.java          |  199 +
 .../ServiceAssociationLinksImpl.java          |   42 +
 .../ServiceAssociationLinksInner.java         |  151 +
 ...ServiceAssociationLinksListResultImpl.java |   37 +
 ...erviceAssociationLinksListResultInner.java |   59 +
 .../ServiceEndpointPoliciesImpl.java          |  138 +
 .../ServiceEndpointPoliciesInner.java         | 1208 +++++
 .../ServiceEndpointPolicyDefinitionImpl.java  |  146 +
 .../ServiceEndpointPolicyDefinitionInner.java |  159 +
 .../ServiceEndpointPolicyDefinitionsImpl.java |   85 +
 ...ServiceEndpointPolicyDefinitionsInner.java |  764 +++
 .../ServiceEndpointPolicyImpl.java            |   94 +
 .../ServiceEndpointPolicyInner.java           |  138 +
 .../implementation/ServiceTagsImpl.java       |   42 +
 .../implementation/ServiceTagsInner.java      |  137 +
 .../ServiceTagsListResultImpl.java            |   58 +
 .../ServiceTagsListResultInner.java           |  109 +
 .../implementation/SubnetImpl.java            |  296 ++
 .../implementation/SubnetInner.java           |  464 ++
 .../implementation/SubnetsImpl.java           |   98 +
 .../implementation/SubnetsInner.java          | 1391 +++++
 .../implementation/TopologyImpl.java          |   49 +
 .../implementation/TopologyInner.java         |   92 +
 .../TroubleshootingResultImpl.java            |   49 +
 .../TroubleshootingResultInner.java           |  124 +
 .../v2020_04_01/implementation/UsageImpl.java |   56 +
 .../implementation/UsageInner.java            |  147 +
 .../implementation/UsagesImpl.java            |   53 +
 .../implementation/UsagesInner.java           |  293 ++
 .../VerificationIPFlowResultImpl.java         |   37 +
 .../VerificationIPFlowResultInner.java        |   72 +
 .../implementation/VirtualHubImpl.java        |  207 +
 .../implementation/VirtualHubInner.java       |  395 ++
 .../VirtualHubRouteTableV2Impl.java           |  136 +
 .../VirtualHubRouteTableV2Inner.java          |  133 +
 .../VirtualHubRouteTableV2sImpl.java          |   85 +
 .../VirtualHubRouteTableV2sInner.java         |  765 +++
 .../implementation/VirtualHubsImpl.java       |  138 +
 .../implementation/VirtualHubsInner.java      | 1126 ++++
 ...etNetworkInterfaceIPConfigurationImpl.java |  174 +
 .../VirtualNetworkGatewayConnectionImpl.java  |  283 +
 .../VirtualNetworkGatewayConnectionInner.java |  584 +++
 ...etworkGatewayConnectionListEntityImpl.java |  171 +
 ...tworkGatewayConnectionListEntityInner.java |  533 ++
 .../VirtualNetworkGatewayConnectionsImpl.java |  164 +
 ...VirtualNetworkGatewayConnectionsInner.java | 2139 ++++++++
 .../VirtualNetworkGatewayImpl.java            |  220 +
 .../VirtualNetworkGatewayInner.java           |  470 ++
 .../VirtualNetworkGatewaysImpl.java           |  281 +
 .../VirtualNetworkGatewaysInner.java          | 4574 +++++++++++++++++
 .../implementation/VirtualNetworkImpl.java    |  181 +
 .../implementation/VirtualNetworkInner.java   |  340 ++
 .../VirtualNetworkPeeringImpl.java            |  192 +
 .../VirtualNetworkPeeringInner.java           |  274 +
 .../VirtualNetworkPeeringsImpl.java           |   85 +
 .../VirtualNetworkPeeringsInner.java          |  764 +++
 .../implementation/VirtualNetworkTapImpl.java |  121 +
 .../VirtualNetworkTapInner.java               |  192 +
 .../VirtualNetworkTapsImpl.java               |  138 +
 .../VirtualNetworkTapsInner.java              | 1126 ++++
 .../VirtualNetworkUsageImpl.java              |   56 +
 .../VirtualNetworkUsageInner.java             |   93 +
 .../implementation/VirtualNetworksImpl.java   |  174 +
 .../implementation/VirtualNetworksInner.java  | 1543 ++++++
 .../implementation/VirtualRouterImpl.java     |  108 +
 .../implementation/VirtualRouterInner.java    |  201 +
 .../VirtualRouterPeeringImpl.java             |  139 +
 .../VirtualRouterPeeringInner.java            |  146 +
 .../VirtualRouterPeeringsImpl.java            |   85 +
 .../VirtualRouterPeeringsInner.java           |  764 +++
 .../implementation/VirtualRoutersImpl.java    |  138 +
 .../implementation/VirtualRoutersInner.java   | 1030 ++++
 .../implementation/VirtualWANImpl.java        |  125 +
 .../implementation/VirtualWANInner.java       |  244 +
 .../VirtualWanSecurityProvidersInner.java     |   45 +
 .../implementation/VirtualWansImpl.java       |  138 +
 .../implementation/VirtualWansInner.java      | 1126 ++++
 ...tConnectionHealthDetailListResultImpl.java |   33 +
 ...ConnectionHealthDetailListResultInner.java |   45 +
 .../VpnClientIPsecParametersImpl.java         |   72 +
 .../VpnClientIPsecParametersInner.java        |  242 +
 .../implementation/VpnConnectionImpl.java     |  301 ++
 .../implementation/VpnConnectionInner.java    |  507 ++
 ...onVpnGatewayVpnSiteLinkConnectionImpl.java |  141 +
 ...GatewayVpnSiteLinkConnectionModelImpl.java |  126 +
 .../implementation/VpnConnectionsImpl.java    |   85 +
 .../implementation/VpnConnectionsInner.java   |  764 +++
 .../implementation/VpnGatewayImpl.java        |  112 +
 .../implementation/VpnGatewayInner.java       |  187 +
 .../implementation/VpnGatewaysImpl.java       |  150 +
 .../implementation/VpnGatewaysInner.java      | 1289 +++++
 .../VpnLinkConnectionsImpl.java               |   53 +
 .../VpnLinkConnectionsInner.java              |  309 ++
 .../VpnProfileResponseImpl.java               |   31 +
 .../VpnProfileResponseInner.java              |   43 +
 .../VpnServerConfigurationImpl.java           |  216 +
 .../VpnServerConfigurationInner.java          |  434 ++
 ...urationsAssociatedWithVirtualWansImpl.java |   42 +
 ...rationsAssociatedWithVirtualWansInner.java |  218 +
 .../VpnServerConfigurationsImpl.java          |  138 +
 .../VpnServerConfigurationsInner.java         | 1126 ++++
 .../VpnServerConfigurationsResponseImpl.java  |   32 +
 .../VpnServerConfigurationsResponseInner.java |   44 +
 .../implementation/VpnSiteImpl.java           |  158 +
 .../implementation/VpnSiteInner.java          |  293 ++
 .../VpnSiteLinkConnectionInner.java           |  416 ++
 .../VpnSiteLinkConnectionsImpl.java           |   50 +
 .../VpnSiteLinkConnectionsInner.java          |  158 +
 .../implementation/VpnSiteLinkImpl.java       |   91 +
 .../implementation/VpnSiteLinkInner.java      |  200 +
 .../implementation/VpnSiteLinksImpl.java      |   69 +
 .../implementation/VpnSiteLinksInner.java     |  397 ++
 .../VpnSitesConfigurationsImpl.java           |   35 +
 .../VpnSitesConfigurationsInner.java          |  235 +
 .../implementation/VpnSitesImpl.java          |  138 +
 .../implementation/VpnSitesInner.java         | 1126 ++++
 .../WebApplicationFirewallPoliciesImpl.java   |  138 +
 .../WebApplicationFirewallPoliciesInner.java  |  869 ++++
 .../WebApplicationFirewallPolicyImpl.java     |  124 +
 .../WebApplicationFirewallPolicyInner.java    |  226 +
 .../implementation/package-info.java          |   11 +
 .../network/v2020_04_01/package-info.java     |   11 +
 sdk/network/pom.mgmt.xml                      |    1 +
 1088 files changed, 205446 insertions(+)
 create mode 100644 sdk/network/mgmt-v2020_04_01/pom.xml
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AadAuthenticationParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Access.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AddressSpace.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAuthenticationCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAutoscaleConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableSslOptions.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableWafRuleSetsResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddressPool.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealth.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthHttpSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthOnDemand.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthPool.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServer.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServerHealth.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHttpSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayConnectionDraining.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCookieBasedAffinity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomError.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomErrorStatusCode.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallDisabledRuleGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallExclusion.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallMode.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendPort.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHeaderConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHttpListener.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOnDemandProbe.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOperationalState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayPathRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbe.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbeHealthResponseMatch.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRuleType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleActionSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCipherSuite.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPredefinedPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTier.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTrustedRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlPathMap.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AssociationType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthenticationMethod.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthorizationUseStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AutoApprovedPrivateLinkService.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Availability.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableDelegations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableEndpointServices.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointTypes.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersList.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCountry.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableResourceGroupDelegations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAlias.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAliases.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureAsyncOperationResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewall.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleCollection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocolType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTag.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTags.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIpGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCAction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCActionType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRuleCollection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleCollection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallPublicIPAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCAction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCActionType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuTier.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallThreatIntelMode.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewalls.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReport.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportItem.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLatencyInfo.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLocation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BGPCommunity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BackendAddressPool.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionConnectProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHost.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHostIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHosts.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionShareableLinkListRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatusListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunities.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CheckPrivateLinkServiceVisibilityRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CircuitConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorDestination.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpoint.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilter.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItem.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItemType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorHttpConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorIcmpConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorOutput.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorQueryResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSource.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSourceStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSuccessThreshold.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTcpConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfigurationProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorWorkspaceSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitors.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionResetSharedKey.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionSharedKey.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStateSnapshot.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityDestination.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityHop.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityInformation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityIssue.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivitySource.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Container.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterface.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceIpConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CustomDnsConfigPropertiesFormat.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicies.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyTriggerSensitivityOverride.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlan.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlans.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettingsProtectionCoverage.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DefaultSecurityRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Delegation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DeviceProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhcpOptions.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Dimension.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Direction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupAssociation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteSource.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveSecurityRuleProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EndpointServiceResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Error.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorDetails.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorException.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponse.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponseException.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluatedNetworkSecurityGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluationState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuit.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitArpTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorization.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorizations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeering.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringConfig.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringId.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeerings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitReference.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTableSummary.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitServiceProviderProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuFamily.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuTier.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitStats.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuits.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsArpTableListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableSummaryListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionId.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionList.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeering.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeerings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionRoutesTableSummary.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionsRoutesTableSummaryListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLink.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkAdminState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkConnectorType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecCipher.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecConfig.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinks.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePort.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePorts.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsEncapsulation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocationBandwidths.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProvider.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviderBandwidthsOffered.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviders.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicies.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyCertificateAuthority.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleAction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleActionType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyIntrusionSystemMode.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleAction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleActionType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocolType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionNetworkProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyThreatIntelWhitelist.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTransportSecurity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTrustedRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLog.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogInformation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogStatusParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogs.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FrontendIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRouteListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GetVpnSitesConfigurationRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfigurationMethod.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPHeader.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPMethod.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubIPAddresses.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTables.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAddressAvailabilityResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAllocationMethod.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationBgpPeeringAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationProfile.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPVersion.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeEncryption.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeIntegrity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatPool.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocationType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpFlowProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpTag.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecEncryption.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecIntegrity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6CircuitConnectionConfig.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6ExpressRouteCircuitPeeringConfig.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IssueType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancer.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddressPools.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerFrontendIPConfigurations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerLoadBalancingRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterface.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterfaces.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRuleProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerProbes.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancers.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancingRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadDistribution.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegationModel.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LogSpecification.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleEnabledState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleGroupOverride.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleOverride.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRulesDefinition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentityUserAssignedIdentitiesValue.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchVariable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchedRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MetricSpecification.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticProfile.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResponse.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicyConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterface.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceAssociation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceDnsSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancer.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancers.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceNetworkInterfaceIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfigurations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaces.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkOperationStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfile.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfiles.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkRuleCondition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRuleModel.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityRulesEvaluationResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliance.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliances.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatcher.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatchers.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OfficeTrafficCategory.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationDisplay.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationPropertiesFormatServiceSpecification.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Origin.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutboundRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutputType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntry.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntryMatchVariable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntrySelectorMatchOperator.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SConnectionConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealth.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealthRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnProfileParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2sVpnGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureFilter.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureQueryStatusResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureStorageLocation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptures.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilter.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilterRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcError.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PfsGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PolicySettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PreferredIPVersion.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrepareNetworkPoliciesRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneConfig.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroup.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroups.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoint.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpointConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoints.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkService.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnectionState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceIpConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesAutoApproval.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesVisibility.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceVisibility.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServices.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Probe.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProbeProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProcessorArchitecture.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PropagatedRouteTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Protocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolCustomSettingsFormat.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProvisioningState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressDnsSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddresses.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefix.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixes.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/QueryTroubleshootingParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RadiusServer.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RecordSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ReferencedPublicIpAddress.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceIdentityType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinks.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinksListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceSet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RetentionPolicyParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Route.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilter.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteNextHopType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTables.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Routes.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RoutingConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupNetworkInterface.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProvider.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviderConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviders.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityProviderName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAccess.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAssociations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleDirection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRules.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinks.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinksListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicies.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinition.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinitions.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPropertiesFormat.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceProviderProvisioningState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformationPropertiesFormat.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTags.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagsListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SessionIds.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Severity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/StaticRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SubnetAssociation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnets.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TagsObject.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Topology.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyAssociation.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyResource.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsConfigurationProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficSelectorPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TransportProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingDetails.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingRecommendedActions.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionHealth.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UnprepareNetworkPoliciesRequest.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usage.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UsageName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usages.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VM.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerbosityLevel.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceNicProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceSkuProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHub.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubId.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2s.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteV2.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubs.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualMachineScaleSetNetworkInterfaceIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetwork.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkBgpCommunities.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkConnectionGatewayReference.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionListEntity.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayIPConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySku.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuTier.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeering.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeeringState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeerings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTap.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTaps.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsage.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsageName.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworks.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouter.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeering.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeerings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWAN.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProvider.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProviderType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanVpnProfileParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWans.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VnetRoute.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnAuthenticationType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealth.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetail.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetailListResult.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientIPsecParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRevokedCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionStatus.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnection.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnectionModel.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnDeviceScriptParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateway.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayGeneration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayTunnelingProtocol.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateways.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkBgpSettings.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkProviderProperties.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStartParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStopParameters.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnProfileResponse.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusClientRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusServerRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRevokedCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRootCertificate.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfiguration.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsAssociatedWithVirtualWans.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsResponse.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSite.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteId.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLink.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinkConnections.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinks.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSites.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSitesConfigurations.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallAction.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallCustomRule.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallEnabledState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMatchVariable.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMode.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallOperator.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicies.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicy.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicyResourceState.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallRuleType.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallTransform.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionActiveSessionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionSessionStateInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionShareableLinkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DnsNameAvailabilityResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IdParsingUtils.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfaceImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationModelImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancerImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceNetworkInterfaceIPConfigurationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManagementClientImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManager.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleModelImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl1.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRuleInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Impl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Inner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWanSecurityProvidersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyImpl.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyInner.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/package-info.java
 create mode 100644 sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/package-info.java

diff --git a/sdk/network/mgmt-v2020_04_01/pom.xml b/sdk/network/mgmt-v2020_04_01/pom.xml
new file mode 100644
index 000000000000..365bcb9533b3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/pom.xml
@@ -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.
+-->
+<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.network.v2020_04_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>1.3.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-network</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Network Management</name>
+    <description>This package contains Microsoft Network Management SDK.</description>
+    <url>https://github.com/Azure/azure-sdk-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-sdk-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-sdk-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>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AadAuthenticationParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AadAuthenticationParameters.java
new file mode 100644
index 000000000000..e71d532a4d2e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AadAuthenticationParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * AAD Vpn authentication type related parameters.
+ */
+public class AadAuthenticationParameters {
+    /**
+     * AAD Vpn authentication parameter AAD tenant.
+     */
+    @JsonProperty(value = "aadTenant")
+    private String aadTenant;
+
+    /**
+     * AAD Vpn authentication parameter AAD audience.
+     */
+    @JsonProperty(value = "aadAudience")
+    private String aadAudience;
+
+    /**
+     * AAD Vpn authentication parameter AAD issuer.
+     */
+    @JsonProperty(value = "aadIssuer")
+    private String aadIssuer;
+
+    /**
+     * Get aAD Vpn authentication parameter AAD tenant.
+     *
+     * @return the aadTenant value
+     */
+    public String aadTenant() {
+        return this.aadTenant;
+    }
+
+    /**
+     * Set aAD Vpn authentication parameter AAD tenant.
+     *
+     * @param aadTenant the aadTenant value to set
+     * @return the AadAuthenticationParameters object itself.
+     */
+    public AadAuthenticationParameters withAadTenant(String aadTenant) {
+        this.aadTenant = aadTenant;
+        return this;
+    }
+
+    /**
+     * Get aAD Vpn authentication parameter AAD audience.
+     *
+     * @return the aadAudience value
+     */
+    public String aadAudience() {
+        return this.aadAudience;
+    }
+
+    /**
+     * Set aAD Vpn authentication parameter AAD audience.
+     *
+     * @param aadAudience the aadAudience value to set
+     * @return the AadAuthenticationParameters object itself.
+     */
+    public AadAuthenticationParameters withAadAudience(String aadAudience) {
+        this.aadAudience = aadAudience;
+        return this;
+    }
+
+    /**
+     * Get aAD Vpn authentication parameter AAD issuer.
+     *
+     * @return the aadIssuer value
+     */
+    public String aadIssuer() {
+        return this.aadIssuer;
+    }
+
+    /**
+     * Set aAD Vpn authentication parameter AAD issuer.
+     *
+     * @param aadIssuer the aadIssuer value to set
+     * @return the AadAuthenticationParameters object itself.
+     */
+    public AadAuthenticationParameters withAadIssuer(String aadIssuer) {
+        this.aadIssuer = aadIssuer;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Access.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Access.java
new file mode 100644
index 000000000000..b9edcaa61bc8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Access.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Access.
+ */
+public final class Access extends ExpandableStringEnum<Access> {
+    /** Static value Allow for Access. */
+    public static final Access ALLOW = fromString("Allow");
+
+    /** Static value Deny for Access. */
+    public static final Access DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a Access from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Access
+     */
+    @JsonCreator
+    public static Access fromString(String name) {
+        return fromString(name, Access.class);
+    }
+
+    /**
+     * @return known Access values
+     */
+    public static Collection<Access> values() {
+        return values(Access.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AddressSpace.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AddressSpace.java
new file mode 100644
index 000000000000..096ea4e485ad
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AddressSpace.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * AddressSpace contains an array of IP address ranges that can be used by
+ * subnets of the virtual network.
+ */
+public class AddressSpace {
+    /**
+     * A list of address blocks reserved for this virtual network in CIDR
+     * notation.
+     */
+    @JsonProperty(value = "addressPrefixes")
+    private List<String> addressPrefixes;
+
+    /**
+     * Get a list of address blocks reserved for this virtual network in CIDR notation.
+     *
+     * @return the addressPrefixes value
+     */
+    public List<String> addressPrefixes() {
+        return this.addressPrefixes;
+    }
+
+    /**
+     * Set a list of address blocks reserved for this virtual network in CIDR notation.
+     *
+     * @param addressPrefixes the addressPrefixes value to set
+     * @return the AddressSpace object itself.
+     */
+    public AddressSpace withAddressPrefixes(List<String> addressPrefixes) {
+        this.addressPrefixes = addressPrefixes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateway.java
new file mode 100644
index 000000000000..753855405d5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateway.java
@@ -0,0 +1,815 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewayInner;
+
+/**
+ * Type representing ApplicationGateway.
+ */
+public interface ApplicationGateway extends HasInner<ApplicationGatewayInner>, Resource, GroupableResourceCore<NetworkManager, ApplicationGatewayInner>, HasResourceGroup, Refreshable<ApplicationGateway>, Updatable<ApplicationGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the authenticationCertificates value.
+     */
+    List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates();
+
+    /**
+     * @return the autoscaleConfiguration value.
+     */
+    ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration();
+
+    /**
+     * @return the backendAddressPools value.
+     */
+    List<ApplicationGatewayBackendAddressPool> backendAddressPools();
+
+    /**
+     * @return the backendHttpSettingsCollection value.
+     */
+    List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection();
+
+    /**
+     * @return the customErrorConfigurations value.
+     */
+    List<ApplicationGatewayCustomError> customErrorConfigurations();
+
+    /**
+     * @return the enableFips value.
+     */
+    Boolean enableFips();
+
+    /**
+     * @return the enableHttp2 value.
+     */
+    Boolean enableHttp2();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the firewallPolicy value.
+     */
+    SubResource firewallPolicy();
+
+    /**
+     * @return the forceFirewallPolicyAssociation value.
+     */
+    Boolean forceFirewallPolicyAssociation();
+
+    /**
+     * @return the frontendIPConfigurations value.
+     */
+    List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations();
+
+    /**
+     * @return the frontendPorts value.
+     */
+    List<ApplicationGatewayFrontendPort> frontendPorts();
+
+    /**
+     * @return the gatewayIPConfigurations value.
+     */
+    List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations();
+
+    /**
+     * @return the httpListeners value.
+     */
+    List<ApplicationGatewayHttpListener> httpListeners();
+
+    /**
+     * @return the identity value.
+     */
+    ManagedServiceIdentity identity();
+
+    /**
+     * @return the operationalState value.
+     */
+    ApplicationGatewayOperationalState operationalState();
+
+    /**
+     * @return the probes value.
+     */
+    List<ApplicationGatewayProbe> probes();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the redirectConfigurations value.
+     */
+    List<ApplicationGatewayRedirectConfiguration> redirectConfigurations();
+
+    /**
+     * @return the requestRoutingRules value.
+     */
+    List<ApplicationGatewayRequestRoutingRule> requestRoutingRules();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the rewriteRuleSets value.
+     */
+    List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets();
+
+    /**
+     * @return the sku value.
+     */
+    ApplicationGatewaySku sku();
+
+    /**
+     * @return the sslCertificates value.
+     */
+    List<ApplicationGatewaySslCertificate> sslCertificates();
+
+    /**
+     * @return the sslPolicy value.
+     */
+    ApplicationGatewaySslPolicy sslPolicy();
+
+    /**
+     * @return the trustedRootCertificates value.
+     */
+    List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates();
+
+    /**
+     * @return the urlPathMaps value.
+     */
+    List<ApplicationGatewayUrlPathMap> urlPathMaps();
+
+    /**
+     * @return the webApplicationFirewallConfiguration value.
+     */
+    ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * The entirety of the ApplicationGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ApplicationGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ApplicationGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ApplicationGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify AuthenticationCertificates.
+         */
+        interface WithAuthenticationCertificates {
+            /**
+             * Specifies authenticationCertificates.
+             * @param authenticationCertificates Authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify AutoscaleConfiguration.
+         */
+        interface WithAutoscaleConfiguration {
+            /**
+             * Specifies autoscaleConfiguration.
+             * @param autoscaleConfiguration Autoscale Configuration
+             * @return the next definition stage
+             */
+            WithCreate withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify BackendAddressPools.
+         */
+        interface WithBackendAddressPools {
+            /**
+             * Specifies backendAddressPools.
+             * @param backendAddressPools Backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify BackendHttpSettingsCollection.
+         */
+        interface WithBackendHttpSettingsCollection {
+            /**
+             * Specifies backendHttpSettingsCollection.
+             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify CustomErrorConfigurations.
+         */
+        interface WithCustomErrorConfigurations {
+            /**
+             * Specifies customErrorConfigurations.
+             * @param customErrorConfigurations Custom error configurations of the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withCustomErrorConfigurations(List<ApplicationGatewayCustomError> customErrorConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify EnableFips.
+         */
+        interface WithEnableFips {
+            /**
+             * Specifies enableFips.
+             * @param enableFips Whether FIPS is enabled on the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withEnableFips(Boolean enableFips);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify EnableHttp2.
+         */
+        interface WithEnableHttp2 {
+            /**
+             * Specifies enableHttp2.
+             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withEnableHttp2(Boolean enableHttp2);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify FirewallPolicy.
+         */
+        interface WithFirewallPolicy {
+            /**
+             * Specifies firewallPolicy.
+             * @param firewallPolicy Reference to the FirewallPolicy resource
+             * @return the next definition stage
+             */
+            WithCreate withFirewallPolicy(SubResource firewallPolicy);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify ForceFirewallPolicyAssociation.
+         */
+        interface WithForceFirewallPolicyAssociation {
+            /**
+             * Specifies forceFirewallPolicyAssociation.
+             * @param forceFirewallPolicyAssociation If true, associates a firewall policy with an application gateway regardless whether the policy differs from the WAF Config
+             * @return the next definition stage
+             */
+            WithCreate withForceFirewallPolicyAssociation(Boolean forceFirewallPolicyAssociation);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify FrontendIPConfigurations.
+         */
+        interface WithFrontendIPConfigurations {
+            /**
+             * Specifies frontendIPConfigurations.
+             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify FrontendPorts.
+         */
+        interface WithFrontendPorts {
+            /**
+             * Specifies frontendPorts.
+             * @param frontendPorts Frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify GatewayIPConfigurations.
+         */
+        interface WithGatewayIPConfigurations {
+            /**
+             * Specifies gatewayIPConfigurations.
+             * @param gatewayIPConfigurations Subnets of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify HttpListeners.
+         */
+        interface WithHttpListeners {
+            /**
+             * Specifies httpListeners.
+             * @param httpListeners Http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the application gateway, if configured
+             * @return the next definition stage
+             */
+            WithCreate withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify Probes.
+         */
+        interface WithProbes {
+            /**
+             * Specifies probes.
+             * @param probes Probes of the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withProbes(List<ApplicationGatewayProbe> probes);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify RedirectConfigurations.
+         */
+        interface WithRedirectConfigurations {
+            /**
+             * Specifies redirectConfigurations.
+             * @param redirectConfigurations Redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify RequestRoutingRules.
+         */
+        interface WithRequestRoutingRules {
+            /**
+             * Specifies requestRoutingRules.
+             * @param requestRoutingRules Request routing rules of the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify RewriteRuleSets.
+         */
+        interface WithRewriteRuleSets {
+            /**
+             * Specifies rewriteRuleSets.
+             * @param rewriteRuleSets Rewrite rules for the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withRewriteRuleSets(List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku SKU of the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withSku(ApplicationGatewaySku sku);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify SslCertificates.
+         */
+        interface WithSslCertificates {
+            /**
+             * Specifies sslCertificates.
+             * @param sslCertificates SSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify SslPolicy.
+         */
+        interface WithSslPolicy {
+            /**
+             * Specifies sslPolicy.
+             * @param sslPolicy SSL policy of the application gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify TrustedRootCertificates.
+         */
+        interface WithTrustedRootCertificates {
+            /**
+             * Specifies trustedRootCertificates.
+             * @param trustedRootCertificates Trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withTrustedRootCertificates(List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify UrlPathMaps.
+         */
+        interface WithUrlPathMaps {
+            /**
+             * Specifies urlPathMaps.
+             * @param urlPathMaps URL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next definition stage
+             */
+            WithCreate withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify WebApplicationFirewallConfiguration.
+         */
+        interface WithWebApplicationFirewallConfiguration {
+            /**
+             * Specifies webApplicationFirewallConfiguration.
+             * @param webApplicationFirewallConfiguration Web application firewall configuration
+             * @return the next definition stage
+             */
+            WithCreate withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
+        }
+
+        /**
+         * The stage of the applicationgateway definition allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting where the resource needs to come from
+             * @return the next definition stage
+             */
+            WithCreate withZones(List<String> zones);
+        }
+
+        /**
+         * 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<ApplicationGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAuthenticationCertificates, DefinitionStages.WithAutoscaleConfiguration, DefinitionStages.WithBackendAddressPools, DefinitionStages.WithBackendHttpSettingsCollection, DefinitionStages.WithCustomErrorConfigurations, DefinitionStages.WithEnableFips, DefinitionStages.WithEnableHttp2, DefinitionStages.WithFirewallPolicy, DefinitionStages.WithForceFirewallPolicyAssociation, DefinitionStages.WithFrontendIPConfigurations, DefinitionStages.WithFrontendPorts, DefinitionStages.WithGatewayIPConfigurations, DefinitionStages.WithHttpListeners, DefinitionStages.WithIdentity, DefinitionStages.WithProbes, DefinitionStages.WithRedirectConfigurations, DefinitionStages.WithRequestRoutingRules, DefinitionStages.WithRewriteRuleSets, DefinitionStages.WithSku, DefinitionStages.WithSslCertificates, DefinitionStages.WithSslPolicy, DefinitionStages.WithTrustedRootCertificates, DefinitionStages.WithUrlPathMaps, DefinitionStages.WithWebApplicationFirewallConfiguration, DefinitionStages.WithZones {
+        }
+    }
+    /**
+     * The template for a ApplicationGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ApplicationGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithAuthenticationCertificates, UpdateStages.WithAutoscaleConfiguration, UpdateStages.WithBackendAddressPools, UpdateStages.WithBackendHttpSettingsCollection, UpdateStages.WithCustomErrorConfigurations, UpdateStages.WithEnableFips, UpdateStages.WithEnableHttp2, UpdateStages.WithFirewallPolicy, UpdateStages.WithForceFirewallPolicyAssociation, UpdateStages.WithFrontendIPConfigurations, UpdateStages.WithFrontendPorts, UpdateStages.WithGatewayIPConfigurations, UpdateStages.WithHttpListeners, UpdateStages.WithIdentity, UpdateStages.WithProbes, UpdateStages.WithRedirectConfigurations, UpdateStages.WithRequestRoutingRules, UpdateStages.WithRewriteRuleSets, UpdateStages.WithSku, UpdateStages.WithSslCertificates, UpdateStages.WithSslPolicy, UpdateStages.WithTrustedRootCertificates, UpdateStages.WithUrlPathMaps, UpdateStages.WithWebApplicationFirewallConfiguration, UpdateStages.WithZones {
+    }
+
+    /**
+     * Grouping of ApplicationGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
+         */
+        interface WithAuthenticationCertificates {
+            /**
+             * Specifies authenticationCertificates.
+             * @param authenticationCertificates Authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify AutoscaleConfiguration.
+         */
+        interface WithAutoscaleConfiguration {
+            /**
+             * Specifies autoscaleConfiguration.
+             * @param autoscaleConfiguration Autoscale Configuration
+             * @return the next update stage
+             */
+            Update withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
+         */
+        interface WithBackendAddressPools {
+            /**
+             * Specifies backendAddressPools.
+             * @param backendAddressPools Backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
+         */
+        interface WithBackendHttpSettingsCollection {
+            /**
+             * Specifies backendHttpSettingsCollection.
+             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify CustomErrorConfigurations.
+         */
+        interface WithCustomErrorConfigurations {
+            /**
+             * Specifies customErrorConfigurations.
+             * @param customErrorConfigurations Custom error configurations of the application gateway resource
+             * @return the next update stage
+             */
+            Update withCustomErrorConfigurations(List<ApplicationGatewayCustomError> customErrorConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify EnableFips.
+         */
+        interface WithEnableFips {
+            /**
+             * Specifies enableFips.
+             * @param enableFips Whether FIPS is enabled on the application gateway resource
+             * @return the next update stage
+             */
+            Update withEnableFips(Boolean enableFips);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify EnableHttp2.
+         */
+        interface WithEnableHttp2 {
+            /**
+             * Specifies enableHttp2.
+             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
+             * @return the next update stage
+             */
+            Update withEnableHttp2(Boolean enableHttp2);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify FirewallPolicy.
+         */
+        interface WithFirewallPolicy {
+            /**
+             * Specifies firewallPolicy.
+             * @param firewallPolicy Reference to the FirewallPolicy resource
+             * @return the next update stage
+             */
+            Update withFirewallPolicy(SubResource firewallPolicy);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify ForceFirewallPolicyAssociation.
+         */
+        interface WithForceFirewallPolicyAssociation {
+            /**
+             * Specifies forceFirewallPolicyAssociation.
+             * @param forceFirewallPolicyAssociation If true, associates a firewall policy with an application gateway regardless whether the policy differs from the WAF Config
+             * @return the next update stage
+             */
+            Update withForceFirewallPolicyAssociation(Boolean forceFirewallPolicyAssociation);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
+         */
+        interface WithFrontendIPConfigurations {
+            /**
+             * Specifies frontendIPConfigurations.
+             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify FrontendPorts.
+         */
+        interface WithFrontendPorts {
+            /**
+             * Specifies frontendPorts.
+             * @param frontendPorts Frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
+         */
+        interface WithGatewayIPConfigurations {
+            /**
+             * Specifies gatewayIPConfigurations.
+             * @param gatewayIPConfigurations Subnets of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify HttpListeners.
+         */
+        interface WithHttpListeners {
+            /**
+             * Specifies httpListeners.
+             * @param httpListeners Http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the application gateway, if configured
+             * @return the next update stage
+             */
+            Update withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify Probes.
+         */
+        interface WithProbes {
+            /**
+             * Specifies probes.
+             * @param probes Probes of the application gateway resource
+             * @return the next update stage
+             */
+            Update withProbes(List<ApplicationGatewayProbe> probes);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
+         */
+        interface WithRedirectConfigurations {
+            /**
+             * Specifies redirectConfigurations.
+             * @param redirectConfigurations Redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
+         */
+        interface WithRequestRoutingRules {
+            /**
+             * Specifies requestRoutingRules.
+             * @param requestRoutingRules Request routing rules of the application gateway resource
+             * @return the next update stage
+             */
+            Update withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify RewriteRuleSets.
+         */
+        interface WithRewriteRuleSets {
+            /**
+             * Specifies rewriteRuleSets.
+             * @param rewriteRuleSets Rewrite rules for the application gateway resource
+             * @return the next update stage
+             */
+            Update withRewriteRuleSets(List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku SKU of the application gateway resource
+             * @return the next update stage
+             */
+            Update withSku(ApplicationGatewaySku sku);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify SslCertificates.
+         */
+        interface WithSslCertificates {
+            /**
+             * Specifies sslCertificates.
+             * @param sslCertificates SSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify SslPolicy.
+         */
+        interface WithSslPolicy {
+            /**
+             * Specifies sslPolicy.
+             * @param sslPolicy SSL policy of the application gateway resource
+             * @return the next update stage
+             */
+            Update withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify TrustedRootCertificates.
+         */
+        interface WithTrustedRootCertificates {
+            /**
+             * Specifies trustedRootCertificates.
+             * @param trustedRootCertificates Trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withTrustedRootCertificates(List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
+         */
+        interface WithUrlPathMaps {
+            /**
+             * Specifies urlPathMaps.
+             * @param urlPathMaps URL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)
+             * @return the next update stage
+             */
+            Update withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
+         */
+        interface WithWebApplicationFirewallConfiguration {
+            /**
+             * Specifies webApplicationFirewallConfiguration.
+             * @param webApplicationFirewallConfiguration Web application firewall configuration
+             * @return the next update stage
+             */
+            Update withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
+        }
+
+        /**
+         * The stage of the applicationgateway update allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting where the resource needs to come from
+             * @return the next update stage
+             */
+            Update withZones(List<String> zones);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAuthenticationCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAuthenticationCertificate.java
new file mode 100644
index 000000000000..751c8fda27b4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAuthenticationCertificate.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Authentication certificates of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayAuthenticationCertificate extends SubResource {
+    /**
+     * Certificate public data.
+     */
+    @JsonProperty(value = "properties.data")
+    private String data;
+
+    /**
+     * The provisioning state of the authentication certificate resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the authentication certificate that is unique within an
+     * Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get certificate public data.
+     *
+     * @return the data value
+     */
+    public String data() {
+        return this.data;
+    }
+
+    /**
+     * Set certificate public data.
+     *
+     * @param data the data value to set
+     * @return the ApplicationGatewayAuthenticationCertificate object itself.
+     */
+    public ApplicationGatewayAuthenticationCertificate withData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the authentication certificate resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the authentication certificate that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the authentication certificate that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayAuthenticationCertificate object itself.
+     */
+    public ApplicationGatewayAuthenticationCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAutoscaleConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAutoscaleConfiguration.java
new file mode 100644
index 000000000000..8274d996413b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAutoscaleConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application Gateway autoscale configuration.
+ */
+public class ApplicationGatewayAutoscaleConfiguration {
+    /**
+     * Lower bound on number of Application Gateway capacity.
+     */
+    @JsonProperty(value = "minCapacity", required = true)
+    private int minCapacity;
+
+    /**
+     * Upper bound on number of Application Gateway capacity.
+     */
+    @JsonProperty(value = "maxCapacity")
+    private Integer maxCapacity;
+
+    /**
+     * Get lower bound on number of Application Gateway capacity.
+     *
+     * @return the minCapacity value
+     */
+    public int minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set lower bound on number of Application Gateway capacity.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the ApplicationGatewayAutoscaleConfiguration object itself.
+     */
+    public ApplicationGatewayAutoscaleConfiguration withMinCapacity(int minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
+    /**
+     * Get upper bound on number of Application Gateway capacity.
+     *
+     * @return the maxCapacity value
+     */
+    public Integer maxCapacity() {
+        return this.maxCapacity;
+    }
+
+    /**
+     * Set upper bound on number of Application Gateway capacity.
+     *
+     * @param maxCapacity the maxCapacity value to set
+     * @return the ApplicationGatewayAutoscaleConfiguration object itself.
+     */
+    public ApplicationGatewayAutoscaleConfiguration withMaxCapacity(Integer maxCapacity) {
+        this.maxCapacity = maxCapacity;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableSslOptions.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableSslOptions.java
new file mode 100644
index 000000000000..c66d618b3a3b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableSslOptions.java
@@ -0,0 +1,68 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewayAvailableSslOptionsInner;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import java.util.Map;
+
+/**
+ * Type representing ApplicationGatewayAvailableSslOptions.
+ */
+public interface ApplicationGatewayAvailableSslOptions extends HasInner<ApplicationGatewayAvailableSslOptionsInner>, HasManager<NetworkManager> {
+    /**
+     * @return the availableCipherSuites value.
+     */
+    List<ApplicationGatewaySslCipherSuite> availableCipherSuites();
+
+    /**
+     * @return the availableProtocols value.
+     */
+    List<ApplicationGatewaySslProtocol> availableProtocols();
+
+    /**
+     * @return the defaultPolicy value.
+     */
+    ApplicationGatewaySslPolicyName defaultPolicy();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the predefinedPolicies value.
+     */
+    List<SubResource> predefinedPolicies();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableWafRuleSetsResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableWafRuleSetsResult.java
new file mode 100644
index 000000000000..c54a38219519
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayAvailableWafRuleSetsResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewayAvailableWafRuleSetsResultInner;
+import java.util.List;
+
+/**
+ * Type representing ApplicationGatewayAvailableWafRuleSetsResult.
+ */
+public interface ApplicationGatewayAvailableWafRuleSetsResult extends HasInner<ApplicationGatewayAvailableWafRuleSetsResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the value value.
+     */
+    List<ApplicationGatewayFirewallRuleSet> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddress.java
new file mode 100644
index 000000000000..b9bee905931d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddress.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Backend address of an application gateway.
+ */
+public class ApplicationGatewayBackendAddress {
+    /**
+     * Fully qualified domain name (FQDN).
+     */
+    @JsonProperty(value = "fqdn")
+    private String fqdn;
+
+    /**
+     * IP address.
+     */
+    @JsonProperty(value = "ipAddress")
+    private String ipAddress;
+
+    /**
+     * Get fully qualified domain name (FQDN).
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set fully qualified domain name (FQDN).
+     *
+     * @param fqdn the fqdn value to set
+     * @return the ApplicationGatewayBackendAddress object itself.
+     */
+    public ApplicationGatewayBackendAddress withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get iP address.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set iP address.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the ApplicationGatewayBackendAddress object itself.
+     */
+    public ApplicationGatewayBackendAddress withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddressPool.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddressPool.java
new file mode 100644
index 000000000000..e79248ca0492
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendAddressPool.java
@@ -0,0 +1,136 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Backend Address Pool of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayBackendAddressPool extends SubResource {
+    /**
+     * Collection of references to IPs defined in network interfaces.
+     */
+    @JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;
+
+    /**
+     * Backend addresses.
+     */
+    @JsonProperty(value = "properties.backendAddresses")
+    private List<ApplicationGatewayBackendAddress> backendAddresses;
+
+    /**
+     * The provisioning state of the backend address pool resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the backend address pool that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get collection of references to IPs defined in network interfaces.
+     *
+     * @return the backendIPConfigurations value
+     */
+    public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
+        return this.backendIPConfigurations;
+    }
+
+    /**
+     * Get backend addresses.
+     *
+     * @return the backendAddresses value
+     */
+    public List<ApplicationGatewayBackendAddress> backendAddresses() {
+        return this.backendAddresses;
+    }
+
+    /**
+     * Set backend addresses.
+     *
+     * @param backendAddresses the backendAddresses value to set
+     * @return the ApplicationGatewayBackendAddressPool object itself.
+     */
+    public ApplicationGatewayBackendAddressPool withBackendAddresses(List<ApplicationGatewayBackendAddress> backendAddresses) {
+        this.backendAddresses = backendAddresses;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the backend address pool resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the backend address pool that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the backend address pool that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayBackendAddressPool object itself.
+     */
+    public ApplicationGatewayBackendAddressPool withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealth.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealth.java
new file mode 100644
index 000000000000..91ae1756d9f9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealth.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewayBackendHealthInner;
+import java.util.List;
+
+/**
+ * Type representing ApplicationGatewayBackendHealth.
+ */
+public interface ApplicationGatewayBackendHealth extends HasInner<ApplicationGatewayBackendHealthInner>, HasManager<NetworkManager> {
+    /**
+     * @return the backendAddressPools value.
+     */
+    List<ApplicationGatewayBackendHealthPool> backendAddressPools();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthHttpSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthHttpSettings.java
new file mode 100644
index 000000000000..6831b5769fa2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthHttpSettings.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application gateway BackendHealthHttp settings.
+ */
+public class ApplicationGatewayBackendHealthHttpSettings {
+    /**
+     * Reference to an ApplicationGatewayBackendHttpSettings resource.
+     */
+    @JsonProperty(value = "backendHttpSettings")
+    private ApplicationGatewayBackendHttpSettings backendHttpSettings;
+
+    /**
+     * List of ApplicationGatewayBackendHealthServer resources.
+     */
+    @JsonProperty(value = "servers")
+    private List<ApplicationGatewayBackendHealthServer> servers;
+
+    /**
+     * Get reference to an ApplicationGatewayBackendHttpSettings resource.
+     *
+     * @return the backendHttpSettings value
+     */
+    public ApplicationGatewayBackendHttpSettings backendHttpSettings() {
+        return this.backendHttpSettings;
+    }
+
+    /**
+     * Set reference to an ApplicationGatewayBackendHttpSettings resource.
+     *
+     * @param backendHttpSettings the backendHttpSettings value to set
+     * @return the ApplicationGatewayBackendHealthHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHealthHttpSettings withBackendHttpSettings(ApplicationGatewayBackendHttpSettings backendHttpSettings) {
+        this.backendHttpSettings = backendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get list of ApplicationGatewayBackendHealthServer resources.
+     *
+     * @return the servers value
+     */
+    public List<ApplicationGatewayBackendHealthServer> servers() {
+        return this.servers;
+    }
+
+    /**
+     * Set list of ApplicationGatewayBackendHealthServer resources.
+     *
+     * @param servers the servers value to set
+     * @return the ApplicationGatewayBackendHealthHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHealthHttpSettings withServers(List<ApplicationGatewayBackendHealthServer> servers) {
+        this.servers = servers;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthOnDemand.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthOnDemand.java
new file mode 100644
index 000000000000..5cb67a997739
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthOnDemand.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewayBackendHealthOnDemandInner;
+
+/**
+ * Type representing ApplicationGatewayBackendHealthOnDemand.
+ */
+public interface ApplicationGatewayBackendHealthOnDemand extends HasInner<ApplicationGatewayBackendHealthOnDemandInner>, HasManager<NetworkManager> {
+    /**
+     * @return the backendAddressPool value.
+     */
+    ApplicationGatewayBackendAddressPool backendAddressPool();
+
+    /**
+     * @return the backendHealthHttpSettings value.
+     */
+    ApplicationGatewayBackendHealthHttpSettings backendHealthHttpSettings();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthPool.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthPool.java
new file mode 100644
index 000000000000..3885c4394ebd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthPool.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application gateway BackendHealth pool.
+ */
+public class ApplicationGatewayBackendHealthPool {
+    /**
+     * Reference to an ApplicationGatewayBackendAddressPool resource.
+     */
+    @JsonProperty(value = "backendAddressPool")
+    private ApplicationGatewayBackendAddressPool backendAddressPool;
+
+    /**
+     * List of ApplicationGatewayBackendHealthHttpSettings resources.
+     */
+    @JsonProperty(value = "backendHttpSettingsCollection")
+    private List<ApplicationGatewayBackendHealthHttpSettings> backendHttpSettingsCollection;
+
+    /**
+     * Get reference to an ApplicationGatewayBackendAddressPool resource.
+     *
+     * @return the backendAddressPool value
+     */
+    public ApplicationGatewayBackendAddressPool backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set reference to an ApplicationGatewayBackendAddressPool resource.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the ApplicationGatewayBackendHealthPool object itself.
+     */
+    public ApplicationGatewayBackendHealthPool withBackendAddressPool(ApplicationGatewayBackendAddressPool backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get list of ApplicationGatewayBackendHealthHttpSettings resources.
+     *
+     * @return the backendHttpSettingsCollection value
+     */
+    public List<ApplicationGatewayBackendHealthHttpSettings> backendHttpSettingsCollection() {
+        return this.backendHttpSettingsCollection;
+    }
+
+    /**
+     * Set list of ApplicationGatewayBackendHealthHttpSettings resources.
+     *
+     * @param backendHttpSettingsCollection the backendHttpSettingsCollection value to set
+     * @return the ApplicationGatewayBackendHealthPool object itself.
+     */
+    public ApplicationGatewayBackendHealthPool withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHealthHttpSettings> backendHttpSettingsCollection) {
+        this.backendHttpSettingsCollection = backendHttpSettingsCollection;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServer.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServer.java
new file mode 100644
index 000000000000..9c792c6f8650
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServer.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application gateway backendhealth http settings.
+ */
+public class ApplicationGatewayBackendHealthServer {
+    /**
+     * IP address or FQDN of backend server.
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * Reference to IP configuration of backend server.
+     */
+    @JsonProperty(value = "ipConfiguration")
+    private NetworkInterfaceIPConfigurationInner ipConfiguration;
+
+    /**
+     * Health of backend server. Possible values include: 'Unknown', 'Up',
+     * 'Down', 'Partial', 'Draining'.
+     */
+    @JsonProperty(value = "health")
+    private ApplicationGatewayBackendHealthServerHealth health;
+
+    /**
+     * Health Probe Log.
+     */
+    @JsonProperty(value = "healthProbeLog")
+    private String healthProbeLog;
+
+    /**
+     * Get iP address or FQDN of backend server.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set iP address or FQDN of backend server.
+     *
+     * @param address the address value to set
+     * @return the ApplicationGatewayBackendHealthServer object itself.
+     */
+    public ApplicationGatewayBackendHealthServer withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    /**
+     * Get reference to IP configuration of backend server.
+     *
+     * @return the ipConfiguration value
+     */
+    public NetworkInterfaceIPConfigurationInner ipConfiguration() {
+        return this.ipConfiguration;
+    }
+
+    /**
+     * Set reference to IP configuration of backend server.
+     *
+     * @param ipConfiguration the ipConfiguration value to set
+     * @return the ApplicationGatewayBackendHealthServer object itself.
+     */
+    public ApplicationGatewayBackendHealthServer withIpConfiguration(NetworkInterfaceIPConfigurationInner ipConfiguration) {
+        this.ipConfiguration = ipConfiguration;
+        return this;
+    }
+
+    /**
+     * Get health of backend server. Possible values include: 'Unknown', 'Up', 'Down', 'Partial', 'Draining'.
+     *
+     * @return the health value
+     */
+    public ApplicationGatewayBackendHealthServerHealth health() {
+        return this.health;
+    }
+
+    /**
+     * Set health of backend server. Possible values include: 'Unknown', 'Up', 'Down', 'Partial', 'Draining'.
+     *
+     * @param health the health value to set
+     * @return the ApplicationGatewayBackendHealthServer object itself.
+     */
+    public ApplicationGatewayBackendHealthServer withHealth(ApplicationGatewayBackendHealthServerHealth health) {
+        this.health = health;
+        return this;
+    }
+
+    /**
+     * Get health Probe Log.
+     *
+     * @return the healthProbeLog value
+     */
+    public String healthProbeLog() {
+        return this.healthProbeLog;
+    }
+
+    /**
+     * Set health Probe Log.
+     *
+     * @param healthProbeLog the healthProbeLog value to set
+     * @return the ApplicationGatewayBackendHealthServer object itself.
+     */
+    public ApplicationGatewayBackendHealthServer withHealthProbeLog(String healthProbeLog) {
+        this.healthProbeLog = healthProbeLog;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServerHealth.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServerHealth.java
new file mode 100644
index 000000000000..44c65fa3a5f0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHealthServerHealth.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayBackendHealthServerHealth.
+ */
+public final class ApplicationGatewayBackendHealthServerHealth extends ExpandableStringEnum<ApplicationGatewayBackendHealthServerHealth> {
+    /** Static value Unknown for ApplicationGatewayBackendHealthServerHealth. */
+    public static final ApplicationGatewayBackendHealthServerHealth UNKNOWN = fromString("Unknown");
+
+    /** Static value Up for ApplicationGatewayBackendHealthServerHealth. */
+    public static final ApplicationGatewayBackendHealthServerHealth UP = fromString("Up");
+
+    /** Static value Down for ApplicationGatewayBackendHealthServerHealth. */
+    public static final ApplicationGatewayBackendHealthServerHealth DOWN = fromString("Down");
+
+    /** Static value Partial for ApplicationGatewayBackendHealthServerHealth. */
+    public static final ApplicationGatewayBackendHealthServerHealth PARTIAL = fromString("Partial");
+
+    /** Static value Draining for ApplicationGatewayBackendHealthServerHealth. */
+    public static final ApplicationGatewayBackendHealthServerHealth DRAINING = fromString("Draining");
+
+    /**
+     * Creates or finds a ApplicationGatewayBackendHealthServerHealth from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayBackendHealthServerHealth
+     */
+    @JsonCreator
+    public static ApplicationGatewayBackendHealthServerHealth fromString(String name) {
+        return fromString(name, ApplicationGatewayBackendHealthServerHealth.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayBackendHealthServerHealth values
+     */
+    public static Collection<ApplicationGatewayBackendHealthServerHealth> values() {
+        return values(ApplicationGatewayBackendHealthServerHealth.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHttpSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHttpSettings.java
new file mode 100644
index 000000000000..1dbd3850d428
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayBackendHttpSettings.java
@@ -0,0 +1,437 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Backend address pool settings of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayBackendHttpSettings extends SubResource {
+    /**
+     * The destination port on the backend.
+     */
+    @JsonProperty(value = "properties.port")
+    private Integer port;
+
+    /**
+     * The protocol used to communicate with the backend. Possible values
+     * include: 'Http', 'Https'.
+     */
+    @JsonProperty(value = "properties.protocol")
+    private ApplicationGatewayProtocol protocol;
+
+    /**
+     * Cookie based affinity. Possible values include: 'Enabled', 'Disabled'.
+     */
+    @JsonProperty(value = "properties.cookieBasedAffinity")
+    private ApplicationGatewayCookieBasedAffinity cookieBasedAffinity;
+
+    /**
+     * Request timeout in seconds. Application Gateway will fail the request if
+     * response is not received within RequestTimeout. Acceptable values are
+     * from 1 second to 86400 seconds.
+     */
+    @JsonProperty(value = "properties.requestTimeout")
+    private Integer requestTimeout;
+
+    /**
+     * Probe resource of an application gateway.
+     */
+    @JsonProperty(value = "properties.probe")
+    private SubResource probe;
+
+    /**
+     * Array of references to application gateway authentication certificates.
+     */
+    @JsonProperty(value = "properties.authenticationCertificates")
+    private List<SubResource> authenticationCertificates;
+
+    /**
+     * Array of references to application gateway trusted root certificates.
+     */
+    @JsonProperty(value = "properties.trustedRootCertificates")
+    private List<SubResource> trustedRootCertificates;
+
+    /**
+     * Connection draining of the backend http settings resource.
+     */
+    @JsonProperty(value = "properties.connectionDraining")
+    private ApplicationGatewayConnectionDraining connectionDraining;
+
+    /**
+     * Host header to be sent to the backend servers.
+     */
+    @JsonProperty(value = "properties.hostName")
+    private String hostName;
+
+    /**
+     * Whether to pick host header should be picked from the host name of the
+     * backend server. Default value is false.
+     */
+    @JsonProperty(value = "properties.pickHostNameFromBackendAddress")
+    private Boolean pickHostNameFromBackendAddress;
+
+    /**
+     * Cookie name to use for the affinity cookie.
+     */
+    @JsonProperty(value = "properties.affinityCookieName")
+    private String affinityCookieName;
+
+    /**
+     * Whether the probe is enabled. Default value is false.
+     */
+    @JsonProperty(value = "properties.probeEnabled")
+    private Boolean probeEnabled;
+
+    /**
+     * Path which should be used as a prefix for all HTTP requests. Null means
+     * no path will be prefixed. Default value is null.
+     */
+    @JsonProperty(value = "properties.path")
+    private String path;
+
+    /**
+     * The provisioning state of the backend HTTP settings resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the backend http settings that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the destination port on the backend.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the destination port on the backend.
+     *
+     * @param port the port value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get the protocol used to communicate with the backend. Possible values include: 'Http', 'Https'.
+     *
+     * @return the protocol value
+     */
+    public ApplicationGatewayProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol used to communicate with the backend. Possible values include: 'Http', 'Https'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withProtocol(ApplicationGatewayProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get cookie based affinity. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @return the cookieBasedAffinity value
+     */
+    public ApplicationGatewayCookieBasedAffinity cookieBasedAffinity() {
+        return this.cookieBasedAffinity;
+    }
+
+    /**
+     * Set cookie based affinity. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @param cookieBasedAffinity the cookieBasedAffinity value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withCookieBasedAffinity(ApplicationGatewayCookieBasedAffinity cookieBasedAffinity) {
+        this.cookieBasedAffinity = cookieBasedAffinity;
+        return this;
+    }
+
+    /**
+     * Get request timeout in seconds. Application Gateway will fail the request if response is not received within RequestTimeout. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @return the requestTimeout value
+     */
+    public Integer requestTimeout() {
+        return this.requestTimeout;
+    }
+
+    /**
+     * Set request timeout in seconds. Application Gateway will fail the request if response is not received within RequestTimeout. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @param requestTimeout the requestTimeout value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withRequestTimeout(Integer requestTimeout) {
+        this.requestTimeout = requestTimeout;
+        return this;
+    }
+
+    /**
+     * Get probe resource of an application gateway.
+     *
+     * @return the probe value
+     */
+    public SubResource probe() {
+        return this.probe;
+    }
+
+    /**
+     * Set probe resource of an application gateway.
+     *
+     * @param probe the probe value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withProbe(SubResource probe) {
+        this.probe = probe;
+        return this;
+    }
+
+    /**
+     * Get array of references to application gateway authentication certificates.
+     *
+     * @return the authenticationCertificates value
+     */
+    public List<SubResource> authenticationCertificates() {
+        return this.authenticationCertificates;
+    }
+
+    /**
+     * Set array of references to application gateway authentication certificates.
+     *
+     * @param authenticationCertificates the authenticationCertificates value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withAuthenticationCertificates(List<SubResource> authenticationCertificates) {
+        this.authenticationCertificates = authenticationCertificates;
+        return this;
+    }
+
+    /**
+     * Get array of references to application gateway trusted root certificates.
+     *
+     * @return the trustedRootCertificates value
+     */
+    public List<SubResource> trustedRootCertificates() {
+        return this.trustedRootCertificates;
+    }
+
+    /**
+     * Set array of references to application gateway trusted root certificates.
+     *
+     * @param trustedRootCertificates the trustedRootCertificates value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withTrustedRootCertificates(List<SubResource> trustedRootCertificates) {
+        this.trustedRootCertificates = trustedRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get connection draining of the backend http settings resource.
+     *
+     * @return the connectionDraining value
+     */
+    public ApplicationGatewayConnectionDraining connectionDraining() {
+        return this.connectionDraining;
+    }
+
+    /**
+     * Set connection draining of the backend http settings resource.
+     *
+     * @param connectionDraining the connectionDraining value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withConnectionDraining(ApplicationGatewayConnectionDraining connectionDraining) {
+        this.connectionDraining = connectionDraining;
+        return this;
+    }
+
+    /**
+     * Get host header to be sent to the backend servers.
+     *
+     * @return the hostName value
+     */
+    public String hostName() {
+        return this.hostName;
+    }
+
+    /**
+     * Set host header to be sent to the backend servers.
+     *
+     * @param hostName the hostName value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    /**
+     * Get whether to pick host header should be picked from the host name of the backend server. Default value is false.
+     *
+     * @return the pickHostNameFromBackendAddress value
+     */
+    public Boolean pickHostNameFromBackendAddress() {
+        return this.pickHostNameFromBackendAddress;
+    }
+
+    /**
+     * Set whether to pick host header should be picked from the host name of the backend server. Default value is false.
+     *
+     * @param pickHostNameFromBackendAddress the pickHostNameFromBackendAddress value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withPickHostNameFromBackendAddress(Boolean pickHostNameFromBackendAddress) {
+        this.pickHostNameFromBackendAddress = pickHostNameFromBackendAddress;
+        return this;
+    }
+
+    /**
+     * Get cookie name to use for the affinity cookie.
+     *
+     * @return the affinityCookieName value
+     */
+    public String affinityCookieName() {
+        return this.affinityCookieName;
+    }
+
+    /**
+     * Set cookie name to use for the affinity cookie.
+     *
+     * @param affinityCookieName the affinityCookieName value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withAffinityCookieName(String affinityCookieName) {
+        this.affinityCookieName = affinityCookieName;
+        return this;
+    }
+
+    /**
+     * Get whether the probe is enabled. Default value is false.
+     *
+     * @return the probeEnabled value
+     */
+    public Boolean probeEnabled() {
+        return this.probeEnabled;
+    }
+
+    /**
+     * Set whether the probe is enabled. Default value is false.
+     *
+     * @param probeEnabled the probeEnabled value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withProbeEnabled(Boolean probeEnabled) {
+        this.probeEnabled = probeEnabled;
+        return this;
+    }
+
+    /**
+     * Get path which should be used as a prefix for all HTTP requests. Null means no path will be prefixed. Default value is null.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set path which should be used as a prefix for all HTTP requests. Null means no path will be prefixed. Default value is null.
+     *
+     * @param path the path value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the backend HTTP settings resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the backend http settings that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the backend http settings that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayConnectionDraining.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayConnectionDraining.java
new file mode 100644
index 000000000000..218fb95bc700
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayConnectionDraining.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Connection draining allows open connections to a backend server to be active
+ * for a specified time after the backend server got removed from the
+ * configuration.
+ */
+public class ApplicationGatewayConnectionDraining {
+    /**
+     * Whether connection draining is enabled or not.
+     */
+    @JsonProperty(value = "enabled", required = true)
+    private boolean enabled;
+
+    /**
+     * The number of seconds connection draining is active. Acceptable values
+     * are from 1 second to 3600 seconds.
+     */
+    @JsonProperty(value = "drainTimeoutInSec", required = true)
+    private int drainTimeoutInSec;
+
+    /**
+     * Get whether connection draining is enabled or not.
+     *
+     * @return the enabled value
+     */
+    public boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set whether connection draining is enabled or not.
+     *
+     * @param enabled the enabled value to set
+     * @return the ApplicationGatewayConnectionDraining object itself.
+     */
+    public ApplicationGatewayConnectionDraining withEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the number of seconds connection draining is active. Acceptable values are from 1 second to 3600 seconds.
+     *
+     * @return the drainTimeoutInSec value
+     */
+    public int drainTimeoutInSec() {
+        return this.drainTimeoutInSec;
+    }
+
+    /**
+     * Set the number of seconds connection draining is active. Acceptable values are from 1 second to 3600 seconds.
+     *
+     * @param drainTimeoutInSec the drainTimeoutInSec value to set
+     * @return the ApplicationGatewayConnectionDraining object itself.
+     */
+    public ApplicationGatewayConnectionDraining withDrainTimeoutInSec(int drainTimeoutInSec) {
+        this.drainTimeoutInSec = drainTimeoutInSec;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCookieBasedAffinity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCookieBasedAffinity.java
new file mode 100644
index 000000000000..dee4cf9ae2ca
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCookieBasedAffinity.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayCookieBasedAffinity.
+ */
+public final class ApplicationGatewayCookieBasedAffinity extends ExpandableStringEnum<ApplicationGatewayCookieBasedAffinity> {
+    /** Static value Enabled for ApplicationGatewayCookieBasedAffinity. */
+    public static final ApplicationGatewayCookieBasedAffinity ENABLED = fromString("Enabled");
+
+    /** Static value Disabled for ApplicationGatewayCookieBasedAffinity. */
+    public static final ApplicationGatewayCookieBasedAffinity DISABLED = fromString("Disabled");
+
+    /**
+     * Creates or finds a ApplicationGatewayCookieBasedAffinity from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayCookieBasedAffinity
+     */
+    @JsonCreator
+    public static ApplicationGatewayCookieBasedAffinity fromString(String name) {
+        return fromString(name, ApplicationGatewayCookieBasedAffinity.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayCookieBasedAffinity values
+     */
+    public static Collection<ApplicationGatewayCookieBasedAffinity> values() {
+        return values(ApplicationGatewayCookieBasedAffinity.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomError.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomError.java
new file mode 100644
index 000000000000..9298b77d0992
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomError.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Customer error of an application gateway.
+ */
+public class ApplicationGatewayCustomError {
+    /**
+     * Status code of the application gateway customer error. Possible values
+     * include: 'HttpStatus403', 'HttpStatus502'.
+     */
+    @JsonProperty(value = "statusCode")
+    private ApplicationGatewayCustomErrorStatusCode statusCode;
+
+    /**
+     * Error page URL of the application gateway customer error.
+     */
+    @JsonProperty(value = "customErrorPageUrl")
+    private String customErrorPageUrl;
+
+    /**
+     * Get status code of the application gateway customer error. Possible values include: 'HttpStatus403', 'HttpStatus502'.
+     *
+     * @return the statusCode value
+     */
+    public ApplicationGatewayCustomErrorStatusCode statusCode() {
+        return this.statusCode;
+    }
+
+    /**
+     * Set status code of the application gateway customer error. Possible values include: 'HttpStatus403', 'HttpStatus502'.
+     *
+     * @param statusCode the statusCode value to set
+     * @return the ApplicationGatewayCustomError object itself.
+     */
+    public ApplicationGatewayCustomError withStatusCode(ApplicationGatewayCustomErrorStatusCode statusCode) {
+        this.statusCode = statusCode;
+        return this;
+    }
+
+    /**
+     * Get error page URL of the application gateway customer error.
+     *
+     * @return the customErrorPageUrl value
+     */
+    public String customErrorPageUrl() {
+        return this.customErrorPageUrl;
+    }
+
+    /**
+     * Set error page URL of the application gateway customer error.
+     *
+     * @param customErrorPageUrl the customErrorPageUrl value to set
+     * @return the ApplicationGatewayCustomError object itself.
+     */
+    public ApplicationGatewayCustomError withCustomErrorPageUrl(String customErrorPageUrl) {
+        this.customErrorPageUrl = customErrorPageUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomErrorStatusCode.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomErrorStatusCode.java
new file mode 100644
index 000000000000..5a7ae782cb85
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayCustomErrorStatusCode.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayCustomErrorStatusCode.
+ */
+public final class ApplicationGatewayCustomErrorStatusCode extends ExpandableStringEnum<ApplicationGatewayCustomErrorStatusCode> {
+    /** Static value HttpStatus403 for ApplicationGatewayCustomErrorStatusCode. */
+    public static final ApplicationGatewayCustomErrorStatusCode HTTP_STATUS403 = fromString("HttpStatus403");
+
+    /** Static value HttpStatus502 for ApplicationGatewayCustomErrorStatusCode. */
+    public static final ApplicationGatewayCustomErrorStatusCode HTTP_STATUS502 = fromString("HttpStatus502");
+
+    /**
+     * Creates or finds a ApplicationGatewayCustomErrorStatusCode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayCustomErrorStatusCode
+     */
+    @JsonCreator
+    public static ApplicationGatewayCustomErrorStatusCode fromString(String name) {
+        return fromString(name, ApplicationGatewayCustomErrorStatusCode.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayCustomErrorStatusCode values
+     */
+    public static Collection<ApplicationGatewayCustomErrorStatusCode> values() {
+        return values(ApplicationGatewayCustomErrorStatusCode.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallDisabledRuleGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallDisabledRuleGroup.java
new file mode 100644
index 000000000000..fe19167600a2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallDisabledRuleGroup.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Allows to disable rules within a rule group or an entire rule group.
+ */
+public class ApplicationGatewayFirewallDisabledRuleGroup {
+    /**
+     * The name of the rule group that will be disabled.
+     */
+    @JsonProperty(value = "ruleGroupName", required = true)
+    private String ruleGroupName;
+
+    /**
+     * The list of rules that will be disabled. If null, all rules of the rule
+     * group will be disabled.
+     */
+    @JsonProperty(value = "rules")
+    private List<Integer> rules;
+
+    /**
+     * Get the name of the rule group that will be disabled.
+     *
+     * @return the ruleGroupName value
+     */
+    public String ruleGroupName() {
+        return this.ruleGroupName;
+    }
+
+    /**
+     * Set the name of the rule group that will be disabled.
+     *
+     * @param ruleGroupName the ruleGroupName value to set
+     * @return the ApplicationGatewayFirewallDisabledRuleGroup object itself.
+     */
+    public ApplicationGatewayFirewallDisabledRuleGroup withRuleGroupName(String ruleGroupName) {
+        this.ruleGroupName = ruleGroupName;
+        return this;
+    }
+
+    /**
+     * Get the list of rules that will be disabled. If null, all rules of the rule group will be disabled.
+     *
+     * @return the rules value
+     */
+    public List<Integer> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set the list of rules that will be disabled. If null, all rules of the rule group will be disabled.
+     *
+     * @param rules the rules value to set
+     * @return the ApplicationGatewayFirewallDisabledRuleGroup object itself.
+     */
+    public ApplicationGatewayFirewallDisabledRuleGroup withRules(List<Integer> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallExclusion.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallExclusion.java
new file mode 100644
index 000000000000..230a1d6e46d1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallExclusion.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Allow to exclude some variable satisfy the condition for the WAF check.
+ */
+public class ApplicationGatewayFirewallExclusion {
+    /**
+     * The variable to be excluded.
+     */
+    @JsonProperty(value = "matchVariable", required = true)
+    private String matchVariable;
+
+    /**
+     * When matchVariable is a collection, operate on the selector to specify
+     * which elements in the collection this exclusion applies to.
+     */
+    @JsonProperty(value = "selectorMatchOperator", required = true)
+    private String selectorMatchOperator;
+
+    /**
+     * When matchVariable is a collection, operator used to specify which
+     * elements in the collection this exclusion applies to.
+     */
+    @JsonProperty(value = "selector", required = true)
+    private String selector;
+
+    /**
+     * Get the variable to be excluded.
+     *
+     * @return the matchVariable value
+     */
+    public String matchVariable() {
+        return this.matchVariable;
+    }
+
+    /**
+     * Set the variable to be excluded.
+     *
+     * @param matchVariable the matchVariable value to set
+     * @return the ApplicationGatewayFirewallExclusion object itself.
+     */
+    public ApplicationGatewayFirewallExclusion withMatchVariable(String matchVariable) {
+        this.matchVariable = matchVariable;
+        return this;
+    }
+
+    /**
+     * Get when matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to.
+     *
+     * @return the selectorMatchOperator value
+     */
+    public String selectorMatchOperator() {
+        return this.selectorMatchOperator;
+    }
+
+    /**
+     * Set when matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to.
+     *
+     * @param selectorMatchOperator the selectorMatchOperator value to set
+     * @return the ApplicationGatewayFirewallExclusion object itself.
+     */
+    public ApplicationGatewayFirewallExclusion withSelectorMatchOperator(String selectorMatchOperator) {
+        this.selectorMatchOperator = selectorMatchOperator;
+        return this;
+    }
+
+    /**
+     * Get when matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to.
+     *
+     * @return the selector value
+     */
+    public String selector() {
+        return this.selector;
+    }
+
+    /**
+     * Set when matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to.
+     *
+     * @param selector the selector value to set
+     * @return the ApplicationGatewayFirewallExclusion object itself.
+     */
+    public ApplicationGatewayFirewallExclusion withSelector(String selector) {
+        this.selector = selector;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallMode.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallMode.java
new file mode 100644
index 000000000000..b554516a7f39
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallMode.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayFirewallMode.
+ */
+public final class ApplicationGatewayFirewallMode extends ExpandableStringEnum<ApplicationGatewayFirewallMode> {
+    /** Static value Detection for ApplicationGatewayFirewallMode. */
+    public static final ApplicationGatewayFirewallMode DETECTION = fromString("Detection");
+
+    /** Static value Prevention for ApplicationGatewayFirewallMode. */
+    public static final ApplicationGatewayFirewallMode PREVENTION = fromString("Prevention");
+
+    /**
+     * Creates or finds a ApplicationGatewayFirewallMode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayFirewallMode
+     */
+    @JsonCreator
+    public static ApplicationGatewayFirewallMode fromString(String name) {
+        return fromString(name, ApplicationGatewayFirewallMode.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayFirewallMode values
+     */
+    public static Collection<ApplicationGatewayFirewallMode> values() {
+        return values(ApplicationGatewayFirewallMode.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRule.java
new file mode 100644
index 000000000000..80e8ec838ebd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRule.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A web application firewall rule.
+ */
+public class ApplicationGatewayFirewallRule {
+    /**
+     * The identifier of the web application firewall rule.
+     */
+    @JsonProperty(value = "ruleId", required = true)
+    private int ruleId;
+
+    /**
+     * The description of the web application firewall rule.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Get the identifier of the web application firewall rule.
+     *
+     * @return the ruleId value
+     */
+    public int ruleId() {
+        return this.ruleId;
+    }
+
+    /**
+     * Set the identifier of the web application firewall rule.
+     *
+     * @param ruleId the ruleId value to set
+     * @return the ApplicationGatewayFirewallRule object itself.
+     */
+    public ApplicationGatewayFirewallRule withRuleId(int ruleId) {
+        this.ruleId = ruleId;
+        return this;
+    }
+
+    /**
+     * Get the description of the web application firewall rule.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the description of the web application firewall rule.
+     *
+     * @param description the description value to set
+     * @return the ApplicationGatewayFirewallRule object itself.
+     */
+    public ApplicationGatewayFirewallRule withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleGroup.java
new file mode 100644
index 000000000000..a466e1698801
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleGroup.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A web application firewall rule group.
+ */
+public class ApplicationGatewayFirewallRuleGroup {
+    /**
+     * The name of the web application firewall rule group.
+     */
+    @JsonProperty(value = "ruleGroupName", required = true)
+    private String ruleGroupName;
+
+    /**
+     * The description of the web application firewall rule group.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * The rules of the web application firewall rule group.
+     */
+    @JsonProperty(value = "rules", required = true)
+    private List<ApplicationGatewayFirewallRule> rules;
+
+    /**
+     * Get the name of the web application firewall rule group.
+     *
+     * @return the ruleGroupName value
+     */
+    public String ruleGroupName() {
+        return this.ruleGroupName;
+    }
+
+    /**
+     * Set the name of the web application firewall rule group.
+     *
+     * @param ruleGroupName the ruleGroupName value to set
+     * @return the ApplicationGatewayFirewallRuleGroup object itself.
+     */
+    public ApplicationGatewayFirewallRuleGroup withRuleGroupName(String ruleGroupName) {
+        this.ruleGroupName = ruleGroupName;
+        return this;
+    }
+
+    /**
+     * Get the description of the web application firewall rule group.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the description of the web application firewall rule group.
+     *
+     * @param description the description value to set
+     * @return the ApplicationGatewayFirewallRuleGroup object itself.
+     */
+    public ApplicationGatewayFirewallRuleGroup withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get the rules of the web application firewall rule group.
+     *
+     * @return the rules value
+     */
+    public List<ApplicationGatewayFirewallRule> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set the rules of the web application firewall rule group.
+     *
+     * @param rules the rules value to set
+     * @return the ApplicationGatewayFirewallRuleGroup object itself.
+     */
+    public ApplicationGatewayFirewallRuleGroup withRules(List<ApplicationGatewayFirewallRule> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleSet.java
new file mode 100644
index 000000000000..86769851f4f2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFirewallRuleSet.java
@@ -0,0 +1,143 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A web application firewall rule set.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ApplicationGatewayFirewallRuleSet extends Resource {
+    /**
+     * The provisioning state of the web application firewall rule set.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The type of the web application firewall rule set.
+     */
+    @JsonProperty(value = "properties.ruleSetType", required = true)
+    private String ruleSetType;
+
+    /**
+     * The version of the web application firewall rule set type.
+     */
+    @JsonProperty(value = "properties.ruleSetVersion", required = true)
+    private String ruleSetVersion;
+
+    /**
+     * The rule groups of the web application firewall rule set.
+     */
+    @JsonProperty(value = "properties.ruleGroups", required = true)
+    private List<ApplicationGatewayFirewallRuleGroup> ruleGroups;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the provisioning state of the web application firewall rule set. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the type of the web application firewall rule set.
+     *
+     * @return the ruleSetType value
+     */
+    public String ruleSetType() {
+        return this.ruleSetType;
+    }
+
+    /**
+     * Set the type of the web application firewall rule set.
+     *
+     * @param ruleSetType the ruleSetType value to set
+     * @return the ApplicationGatewayFirewallRuleSet object itself.
+     */
+    public ApplicationGatewayFirewallRuleSet withRuleSetType(String ruleSetType) {
+        this.ruleSetType = ruleSetType;
+        return this;
+    }
+
+    /**
+     * Get the version of the web application firewall rule set type.
+     *
+     * @return the ruleSetVersion value
+     */
+    public String ruleSetVersion() {
+        return this.ruleSetVersion;
+    }
+
+    /**
+     * Set the version of the web application firewall rule set type.
+     *
+     * @param ruleSetVersion the ruleSetVersion value to set
+     * @return the ApplicationGatewayFirewallRuleSet object itself.
+     */
+    public ApplicationGatewayFirewallRuleSet withRuleSetVersion(String ruleSetVersion) {
+        this.ruleSetVersion = ruleSetVersion;
+        return this;
+    }
+
+    /**
+     * Get the rule groups of the web application firewall rule set.
+     *
+     * @return the ruleGroups value
+     */
+    public List<ApplicationGatewayFirewallRuleGroup> ruleGroups() {
+        return this.ruleGroups;
+    }
+
+    /**
+     * Set the rule groups of the web application firewall rule set.
+     *
+     * @param ruleGroups the ruleGroups value to set
+     * @return the ApplicationGatewayFirewallRuleSet object itself.
+     */
+    public ApplicationGatewayFirewallRuleSet withRuleGroups(List<ApplicationGatewayFirewallRuleGroup> ruleGroups) {
+        this.ruleGroups = ruleGroups;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ApplicationGatewayFirewallRuleSet object itself.
+     */
+    public ApplicationGatewayFirewallRuleSet withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendIPConfiguration.java
new file mode 100644
index 000000000000..dc4a25205bfc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendIPConfiguration.java
@@ -0,0 +1,198 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Frontend IP configuration of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayFrontendIPConfiguration extends SubResource {
+    /**
+     * PrivateIPAddress of the network interface IP Configuration.
+     */
+    @JsonProperty(value = "properties.privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * The private IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * Reference to the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubResource subnet;
+
+    /**
+     * Reference to the PublicIP resource.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private SubResource publicIPAddress;
+
+    /**
+     * The provisioning state of the frontend IP configuration resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the frontend IP configuration that is unique within an
+     * Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get privateIPAddress of the network interface IP Configuration.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set privateIPAddress of the network interface IP Configuration.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the ApplicationGatewayFrontendIPConfiguration object itself.
+     */
+    public ApplicationGatewayFrontendIPConfiguration withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the ApplicationGatewayFrontendIPConfiguration object itself.
+     */
+    public ApplicationGatewayFrontendIPConfiguration withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get reference to the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set reference to the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the ApplicationGatewayFrontendIPConfiguration object itself.
+     */
+    public ApplicationGatewayFrontendIPConfiguration withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get reference to the PublicIP resource.
+     *
+     * @return the publicIPAddress value
+     */
+    public SubResource publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set reference to the PublicIP resource.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the ApplicationGatewayFrontendIPConfiguration object itself.
+     */
+    public ApplicationGatewayFrontendIPConfiguration withPublicIPAddress(SubResource publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the frontend IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the frontend IP configuration that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the frontend IP configuration that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayFrontendIPConfiguration object itself.
+     */
+    public ApplicationGatewayFrontendIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendPort.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendPort.java
new file mode 100644
index 000000000000..3de5585c29d0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayFrontendPort.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Frontend port of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayFrontendPort extends SubResource {
+    /**
+     * Frontend port.
+     */
+    @JsonProperty(value = "properties.port")
+    private Integer port;
+
+    /**
+     * The provisioning state of the frontend port resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the frontend port that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get frontend port.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set frontend port.
+     *
+     * @param port the port value to set
+     * @return the ApplicationGatewayFrontendPort object itself.
+     */
+    public ApplicationGatewayFrontendPort withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the frontend port resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the frontend port that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the frontend port that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayFrontendPort object itself.
+     */
+    public ApplicationGatewayFrontendPort withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHeaderConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHeaderConfiguration.java
new file mode 100644
index 000000000000..5104711292ee
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHeaderConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Header configuration of the Actions set in Application Gateway.
+ */
+public class ApplicationGatewayHeaderConfiguration {
+    /**
+     * Header name of the header configuration.
+     */
+    @JsonProperty(value = "headerName")
+    private String headerName;
+
+    /**
+     * Header value of the header configuration.
+     */
+    @JsonProperty(value = "headerValue")
+    private String headerValue;
+
+    /**
+     * Get header name of the header configuration.
+     *
+     * @return the headerName value
+     */
+    public String headerName() {
+        return this.headerName;
+    }
+
+    /**
+     * Set header name of the header configuration.
+     *
+     * @param headerName the headerName value to set
+     * @return the ApplicationGatewayHeaderConfiguration object itself.
+     */
+    public ApplicationGatewayHeaderConfiguration withHeaderName(String headerName) {
+        this.headerName = headerName;
+        return this;
+    }
+
+    /**
+     * Get header value of the header configuration.
+     *
+     * @return the headerValue value
+     */
+    public String headerValue() {
+        return this.headerValue;
+    }
+
+    /**
+     * Set header value of the header configuration.
+     *
+     * @param headerValue the headerValue value to set
+     * @return the ApplicationGatewayHeaderConfiguration object itself.
+     */
+    public ApplicationGatewayHeaderConfiguration withHeaderValue(String headerValue) {
+        this.headerValue = headerValue;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHttpListener.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHttpListener.java
new file mode 100644
index 000000000000..92c77313253e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayHttpListener.java
@@ -0,0 +1,328 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Http listener of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayHttpListener extends SubResource {
+    /**
+     * Frontend IP configuration resource of an application gateway.
+     */
+    @JsonProperty(value = "properties.frontendIPConfiguration")
+    private SubResource frontendIPConfiguration;
+
+    /**
+     * Frontend port resource of an application gateway.
+     */
+    @JsonProperty(value = "properties.frontendPort")
+    private SubResource frontendPort;
+
+    /**
+     * Protocol of the HTTP listener. Possible values include: 'Http', 'Https'.
+     */
+    @JsonProperty(value = "properties.protocol")
+    private ApplicationGatewayProtocol protocol;
+
+    /**
+     * Host name of HTTP listener.
+     */
+    @JsonProperty(value = "properties.hostName")
+    private String hostName;
+
+    /**
+     * SSL certificate resource of an application gateway.
+     */
+    @JsonProperty(value = "properties.sslCertificate")
+    private SubResource sslCertificate;
+
+    /**
+     * Applicable only if protocol is https. Enables SNI for multi-hosting.
+     */
+    @JsonProperty(value = "properties.requireServerNameIndication")
+    private Boolean requireServerNameIndication;
+
+    /**
+     * The provisioning state of the HTTP listener resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Custom error configurations of the HTTP listener.
+     */
+    @JsonProperty(value = "properties.customErrorConfigurations")
+    private List<ApplicationGatewayCustomError> customErrorConfigurations;
+
+    /**
+     * Reference to the FirewallPolicy resource.
+     */
+    @JsonProperty(value = "properties.firewallPolicy")
+    private SubResource firewallPolicy;
+
+    /**
+     * List of Host names for HTTP Listener that allows special wildcard
+     * characters as well.
+     */
+    @JsonProperty(value = "properties.hostNames")
+    private List<String> hostNames;
+
+    /**
+     * Name of the HTTP listener that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get frontend IP configuration resource of an application gateway.
+     *
+     * @return the frontendIPConfiguration value
+     */
+    public SubResource frontendIPConfiguration() {
+        return this.frontendIPConfiguration;
+    }
+
+    /**
+     * Set frontend IP configuration resource of an application gateway.
+     *
+     * @param frontendIPConfiguration the frontendIPConfiguration value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withFrontendIPConfiguration(SubResource frontendIPConfiguration) {
+        this.frontendIPConfiguration = frontendIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get frontend port resource of an application gateway.
+     *
+     * @return the frontendPort value
+     */
+    public SubResource frontendPort() {
+        return this.frontendPort;
+    }
+
+    /**
+     * Set frontend port resource of an application gateway.
+     *
+     * @param frontendPort the frontendPort value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withFrontendPort(SubResource frontendPort) {
+        this.frontendPort = frontendPort;
+        return this;
+    }
+
+    /**
+     * Get protocol of the HTTP listener. Possible values include: 'Http', 'Https'.
+     *
+     * @return the protocol value
+     */
+    public ApplicationGatewayProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set protocol of the HTTP listener. Possible values include: 'Http', 'Https'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withProtocol(ApplicationGatewayProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get host name of HTTP listener.
+     *
+     * @return the hostName value
+     */
+    public String hostName() {
+        return this.hostName;
+    }
+
+    /**
+     * Set host name of HTTP listener.
+     *
+     * @param hostName the hostName value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    /**
+     * Get sSL certificate resource of an application gateway.
+     *
+     * @return the sslCertificate value
+     */
+    public SubResource sslCertificate() {
+        return this.sslCertificate;
+    }
+
+    /**
+     * Set sSL certificate resource of an application gateway.
+     *
+     * @param sslCertificate the sslCertificate value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withSslCertificate(SubResource sslCertificate) {
+        this.sslCertificate = sslCertificate;
+        return this;
+    }
+
+    /**
+     * Get applicable only if protocol is https. Enables SNI for multi-hosting.
+     *
+     * @return the requireServerNameIndication value
+     */
+    public Boolean requireServerNameIndication() {
+        return this.requireServerNameIndication;
+    }
+
+    /**
+     * Set applicable only if protocol is https. Enables SNI for multi-hosting.
+     *
+     * @param requireServerNameIndication the requireServerNameIndication value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withRequireServerNameIndication(Boolean requireServerNameIndication) {
+        this.requireServerNameIndication = requireServerNameIndication;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the HTTP listener resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get custom error configurations of the HTTP listener.
+     *
+     * @return the customErrorConfigurations value
+     */
+    public List<ApplicationGatewayCustomError> customErrorConfigurations() {
+        return this.customErrorConfigurations;
+    }
+
+    /**
+     * Set custom error configurations of the HTTP listener.
+     *
+     * @param customErrorConfigurations the customErrorConfigurations value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withCustomErrorConfigurations(List<ApplicationGatewayCustomError> customErrorConfigurations) {
+        this.customErrorConfigurations = customErrorConfigurations;
+        return this;
+    }
+
+    /**
+     * Get reference to the FirewallPolicy resource.
+     *
+     * @return the firewallPolicy value
+     */
+    public SubResource firewallPolicy() {
+        return this.firewallPolicy;
+    }
+
+    /**
+     * Set reference to the FirewallPolicy resource.
+     *
+     * @param firewallPolicy the firewallPolicy value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withFirewallPolicy(SubResource firewallPolicy) {
+        this.firewallPolicy = firewallPolicy;
+        return this;
+    }
+
+    /**
+     * Get list of Host names for HTTP Listener that allows special wildcard characters as well.
+     *
+     * @return the hostNames value
+     */
+    public List<String> hostNames() {
+        return this.hostNames;
+    }
+
+    /**
+     * Set list of Host names for HTTP Listener that allows special wildcard characters as well.
+     *
+     * @param hostNames the hostNames value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withHostNames(List<String> hostNames) {
+        this.hostNames = hostNames;
+        return this;
+    }
+
+    /**
+     * Get name of the HTTP listener that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the HTTP listener that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayHttpListener object itself.
+     */
+    public ApplicationGatewayHttpListener withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayIPConfiguration.java
new file mode 100644
index 000000000000..4ac1d777a31e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayIPConfiguration.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * IP configuration of an application gateway. Currently 1 public and 1 private
+ * IP configuration is allowed.
+ */
+@JsonFlatten
+public class ApplicationGatewayIPConfiguration extends SubResource {
+    /**
+     * Reference to the subnet resource. A subnet from where application
+     * gateway gets its private address.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubResource subnet;
+
+    /**
+     * The provisioning state of the application gateway IP configuration
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the IP configuration that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get reference to the subnet resource. A subnet from where application gateway gets its private address.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set reference to the subnet resource. A subnet from where application gateway gets its private address.
+     *
+     * @param subnet the subnet value to set
+     * @return the ApplicationGatewayIPConfiguration object itself.
+     */
+    public ApplicationGatewayIPConfiguration withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the application gateway IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the IP configuration that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the IP configuration that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayIPConfiguration object itself.
+     */
+    public ApplicationGatewayIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOnDemandProbe.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOnDemandProbe.java
new file mode 100644
index 000000000000..39a402fb98f6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOnDemandProbe.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Details of on demand test probe request.
+ */
+public class ApplicationGatewayOnDemandProbe {
+    /**
+     * The protocol used for the probe. Possible values include: 'Http',
+     * 'Https'.
+     */
+    @JsonProperty(value = "protocol")
+    private ApplicationGatewayProtocol protocol;
+
+    /**
+     * Host name to send the probe to.
+     */
+    @JsonProperty(value = "host")
+    private String host;
+
+    /**
+     * Relative path of probe. Valid path starts from '/'. Probe is sent to
+     * &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * The probe timeout in seconds. Probe marked as failed if valid response
+     * is not received with this timeout period. Acceptable values are from 1
+     * second to 86400 seconds.
+     */
+    @JsonProperty(value = "timeout")
+    private Integer timeout;
+
+    /**
+     * Whether the host header should be picked from the backend http settings.
+     * Default value is false.
+     */
+    @JsonProperty(value = "pickHostNameFromBackendHttpSettings")
+    private Boolean pickHostNameFromBackendHttpSettings;
+
+    /**
+     * Criterion for classifying a healthy probe response.
+     */
+    @JsonProperty(value = "match")
+    private ApplicationGatewayProbeHealthResponseMatch match;
+
+    /**
+     * Reference to backend pool of application gateway to which probe request
+     * will be sent.
+     */
+    @JsonProperty(value = "backendAddressPool")
+    private SubResource backendAddressPool;
+
+    /**
+     * Reference to backend http setting of application gateway to be used for
+     * test probe.
+     */
+    @JsonProperty(value = "backendHttpSettings")
+    private SubResource backendHttpSettings;
+
+    /**
+     * Get the protocol used for the probe. Possible values include: 'Http', 'Https'.
+     *
+     * @return the protocol value
+     */
+    public ApplicationGatewayProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol used for the probe. Possible values include: 'Http', 'Https'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withProtocol(ApplicationGatewayProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get host name to send the probe to.
+     *
+     * @return the host value
+     */
+    public String host() {
+        return this.host;
+    }
+
+    /**
+     * Set host name to send the probe to.
+     *
+     * @param host the host value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withHost(String host) {
+        this.host = host;
+        return this;
+    }
+
+    /**
+     * Get relative path of probe. Valid path starts from '/'. Probe is sent to &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set relative path of probe. Valid path starts from '/'. Probe is sent to &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     *
+     * @param path the path value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @return the timeout value
+     */
+    public Integer timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @param timeout the timeout value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withTimeout(Integer timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
+    /**
+     * Get whether the host header should be picked from the backend http settings. Default value is false.
+     *
+     * @return the pickHostNameFromBackendHttpSettings value
+     */
+    public Boolean pickHostNameFromBackendHttpSettings() {
+        return this.pickHostNameFromBackendHttpSettings;
+    }
+
+    /**
+     * Set whether the host header should be picked from the backend http settings. Default value is false.
+     *
+     * @param pickHostNameFromBackendHttpSettings the pickHostNameFromBackendHttpSettings value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withPickHostNameFromBackendHttpSettings(Boolean pickHostNameFromBackendHttpSettings) {
+        this.pickHostNameFromBackendHttpSettings = pickHostNameFromBackendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get criterion for classifying a healthy probe response.
+     *
+     * @return the match value
+     */
+    public ApplicationGatewayProbeHealthResponseMatch match() {
+        return this.match;
+    }
+
+    /**
+     * Set criterion for classifying a healthy probe response.
+     *
+     * @param match the match value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withMatch(ApplicationGatewayProbeHealthResponseMatch match) {
+        this.match = match;
+        return this;
+    }
+
+    /**
+     * Get reference to backend pool of application gateway to which probe request will be sent.
+     *
+     * @return the backendAddressPool value
+     */
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set reference to backend pool of application gateway to which probe request will be sent.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get reference to backend http setting of application gateway to be used for test probe.
+     *
+     * @return the backendHttpSettings value
+     */
+    public SubResource backendHttpSettings() {
+        return this.backendHttpSettings;
+    }
+
+    /**
+     * Set reference to backend http setting of application gateway to be used for test probe.
+     *
+     * @param backendHttpSettings the backendHttpSettings value to set
+     * @return the ApplicationGatewayOnDemandProbe object itself.
+     */
+    public ApplicationGatewayOnDemandProbe withBackendHttpSettings(SubResource backendHttpSettings) {
+        this.backendHttpSettings = backendHttpSettings;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOperationalState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOperationalState.java
new file mode 100644
index 000000000000..922bcc35ac63
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayOperationalState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayOperationalState.
+ */
+public final class ApplicationGatewayOperationalState extends ExpandableStringEnum<ApplicationGatewayOperationalState> {
+    /** Static value Stopped for ApplicationGatewayOperationalState. */
+    public static final ApplicationGatewayOperationalState STOPPED = fromString("Stopped");
+
+    /** Static value Starting for ApplicationGatewayOperationalState. */
+    public static final ApplicationGatewayOperationalState STARTING = fromString("Starting");
+
+    /** Static value Running for ApplicationGatewayOperationalState. */
+    public static final ApplicationGatewayOperationalState RUNNING = fromString("Running");
+
+    /** Static value Stopping for ApplicationGatewayOperationalState. */
+    public static final ApplicationGatewayOperationalState STOPPING = fromString("Stopping");
+
+    /**
+     * Creates or finds a ApplicationGatewayOperationalState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayOperationalState
+     */
+    @JsonCreator
+    public static ApplicationGatewayOperationalState fromString(String name) {
+        return fromString(name, ApplicationGatewayOperationalState.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayOperationalState values
+     */
+    public static Collection<ApplicationGatewayOperationalState> values() {
+        return values(ApplicationGatewayOperationalState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayPathRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayPathRule.java
new file mode 100644
index 000000000000..c6b3986276f7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayPathRule.java
@@ -0,0 +1,249 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Path rule of URL path map of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayPathRule extends SubResource {
+    /**
+     * Path rules of URL path map.
+     */
+    @JsonProperty(value = "properties.paths")
+    private List<String> paths;
+
+    /**
+     * Backend address pool resource of URL path map path rule.
+     */
+    @JsonProperty(value = "properties.backendAddressPool")
+    private SubResource backendAddressPool;
+
+    /**
+     * Backend http settings resource of URL path map path rule.
+     */
+    @JsonProperty(value = "properties.backendHttpSettings")
+    private SubResource backendHttpSettings;
+
+    /**
+     * Redirect configuration resource of URL path map path rule.
+     */
+    @JsonProperty(value = "properties.redirectConfiguration")
+    private SubResource redirectConfiguration;
+
+    /**
+     * Rewrite rule set resource of URL path map path rule.
+     */
+    @JsonProperty(value = "properties.rewriteRuleSet")
+    private SubResource rewriteRuleSet;
+
+    /**
+     * The provisioning state of the path rule resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Reference to the FirewallPolicy resource.
+     */
+    @JsonProperty(value = "properties.firewallPolicy")
+    private SubResource firewallPolicy;
+
+    /**
+     * Name of the path rule that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get path rules of URL path map.
+     *
+     * @return the paths value
+     */
+    public List<String> paths() {
+        return this.paths;
+    }
+
+    /**
+     * Set path rules of URL path map.
+     *
+     * @param paths the paths value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withPaths(List<String> paths) {
+        this.paths = paths;
+        return this;
+    }
+
+    /**
+     * Get backend address pool resource of URL path map path rule.
+     *
+     * @return the backendAddressPool value
+     */
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set backend address pool resource of URL path map path rule.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get backend http settings resource of URL path map path rule.
+     *
+     * @return the backendHttpSettings value
+     */
+    public SubResource backendHttpSettings() {
+        return this.backendHttpSettings;
+    }
+
+    /**
+     * Set backend http settings resource of URL path map path rule.
+     *
+     * @param backendHttpSettings the backendHttpSettings value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withBackendHttpSettings(SubResource backendHttpSettings) {
+        this.backendHttpSettings = backendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get redirect configuration resource of URL path map path rule.
+     *
+     * @return the redirectConfiguration value
+     */
+    public SubResource redirectConfiguration() {
+        return this.redirectConfiguration;
+    }
+
+    /**
+     * Set redirect configuration resource of URL path map path rule.
+     *
+     * @param redirectConfiguration the redirectConfiguration value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withRedirectConfiguration(SubResource redirectConfiguration) {
+        this.redirectConfiguration = redirectConfiguration;
+        return this;
+    }
+
+    /**
+     * Get rewrite rule set resource of URL path map path rule.
+     *
+     * @return the rewriteRuleSet value
+     */
+    public SubResource rewriteRuleSet() {
+        return this.rewriteRuleSet;
+    }
+
+    /**
+     * Set rewrite rule set resource of URL path map path rule.
+     *
+     * @param rewriteRuleSet the rewriteRuleSet value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withRewriteRuleSet(SubResource rewriteRuleSet) {
+        this.rewriteRuleSet = rewriteRuleSet;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the path rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get reference to the FirewallPolicy resource.
+     *
+     * @return the firewallPolicy value
+     */
+    public SubResource firewallPolicy() {
+        return this.firewallPolicy;
+    }
+
+    /**
+     * Set reference to the FirewallPolicy resource.
+     *
+     * @param firewallPolicy the firewallPolicy value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withFirewallPolicy(SubResource firewallPolicy) {
+        this.firewallPolicy = firewallPolicy;
+        return this;
+    }
+
+    /**
+     * Get name of the path rule that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the path rule that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayPathRule object itself.
+     */
+    public ApplicationGatewayPathRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbe.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbe.java
new file mode 100644
index 000000000000..0d5166d4cf33
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbe.java
@@ -0,0 +1,365 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Probe of the application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayProbe extends SubResource {
+    /**
+     * The protocol used for the probe. Possible values include: 'Http',
+     * 'Https'.
+     */
+    @JsonProperty(value = "properties.protocol")
+    private ApplicationGatewayProtocol protocol;
+
+    /**
+     * Host name to send the probe to.
+     */
+    @JsonProperty(value = "properties.host")
+    private String host;
+
+    /**
+     * Relative path of probe. Valid path starts from '/'. Probe is sent to
+     * &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     */
+    @JsonProperty(value = "properties.path")
+    private String path;
+
+    /**
+     * The probing interval in seconds. This is the time interval between two
+     * consecutive probes. Acceptable values are from 1 second to 86400
+     * seconds.
+     */
+    @JsonProperty(value = "properties.interval")
+    private Integer interval;
+
+    /**
+     * The probe timeout in seconds. Probe marked as failed if valid response
+     * is not received with this timeout period. Acceptable values are from 1
+     * second to 86400 seconds.
+     */
+    @JsonProperty(value = "properties.timeout")
+    private Integer timeout;
+
+    /**
+     * The probe retry count. Backend server is marked down after consecutive
+     * probe failure count reaches UnhealthyThreshold. Acceptable values are
+     * from 1 second to 20.
+     */
+    @JsonProperty(value = "properties.unhealthyThreshold")
+    private Integer unhealthyThreshold;
+
+    /**
+     * Whether the host header should be picked from the backend http settings.
+     * Default value is false.
+     */
+    @JsonProperty(value = "properties.pickHostNameFromBackendHttpSettings")
+    private Boolean pickHostNameFromBackendHttpSettings;
+
+    /**
+     * Minimum number of servers that are always marked healthy. Default value
+     * is 0.
+     */
+    @JsonProperty(value = "properties.minServers")
+    private Integer minServers;
+
+    /**
+     * Criterion for classifying a healthy probe response.
+     */
+    @JsonProperty(value = "properties.match")
+    private ApplicationGatewayProbeHealthResponseMatch match;
+
+    /**
+     * The provisioning state of the probe resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Custom port which will be used for probing the backend servers. The
+     * valid value ranges from 1 to 65535. In case not set, port from http
+     * settings will be used. This property is valid for Standard_v2 and WAF_v2
+     * only.
+     */
+    @JsonProperty(value = "properties.port")
+    private Integer port;
+
+    /**
+     * Name of the probe that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the protocol used for the probe. Possible values include: 'Http', 'Https'.
+     *
+     * @return the protocol value
+     */
+    public ApplicationGatewayProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol used for the probe. Possible values include: 'Http', 'Https'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withProtocol(ApplicationGatewayProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get host name to send the probe to.
+     *
+     * @return the host value
+     */
+    public String host() {
+        return this.host;
+    }
+
+    /**
+     * Set host name to send the probe to.
+     *
+     * @param host the host value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withHost(String host) {
+        this.host = host;
+        return this;
+    }
+
+    /**
+     * Get relative path of probe. Valid path starts from '/'. Probe is sent to &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set relative path of probe. Valid path starts from '/'. Probe is sent to &lt;Protocol&gt;://&lt;host&gt;:&lt;port&gt;&lt;path&gt;.
+     *
+     * @param path the path value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the probing interval in seconds. This is the time interval between two consecutive probes. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @return the interval value
+     */
+    public Integer interval() {
+        return this.interval;
+    }
+
+    /**
+     * Set the probing interval in seconds. This is the time interval between two consecutive probes. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @param interval the interval value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withInterval(Integer interval) {
+        this.interval = interval;
+        return this;
+    }
+
+    /**
+     * Get the probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @return the timeout value
+     */
+    public Integer timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period. Acceptable values are from 1 second to 86400 seconds.
+     *
+     * @param timeout the timeout value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withTimeout(Integer timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
+    /**
+     * Get the probe retry count. Backend server is marked down after consecutive probe failure count reaches UnhealthyThreshold. Acceptable values are from 1 second to 20.
+     *
+     * @return the unhealthyThreshold value
+     */
+    public Integer unhealthyThreshold() {
+        return this.unhealthyThreshold;
+    }
+
+    /**
+     * Set the probe retry count. Backend server is marked down after consecutive probe failure count reaches UnhealthyThreshold. Acceptable values are from 1 second to 20.
+     *
+     * @param unhealthyThreshold the unhealthyThreshold value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withUnhealthyThreshold(Integer unhealthyThreshold) {
+        this.unhealthyThreshold = unhealthyThreshold;
+        return this;
+    }
+
+    /**
+     * Get whether the host header should be picked from the backend http settings. Default value is false.
+     *
+     * @return the pickHostNameFromBackendHttpSettings value
+     */
+    public Boolean pickHostNameFromBackendHttpSettings() {
+        return this.pickHostNameFromBackendHttpSettings;
+    }
+
+    /**
+     * Set whether the host header should be picked from the backend http settings. Default value is false.
+     *
+     * @param pickHostNameFromBackendHttpSettings the pickHostNameFromBackendHttpSettings value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withPickHostNameFromBackendHttpSettings(Boolean pickHostNameFromBackendHttpSettings) {
+        this.pickHostNameFromBackendHttpSettings = pickHostNameFromBackendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get minimum number of servers that are always marked healthy. Default value is 0.
+     *
+     * @return the minServers value
+     */
+    public Integer minServers() {
+        return this.minServers;
+    }
+
+    /**
+     * Set minimum number of servers that are always marked healthy. Default value is 0.
+     *
+     * @param minServers the minServers value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withMinServers(Integer minServers) {
+        this.minServers = minServers;
+        return this;
+    }
+
+    /**
+     * Get criterion for classifying a healthy probe response.
+     *
+     * @return the match value
+     */
+    public ApplicationGatewayProbeHealthResponseMatch match() {
+        return this.match;
+    }
+
+    /**
+     * Set criterion for classifying a healthy probe response.
+     *
+     * @param match the match value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withMatch(ApplicationGatewayProbeHealthResponseMatch match) {
+        this.match = match;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the probe resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get custom port which will be used for probing the backend servers. The valid value ranges from 1 to 65535. In case not set, port from http settings will be used. This property is valid for Standard_v2 and WAF_v2 only.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set custom port which will be used for probing the backend servers. The valid value ranges from 1 to 65535. In case not set, port from http settings will be used. This property is valid for Standard_v2 and WAF_v2 only.
+     *
+     * @param port the port value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get name of the probe that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the probe that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayProbe object itself.
+     */
+    public ApplicationGatewayProbe withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbeHealthResponseMatch.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbeHealthResponseMatch.java
new file mode 100644
index 000000000000..a8c649122b74
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProbeHealthResponseMatch.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application gateway probe health response match.
+ */
+public class ApplicationGatewayProbeHealthResponseMatch {
+    /**
+     * Body that must be contained in the health response. Default value is
+     * empty.
+     */
+    @JsonProperty(value = "body")
+    private String body;
+
+    /**
+     * Allowed ranges of healthy status codes. Default range of healthy status
+     * codes is 200-399.
+     */
+    @JsonProperty(value = "statusCodes")
+    private List<String> statusCodes;
+
+    /**
+     * Get body that must be contained in the health response. Default value is empty.
+     *
+     * @return the body value
+     */
+    public String body() {
+        return this.body;
+    }
+
+    /**
+     * Set body that must be contained in the health response. Default value is empty.
+     *
+     * @param body the body value to set
+     * @return the ApplicationGatewayProbeHealthResponseMatch object itself.
+     */
+    public ApplicationGatewayProbeHealthResponseMatch withBody(String body) {
+        this.body = body;
+        return this;
+    }
+
+    /**
+     * Get allowed ranges of healthy status codes. Default range of healthy status codes is 200-399.
+     *
+     * @return the statusCodes value
+     */
+    public List<String> statusCodes() {
+        return this.statusCodes;
+    }
+
+    /**
+     * Set allowed ranges of healthy status codes. Default range of healthy status codes is 200-399.
+     *
+     * @param statusCodes the statusCodes value to set
+     * @return the ApplicationGatewayProbeHealthResponseMatch object itself.
+     */
+    public ApplicationGatewayProbeHealthResponseMatch withStatusCodes(List<String> statusCodes) {
+        this.statusCodes = statusCodes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProtocol.java
new file mode 100644
index 000000000000..7a0a61c5439b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayProtocol.
+ */
+public final class ApplicationGatewayProtocol extends ExpandableStringEnum<ApplicationGatewayProtocol> {
+    /** Static value Http for ApplicationGatewayProtocol. */
+    public static final ApplicationGatewayProtocol HTTP = fromString("Http");
+
+    /** Static value Https for ApplicationGatewayProtocol. */
+    public static final ApplicationGatewayProtocol HTTPS = fromString("Https");
+
+    /**
+     * Creates or finds a ApplicationGatewayProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayProtocol
+     */
+    @JsonCreator
+    public static ApplicationGatewayProtocol fromString(String name) {
+        return fromString(name, ApplicationGatewayProtocol.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayProtocol values
+     */
+    public static Collection<ApplicationGatewayProtocol> values() {
+        return values(ApplicationGatewayProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectConfiguration.java
new file mode 100644
index 000000000000..853cef93a771
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectConfiguration.java
@@ -0,0 +1,287 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Redirect configuration of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayRedirectConfiguration extends SubResource {
+    /**
+     * HTTP redirection type. Possible values include: 'Permanent', 'Found',
+     * 'SeeOther', 'Temporary'.
+     */
+    @JsonProperty(value = "properties.redirectType")
+    private ApplicationGatewayRedirectType redirectType;
+
+    /**
+     * Reference to a listener to redirect the request to.
+     */
+    @JsonProperty(value = "properties.targetListener")
+    private SubResource targetListener;
+
+    /**
+     * Url to redirect the request to.
+     */
+    @JsonProperty(value = "properties.targetUrl")
+    private String targetUrl;
+
+    /**
+     * Include path in the redirected url.
+     */
+    @JsonProperty(value = "properties.includePath")
+    private Boolean includePath;
+
+    /**
+     * Include query string in the redirected url.
+     */
+    @JsonProperty(value = "properties.includeQueryString")
+    private Boolean includeQueryString;
+
+    /**
+     * Request routing specifying redirect configuration.
+     */
+    @JsonProperty(value = "properties.requestRoutingRules")
+    private List<SubResource> requestRoutingRules;
+
+    /**
+     * Url path maps specifying default redirect configuration.
+     */
+    @JsonProperty(value = "properties.urlPathMaps")
+    private List<SubResource> urlPathMaps;
+
+    /**
+     * Path rules specifying redirect configuration.
+     */
+    @JsonProperty(value = "properties.pathRules")
+    private List<SubResource> pathRules;
+
+    /**
+     * Name of the redirect configuration that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get hTTP redirection type. Possible values include: 'Permanent', 'Found', 'SeeOther', 'Temporary'.
+     *
+     * @return the redirectType value
+     */
+    public ApplicationGatewayRedirectType redirectType() {
+        return this.redirectType;
+    }
+
+    /**
+     * Set hTTP redirection type. Possible values include: 'Permanent', 'Found', 'SeeOther', 'Temporary'.
+     *
+     * @param redirectType the redirectType value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withRedirectType(ApplicationGatewayRedirectType redirectType) {
+        this.redirectType = redirectType;
+        return this;
+    }
+
+    /**
+     * Get reference to a listener to redirect the request to.
+     *
+     * @return the targetListener value
+     */
+    public SubResource targetListener() {
+        return this.targetListener;
+    }
+
+    /**
+     * Set reference to a listener to redirect the request to.
+     *
+     * @param targetListener the targetListener value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withTargetListener(SubResource targetListener) {
+        this.targetListener = targetListener;
+        return this;
+    }
+
+    /**
+     * Get url to redirect the request to.
+     *
+     * @return the targetUrl value
+     */
+    public String targetUrl() {
+        return this.targetUrl;
+    }
+
+    /**
+     * Set url to redirect the request to.
+     *
+     * @param targetUrl the targetUrl value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withTargetUrl(String targetUrl) {
+        this.targetUrl = targetUrl;
+        return this;
+    }
+
+    /**
+     * Get include path in the redirected url.
+     *
+     * @return the includePath value
+     */
+    public Boolean includePath() {
+        return this.includePath;
+    }
+
+    /**
+     * Set include path in the redirected url.
+     *
+     * @param includePath the includePath value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withIncludePath(Boolean includePath) {
+        this.includePath = includePath;
+        return this;
+    }
+
+    /**
+     * Get include query string in the redirected url.
+     *
+     * @return the includeQueryString value
+     */
+    public Boolean includeQueryString() {
+        return this.includeQueryString;
+    }
+
+    /**
+     * Set include query string in the redirected url.
+     *
+     * @param includeQueryString the includeQueryString value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withIncludeQueryString(Boolean includeQueryString) {
+        this.includeQueryString = includeQueryString;
+        return this;
+    }
+
+    /**
+     * Get request routing specifying redirect configuration.
+     *
+     * @return the requestRoutingRules value
+     */
+    public List<SubResource> requestRoutingRules() {
+        return this.requestRoutingRules;
+    }
+
+    /**
+     * Set request routing specifying redirect configuration.
+     *
+     * @param requestRoutingRules the requestRoutingRules value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withRequestRoutingRules(List<SubResource> requestRoutingRules) {
+        this.requestRoutingRules = requestRoutingRules;
+        return this;
+    }
+
+    /**
+     * Get url path maps specifying default redirect configuration.
+     *
+     * @return the urlPathMaps value
+     */
+    public List<SubResource> urlPathMaps() {
+        return this.urlPathMaps;
+    }
+
+    /**
+     * Set url path maps specifying default redirect configuration.
+     *
+     * @param urlPathMaps the urlPathMaps value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withUrlPathMaps(List<SubResource> urlPathMaps) {
+        this.urlPathMaps = urlPathMaps;
+        return this;
+    }
+
+    /**
+     * Get path rules specifying redirect configuration.
+     *
+     * @return the pathRules value
+     */
+    public List<SubResource> pathRules() {
+        return this.pathRules;
+    }
+
+    /**
+     * Set path rules specifying redirect configuration.
+     *
+     * @param pathRules the pathRules value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withPathRules(List<SubResource> pathRules) {
+        this.pathRules = pathRules;
+        return this;
+    }
+
+    /**
+     * Get name of the redirect configuration that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the redirect configuration that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayRedirectConfiguration object itself.
+     */
+    public ApplicationGatewayRedirectConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectType.java
new file mode 100644
index 000000000000..41aca0b2ddec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRedirectType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayRedirectType.
+ */
+public final class ApplicationGatewayRedirectType extends ExpandableStringEnum<ApplicationGatewayRedirectType> {
+    /** Static value Permanent for ApplicationGatewayRedirectType. */
+    public static final ApplicationGatewayRedirectType PERMANENT = fromString("Permanent");
+
+    /** Static value Found for ApplicationGatewayRedirectType. */
+    public static final ApplicationGatewayRedirectType FOUND = fromString("Found");
+
+    /** Static value SeeOther for ApplicationGatewayRedirectType. */
+    public static final ApplicationGatewayRedirectType SEE_OTHER = fromString("SeeOther");
+
+    /** Static value Temporary for ApplicationGatewayRedirectType. */
+    public static final ApplicationGatewayRedirectType TEMPORARY = fromString("Temporary");
+
+    /**
+     * Creates or finds a ApplicationGatewayRedirectType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayRedirectType
+     */
+    @JsonCreator
+    public static ApplicationGatewayRedirectType fromString(String name) {
+        return fromString(name, ApplicationGatewayRedirectType.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayRedirectType values
+     */
+    public static Collection<ApplicationGatewayRedirectType> values() {
+        return values(ApplicationGatewayRedirectType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRule.java
new file mode 100644
index 000000000000..b09d77a78ed4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRule.java
@@ -0,0 +1,301 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Request routing rule of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayRequestRoutingRule extends SubResource {
+    /**
+     * Rule type. Possible values include: 'Basic', 'PathBasedRouting'.
+     */
+    @JsonProperty(value = "properties.ruleType")
+    private ApplicationGatewayRequestRoutingRuleType ruleType;
+
+    /**
+     * Priority of the request routing rule.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * Backend address pool resource of the application gateway.
+     */
+    @JsonProperty(value = "properties.backendAddressPool")
+    private SubResource backendAddressPool;
+
+    /**
+     * Backend http settings resource of the application gateway.
+     */
+    @JsonProperty(value = "properties.backendHttpSettings")
+    private SubResource backendHttpSettings;
+
+    /**
+     * Http listener resource of the application gateway.
+     */
+    @JsonProperty(value = "properties.httpListener")
+    private SubResource httpListener;
+
+    /**
+     * URL path map resource of the application gateway.
+     */
+    @JsonProperty(value = "properties.urlPathMap")
+    private SubResource urlPathMap;
+
+    /**
+     * Rewrite Rule Set resource in Basic rule of the application gateway.
+     */
+    @JsonProperty(value = "properties.rewriteRuleSet")
+    private SubResource rewriteRuleSet;
+
+    /**
+     * Redirect configuration resource of the application gateway.
+     */
+    @JsonProperty(value = "properties.redirectConfiguration")
+    private SubResource redirectConfiguration;
+
+    /**
+     * The provisioning state of the request routing rule resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the request routing rule that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get rule type. Possible values include: 'Basic', 'PathBasedRouting'.
+     *
+     * @return the ruleType value
+     */
+    public ApplicationGatewayRequestRoutingRuleType ruleType() {
+        return this.ruleType;
+    }
+
+    /**
+     * Set rule type. Possible values include: 'Basic', 'PathBasedRouting'.
+     *
+     * @param ruleType the ruleType value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withRuleType(ApplicationGatewayRequestRoutingRuleType ruleType) {
+        this.ruleType = ruleType;
+        return this;
+    }
+
+    /**
+     * Get priority of the request routing rule.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the request routing rule.
+     *
+     * @param priority the priority value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get backend address pool resource of the application gateway.
+     *
+     * @return the backendAddressPool value
+     */
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set backend address pool resource of the application gateway.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get backend http settings resource of the application gateway.
+     *
+     * @return the backendHttpSettings value
+     */
+    public SubResource backendHttpSettings() {
+        return this.backendHttpSettings;
+    }
+
+    /**
+     * Set backend http settings resource of the application gateway.
+     *
+     * @param backendHttpSettings the backendHttpSettings value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withBackendHttpSettings(SubResource backendHttpSettings) {
+        this.backendHttpSettings = backendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get http listener resource of the application gateway.
+     *
+     * @return the httpListener value
+     */
+    public SubResource httpListener() {
+        return this.httpListener;
+    }
+
+    /**
+     * Set http listener resource of the application gateway.
+     *
+     * @param httpListener the httpListener value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withHttpListener(SubResource httpListener) {
+        this.httpListener = httpListener;
+        return this;
+    }
+
+    /**
+     * Get uRL path map resource of the application gateway.
+     *
+     * @return the urlPathMap value
+     */
+    public SubResource urlPathMap() {
+        return this.urlPathMap;
+    }
+
+    /**
+     * Set uRL path map resource of the application gateway.
+     *
+     * @param urlPathMap the urlPathMap value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withUrlPathMap(SubResource urlPathMap) {
+        this.urlPathMap = urlPathMap;
+        return this;
+    }
+
+    /**
+     * Get rewrite Rule Set resource in Basic rule of the application gateway.
+     *
+     * @return the rewriteRuleSet value
+     */
+    public SubResource rewriteRuleSet() {
+        return this.rewriteRuleSet;
+    }
+
+    /**
+     * Set rewrite Rule Set resource in Basic rule of the application gateway.
+     *
+     * @param rewriteRuleSet the rewriteRuleSet value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withRewriteRuleSet(SubResource rewriteRuleSet) {
+        this.rewriteRuleSet = rewriteRuleSet;
+        return this;
+    }
+
+    /**
+     * Get redirect configuration resource of the application gateway.
+     *
+     * @return the redirectConfiguration value
+     */
+    public SubResource redirectConfiguration() {
+        return this.redirectConfiguration;
+    }
+
+    /**
+     * Set redirect configuration resource of the application gateway.
+     *
+     * @param redirectConfiguration the redirectConfiguration value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withRedirectConfiguration(SubResource redirectConfiguration) {
+        this.redirectConfiguration = redirectConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the request routing rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the request routing rule that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the request routing rule that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayRequestRoutingRule object itself.
+     */
+    public ApplicationGatewayRequestRoutingRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRuleType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRuleType.java
new file mode 100644
index 000000000000..3307eb4b945f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRequestRoutingRuleType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayRequestRoutingRuleType.
+ */
+public final class ApplicationGatewayRequestRoutingRuleType extends ExpandableStringEnum<ApplicationGatewayRequestRoutingRuleType> {
+    /** Static value Basic for ApplicationGatewayRequestRoutingRuleType. */
+    public static final ApplicationGatewayRequestRoutingRuleType BASIC = fromString("Basic");
+
+    /** Static value PathBasedRouting for ApplicationGatewayRequestRoutingRuleType. */
+    public static final ApplicationGatewayRequestRoutingRuleType PATH_BASED_ROUTING = fromString("PathBasedRouting");
+
+    /**
+     * Creates or finds a ApplicationGatewayRequestRoutingRuleType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayRequestRoutingRuleType
+     */
+    @JsonCreator
+    public static ApplicationGatewayRequestRoutingRuleType fromString(String name) {
+        return fromString(name, ApplicationGatewayRequestRoutingRuleType.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayRequestRoutingRuleType values
+     */
+    public static Collection<ApplicationGatewayRequestRoutingRuleType> values() {
+        return values(ApplicationGatewayRequestRoutingRuleType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRule.java
new file mode 100644
index 000000000000..c3cd6b1581e4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRule.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Rewrite rule of an application gateway.
+ */
+public class ApplicationGatewayRewriteRule {
+    /**
+     * Name of the rewrite rule that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Rule Sequence of the rewrite rule that determines the order of execution
+     * of a particular rule in a RewriteRuleSet.
+     */
+    @JsonProperty(value = "ruleSequence")
+    private Integer ruleSequence;
+
+    /**
+     * Conditions based on which the action set execution will be evaluated.
+     */
+    @JsonProperty(value = "conditions")
+    private List<ApplicationGatewayRewriteRuleCondition> conditions;
+
+    /**
+     * Set of actions to be done as part of the rewrite Rule.
+     */
+    @JsonProperty(value = "actionSet")
+    private ApplicationGatewayRewriteRuleActionSet actionSet;
+
+    /**
+     * Get name of the rewrite rule that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the rewrite rule that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayRewriteRule object itself.
+     */
+    public ApplicationGatewayRewriteRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get rule Sequence of the rewrite rule that determines the order of execution of a particular rule in a RewriteRuleSet.
+     *
+     * @return the ruleSequence value
+     */
+    public Integer ruleSequence() {
+        return this.ruleSequence;
+    }
+
+    /**
+     * Set rule Sequence of the rewrite rule that determines the order of execution of a particular rule in a RewriteRuleSet.
+     *
+     * @param ruleSequence the ruleSequence value to set
+     * @return the ApplicationGatewayRewriteRule object itself.
+     */
+    public ApplicationGatewayRewriteRule withRuleSequence(Integer ruleSequence) {
+        this.ruleSequence = ruleSequence;
+        return this;
+    }
+
+    /**
+     * Get conditions based on which the action set execution will be evaluated.
+     *
+     * @return the conditions value
+     */
+    public List<ApplicationGatewayRewriteRuleCondition> conditions() {
+        return this.conditions;
+    }
+
+    /**
+     * Set conditions based on which the action set execution will be evaluated.
+     *
+     * @param conditions the conditions value to set
+     * @return the ApplicationGatewayRewriteRule object itself.
+     */
+    public ApplicationGatewayRewriteRule withConditions(List<ApplicationGatewayRewriteRuleCondition> conditions) {
+        this.conditions = conditions;
+        return this;
+    }
+
+    /**
+     * Get set of actions to be done as part of the rewrite Rule.
+     *
+     * @return the actionSet value
+     */
+    public ApplicationGatewayRewriteRuleActionSet actionSet() {
+        return this.actionSet;
+    }
+
+    /**
+     * Set set of actions to be done as part of the rewrite Rule.
+     *
+     * @param actionSet the actionSet value to set
+     * @return the ApplicationGatewayRewriteRule object itself.
+     */
+    public ApplicationGatewayRewriteRule withActionSet(ApplicationGatewayRewriteRuleActionSet actionSet) {
+        this.actionSet = actionSet;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleActionSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleActionSet.java
new file mode 100644
index 000000000000..c0a8eb336902
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleActionSet.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Set of actions in the Rewrite Rule in Application Gateway.
+ */
+public class ApplicationGatewayRewriteRuleActionSet {
+    /**
+     * Request Header Actions in the Action Set.
+     */
+    @JsonProperty(value = "requestHeaderConfigurations")
+    private List<ApplicationGatewayHeaderConfiguration> requestHeaderConfigurations;
+
+    /**
+     * Response Header Actions in the Action Set.
+     */
+    @JsonProperty(value = "responseHeaderConfigurations")
+    private List<ApplicationGatewayHeaderConfiguration> responseHeaderConfigurations;
+
+    /**
+     * Url Configuration Action in the Action Set.
+     */
+    @JsonProperty(value = "urlConfiguration")
+    private ApplicationGatewayUrlConfiguration urlConfiguration;
+
+    /**
+     * Get request Header Actions in the Action Set.
+     *
+     * @return the requestHeaderConfigurations value
+     */
+    public List<ApplicationGatewayHeaderConfiguration> requestHeaderConfigurations() {
+        return this.requestHeaderConfigurations;
+    }
+
+    /**
+     * Set request Header Actions in the Action Set.
+     *
+     * @param requestHeaderConfigurations the requestHeaderConfigurations value to set
+     * @return the ApplicationGatewayRewriteRuleActionSet object itself.
+     */
+    public ApplicationGatewayRewriteRuleActionSet withRequestHeaderConfigurations(List<ApplicationGatewayHeaderConfiguration> requestHeaderConfigurations) {
+        this.requestHeaderConfigurations = requestHeaderConfigurations;
+        return this;
+    }
+
+    /**
+     * Get response Header Actions in the Action Set.
+     *
+     * @return the responseHeaderConfigurations value
+     */
+    public List<ApplicationGatewayHeaderConfiguration> responseHeaderConfigurations() {
+        return this.responseHeaderConfigurations;
+    }
+
+    /**
+     * Set response Header Actions in the Action Set.
+     *
+     * @param responseHeaderConfigurations the responseHeaderConfigurations value to set
+     * @return the ApplicationGatewayRewriteRuleActionSet object itself.
+     */
+    public ApplicationGatewayRewriteRuleActionSet withResponseHeaderConfigurations(List<ApplicationGatewayHeaderConfiguration> responseHeaderConfigurations) {
+        this.responseHeaderConfigurations = responseHeaderConfigurations;
+        return this;
+    }
+
+    /**
+     * Get url Configuration Action in the Action Set.
+     *
+     * @return the urlConfiguration value
+     */
+    public ApplicationGatewayUrlConfiguration urlConfiguration() {
+        return this.urlConfiguration;
+    }
+
+    /**
+     * Set url Configuration Action in the Action Set.
+     *
+     * @param urlConfiguration the urlConfiguration value to set
+     * @return the ApplicationGatewayRewriteRuleActionSet object itself.
+     */
+    public ApplicationGatewayRewriteRuleActionSet withUrlConfiguration(ApplicationGatewayUrlConfiguration urlConfiguration) {
+        this.urlConfiguration = urlConfiguration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleCondition.java
new file mode 100644
index 000000000000..478920c38269
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleCondition.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Set of conditions in the Rewrite Rule in Application Gateway.
+ */
+public class ApplicationGatewayRewriteRuleCondition {
+    /**
+     * The condition parameter of the RewriteRuleCondition.
+     */
+    @JsonProperty(value = "variable")
+    private String variable;
+
+    /**
+     * The pattern, either fixed string or regular expression, that evaluates
+     * the truthfulness of the condition.
+     */
+    @JsonProperty(value = "pattern")
+    private String pattern;
+
+    /**
+     * Setting this paramter to truth value with force the pattern to do a case
+     * in-sensitive comparison.
+     */
+    @JsonProperty(value = "ignoreCase")
+    private Boolean ignoreCase;
+
+    /**
+     * Setting this value as truth will force to check the negation of the
+     * condition given by the user.
+     */
+    @JsonProperty(value = "negate")
+    private Boolean negate;
+
+    /**
+     * Get the condition parameter of the RewriteRuleCondition.
+     *
+     * @return the variable value
+     */
+    public String variable() {
+        return this.variable;
+    }
+
+    /**
+     * Set the condition parameter of the RewriteRuleCondition.
+     *
+     * @param variable the variable value to set
+     * @return the ApplicationGatewayRewriteRuleCondition object itself.
+     */
+    public ApplicationGatewayRewriteRuleCondition withVariable(String variable) {
+        this.variable = variable;
+        return this;
+    }
+
+    /**
+     * Get the pattern, either fixed string or regular expression, that evaluates the truthfulness of the condition.
+     *
+     * @return the pattern value
+     */
+    public String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * Set the pattern, either fixed string or regular expression, that evaluates the truthfulness of the condition.
+     *
+     * @param pattern the pattern value to set
+     * @return the ApplicationGatewayRewriteRuleCondition object itself.
+     */
+    public ApplicationGatewayRewriteRuleCondition withPattern(String pattern) {
+        this.pattern = pattern;
+        return this;
+    }
+
+    /**
+     * Get setting this paramter to truth value with force the pattern to do a case in-sensitive comparison.
+     *
+     * @return the ignoreCase value
+     */
+    public Boolean ignoreCase() {
+        return this.ignoreCase;
+    }
+
+    /**
+     * Set setting this paramter to truth value with force the pattern to do a case in-sensitive comparison.
+     *
+     * @param ignoreCase the ignoreCase value to set
+     * @return the ApplicationGatewayRewriteRuleCondition object itself.
+     */
+    public ApplicationGatewayRewriteRuleCondition withIgnoreCase(Boolean ignoreCase) {
+        this.ignoreCase = ignoreCase;
+        return this;
+    }
+
+    /**
+     * Get setting this value as truth will force to check the negation of the condition given by the user.
+     *
+     * @return the negate value
+     */
+    public Boolean negate() {
+        return this.negate;
+    }
+
+    /**
+     * Set setting this value as truth will force to check the negation of the condition given by the user.
+     *
+     * @param negate the negate value to set
+     * @return the ApplicationGatewayRewriteRuleCondition object itself.
+     */
+    public ApplicationGatewayRewriteRuleCondition withNegate(Boolean negate) {
+        this.negate = negate;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleSet.java
new file mode 100644
index 000000000000..61a13dccd305
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayRewriteRuleSet.java
@@ -0,0 +1,105 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Rewrite rule set of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayRewriteRuleSet extends SubResource {
+    /**
+     * Rewrite rules in the rewrite rule set.
+     */
+    @JsonProperty(value = "properties.rewriteRules")
+    private List<ApplicationGatewayRewriteRule> rewriteRules;
+
+    /**
+     * The provisioning state of the rewrite rule set resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the rewrite rule set that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get rewrite rules in the rewrite rule set.
+     *
+     * @return the rewriteRules value
+     */
+    public List<ApplicationGatewayRewriteRule> rewriteRules() {
+        return this.rewriteRules;
+    }
+
+    /**
+     * Set rewrite rules in the rewrite rule set.
+     *
+     * @param rewriteRules the rewriteRules value to set
+     * @return the ApplicationGatewayRewriteRuleSet object itself.
+     */
+    public ApplicationGatewayRewriteRuleSet withRewriteRules(List<ApplicationGatewayRewriteRule> rewriteRules) {
+        this.rewriteRules = rewriteRules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the rewrite rule set resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the rewrite rule set that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the rewrite rule set that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayRewriteRuleSet object itself.
+     */
+    public ApplicationGatewayRewriteRuleSet withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySku.java
new file mode 100644
index 000000000000..b59a8ee7b639
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of an application gateway.
+ */
+public class ApplicationGatewaySku {
+    /**
+     * Name of an application gateway SKU. Possible values include:
+     * 'Standard_Small', 'Standard_Medium', 'Standard_Large', 'WAF_Medium',
+     * 'WAF_Large', 'Standard_v2', 'WAF_v2'.
+     */
+    @JsonProperty(value = "name")
+    private ApplicationGatewaySkuName name;
+
+    /**
+     * Tier of an application gateway. Possible values include: 'Standard',
+     * 'WAF', 'Standard_v2', 'WAF_v2'.
+     */
+    @JsonProperty(value = "tier")
+    private ApplicationGatewayTier tier;
+
+    /**
+     * Capacity (instance count) of an application gateway.
+     */
+    @JsonProperty(value = "capacity")
+    private Integer capacity;
+
+    /**
+     * Get name of an application gateway SKU. Possible values include: 'Standard_Small', 'Standard_Medium', 'Standard_Large', 'WAF_Medium', 'WAF_Large', 'Standard_v2', 'WAF_v2'.
+     *
+     * @return the name value
+     */
+    public ApplicationGatewaySkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of an application gateway SKU. Possible values include: 'Standard_Small', 'Standard_Medium', 'Standard_Large', 'WAF_Medium', 'WAF_Large', 'Standard_v2', 'WAF_v2'.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewaySku object itself.
+     */
+    public ApplicationGatewaySku withName(ApplicationGatewaySkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get tier of an application gateway. Possible values include: 'Standard', 'WAF', 'Standard_v2', 'WAF_v2'.
+     *
+     * @return the tier value
+     */
+    public ApplicationGatewayTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set tier of an application gateway. Possible values include: 'Standard', 'WAF', 'Standard_v2', 'WAF_v2'.
+     *
+     * @param tier the tier value to set
+     * @return the ApplicationGatewaySku object itself.
+     */
+    public ApplicationGatewaySku withTier(ApplicationGatewayTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get capacity (instance count) of an application gateway.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+    /**
+     * Set capacity (instance count) of an application gateway.
+     *
+     * @param capacity the capacity value to set
+     * @return the ApplicationGatewaySku object itself.
+     */
+    public ApplicationGatewaySku withCapacity(Integer capacity) {
+        this.capacity = capacity;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySkuName.java
new file mode 100644
index 000000000000..59b3df5bb1ef
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewaySkuName.
+ */
+public final class ApplicationGatewaySkuName extends ExpandableStringEnum<ApplicationGatewaySkuName> {
+    /** Static value Standard_Small for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName STANDARD_SMALL = fromString("Standard_Small");
+
+    /** Static value Standard_Medium for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName STANDARD_MEDIUM = fromString("Standard_Medium");
+
+    /** Static value Standard_Large for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName STANDARD_LARGE = fromString("Standard_Large");
+
+    /** Static value WAF_Medium for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName WAF_MEDIUM = fromString("WAF_Medium");
+
+    /** Static value WAF_Large for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName WAF_LARGE = fromString("WAF_Large");
+
+    /** Static value Standard_v2 for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName STANDARD_V2 = fromString("Standard_v2");
+
+    /** Static value WAF_v2 for ApplicationGatewaySkuName. */
+    public static final ApplicationGatewaySkuName WAF_V2 = fromString("WAF_v2");
+
+    /**
+     * Creates or finds a ApplicationGatewaySkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewaySkuName
+     */
+    @JsonCreator
+    public static ApplicationGatewaySkuName fromString(String name) {
+        return fromString(name, ApplicationGatewaySkuName.class);
+    }
+
+    /**
+     * @return known ApplicationGatewaySkuName values
+     */
+    public static Collection<ApplicationGatewaySkuName> values() {
+        return values(ApplicationGatewaySkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCertificate.java
new file mode 100644
index 000000000000..a5370b0da257
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * SSL certificates of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewaySslCertificate extends SubResource {
+    /**
+     * Base-64 encoded pfx certificate. Only applicable in PUT Request.
+     */
+    @JsonProperty(value = "properties.data")
+    private String data;
+
+    /**
+     * Password for the pfx file specified in data. Only applicable in PUT
+     * request.
+     */
+    @JsonProperty(value = "properties.password")
+    private String password;
+
+    /**
+     * Base-64 encoded Public cert data corresponding to pfx specified in data.
+     * Only applicable in GET request.
+     */
+    @JsonProperty(value = "properties.publicCertData", access = JsonProperty.Access.WRITE_ONLY)
+    private String publicCertData;
+
+    /**
+     * Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate'
+     * object stored in KeyVault.
+     */
+    @JsonProperty(value = "properties.keyVaultSecretId")
+    private String keyVaultSecretId;
+
+    /**
+     * The provisioning state of the SSL certificate resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the SSL certificate that is unique within an Application
+     * Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get base-64 encoded pfx certificate. Only applicable in PUT Request.
+     *
+     * @return the data value
+     */
+    public String data() {
+        return this.data;
+    }
+
+    /**
+     * Set base-64 encoded pfx certificate. Only applicable in PUT Request.
+     *
+     * @param data the data value to set
+     * @return the ApplicationGatewaySslCertificate object itself.
+     */
+    public ApplicationGatewaySslCertificate withData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    /**
+     * Get password for the pfx file specified in data. Only applicable in PUT request.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set password for the pfx file specified in data. Only applicable in PUT request.
+     *
+     * @param password the password value to set
+     * @return the ApplicationGatewaySslCertificate object itself.
+     */
+    public ApplicationGatewaySslCertificate withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Get base-64 encoded Public cert data corresponding to pfx specified in data. Only applicable in GET request.
+     *
+     * @return the publicCertData value
+     */
+    public String publicCertData() {
+        return this.publicCertData;
+    }
+
+    /**
+     * Get secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @return the keyVaultSecretId value
+     */
+    public String keyVaultSecretId() {
+        return this.keyVaultSecretId;
+    }
+
+    /**
+     * Set secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @param keyVaultSecretId the keyVaultSecretId value to set
+     * @return the ApplicationGatewaySslCertificate object itself.
+     */
+    public ApplicationGatewaySslCertificate withKeyVaultSecretId(String keyVaultSecretId) {
+        this.keyVaultSecretId = keyVaultSecretId;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the SSL certificate resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the SSL certificate that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the SSL certificate that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewaySslCertificate object itself.
+     */
+    public ApplicationGatewaySslCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCipherSuite.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCipherSuite.java
new file mode 100644
index 000000000000..87db619d34e2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslCipherSuite.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewaySslCipherSuite.
+ */
+public final class ApplicationGatewaySslCipherSuite extends ExpandableStringEnum<ApplicationGatewaySslCipherSuite> {
+    /** Static value TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 = fromString("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 = fromString("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = fromString("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = fromString("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA");
+
+    /** Static value TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384");
+
+    /** Static value TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256");
+
+    /** Static value TLS_DHE_RSA_WITH_AES_256_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA = fromString("TLS_DHE_RSA_WITH_AES_256_CBC_SHA");
+
+    /** Static value TLS_DHE_RSA_WITH_AES_128_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA = fromString("TLS_DHE_RSA_WITH_AES_128_CBC_SHA");
+
+    /** Static value TLS_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_RSA_WITH_AES_256_GCM_SHA384");
+
+    /** Static value TLS_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_RSA_WITH_AES_128_GCM_SHA256");
+
+    /** Static value TLS_RSA_WITH_AES_256_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_256_CBC_SHA256 = fromString("TLS_RSA_WITH_AES_256_CBC_SHA256");
+
+    /** Static value TLS_RSA_WITH_AES_128_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_128_CBC_SHA256 = fromString("TLS_RSA_WITH_AES_128_CBC_SHA256");
+
+    /** Static value TLS_RSA_WITH_AES_256_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_256_CBC_SHA = fromString("TLS_RSA_WITH_AES_256_CBC_SHA");
+
+    /** Static value TLS_RSA_WITH_AES_128_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_AES_128_CBC_SHA = fromString("TLS_RSA_WITH_AES_128_CBC_SHA");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 = fromString("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 = fromString("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = fromString("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA");
+
+    /** Static value TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = fromString("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA");
+
+    /** Static value TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 = fromString("TLS_DHE_DSS_WITH_AES_256_CBC_SHA256");
+
+    /** Static value TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 = fromString("TLS_DHE_DSS_WITH_AES_128_CBC_SHA256");
+
+    /** Static value TLS_DHE_DSS_WITH_AES_256_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA = fromString("TLS_DHE_DSS_WITH_AES_256_CBC_SHA");
+
+    /** Static value TLS_DHE_DSS_WITH_AES_128_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA = fromString("TLS_DHE_DSS_WITH_AES_128_CBC_SHA");
+
+    /** Static value TLS_RSA_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA = fromString("TLS_RSA_WITH_3DES_EDE_CBC_SHA");
+
+    /** Static value TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = fromString("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384");
+
+    /**
+     * Creates or finds a ApplicationGatewaySslCipherSuite from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewaySslCipherSuite
+     */
+    @JsonCreator
+    public static ApplicationGatewaySslCipherSuite fromString(String name) {
+        return fromString(name, ApplicationGatewaySslCipherSuite.class);
+    }
+
+    /**
+     * @return known ApplicationGatewaySslCipherSuite values
+     */
+    public static Collection<ApplicationGatewaySslCipherSuite> values() {
+        return values(ApplicationGatewaySslCipherSuite.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicy.java
new file mode 100644
index 000000000000..e955b0a142c7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicy.java
@@ -0,0 +1,152 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application Gateway Ssl policy.
+ */
+public class ApplicationGatewaySslPolicy {
+    /**
+     * Ssl protocols to be disabled on application gateway.
+     */
+    @JsonProperty(value = "disabledSslProtocols")
+    private List<ApplicationGatewaySslProtocol> disabledSslProtocols;
+
+    /**
+     * Type of Ssl Policy. Possible values include: 'Predefined', 'Custom'.
+     */
+    @JsonProperty(value = "policyType")
+    private ApplicationGatewaySslPolicyType policyType;
+
+    /**
+     * Name of Ssl predefined policy. Possible values include:
+     * 'AppGwSslPolicy20150501', 'AppGwSslPolicy20170401',
+     * 'AppGwSslPolicy20170401S'.
+     */
+    @JsonProperty(value = "policyName")
+    private ApplicationGatewaySslPolicyName policyName;
+
+    /**
+     * Ssl cipher suites to be enabled in the specified order to application
+     * gateway.
+     */
+    @JsonProperty(value = "cipherSuites")
+    private List<ApplicationGatewaySslCipherSuite> cipherSuites;
+
+    /**
+     * Minimum version of Ssl protocol to be supported on application gateway.
+     * Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     */
+    @JsonProperty(value = "minProtocolVersion")
+    private ApplicationGatewaySslProtocol minProtocolVersion;
+
+    /**
+     * Get ssl protocols to be disabled on application gateway.
+     *
+     * @return the disabledSslProtocols value
+     */
+    public List<ApplicationGatewaySslProtocol> disabledSslProtocols() {
+        return this.disabledSslProtocols;
+    }
+
+    /**
+     * Set ssl protocols to be disabled on application gateway.
+     *
+     * @param disabledSslProtocols the disabledSslProtocols value to set
+     * @return the ApplicationGatewaySslPolicy object itself.
+     */
+    public ApplicationGatewaySslPolicy withDisabledSslProtocols(List<ApplicationGatewaySslProtocol> disabledSslProtocols) {
+        this.disabledSslProtocols = disabledSslProtocols;
+        return this;
+    }
+
+    /**
+     * Get type of Ssl Policy. Possible values include: 'Predefined', 'Custom'.
+     *
+     * @return the policyType value
+     */
+    public ApplicationGatewaySslPolicyType policyType() {
+        return this.policyType;
+    }
+
+    /**
+     * Set type of Ssl Policy. Possible values include: 'Predefined', 'Custom'.
+     *
+     * @param policyType the policyType value to set
+     * @return the ApplicationGatewaySslPolicy object itself.
+     */
+    public ApplicationGatewaySslPolicy withPolicyType(ApplicationGatewaySslPolicyType policyType) {
+        this.policyType = policyType;
+        return this;
+    }
+
+    /**
+     * Get name of Ssl predefined policy. Possible values include: 'AppGwSslPolicy20150501', 'AppGwSslPolicy20170401', 'AppGwSslPolicy20170401S'.
+     *
+     * @return the policyName value
+     */
+    public ApplicationGatewaySslPolicyName policyName() {
+        return this.policyName;
+    }
+
+    /**
+     * Set name of Ssl predefined policy. Possible values include: 'AppGwSslPolicy20150501', 'AppGwSslPolicy20170401', 'AppGwSslPolicy20170401S'.
+     *
+     * @param policyName the policyName value to set
+     * @return the ApplicationGatewaySslPolicy object itself.
+     */
+    public ApplicationGatewaySslPolicy withPolicyName(ApplicationGatewaySslPolicyName policyName) {
+        this.policyName = policyName;
+        return this;
+    }
+
+    /**
+     * Get ssl cipher suites to be enabled in the specified order to application gateway.
+     *
+     * @return the cipherSuites value
+     */
+    public List<ApplicationGatewaySslCipherSuite> cipherSuites() {
+        return this.cipherSuites;
+    }
+
+    /**
+     * Set ssl cipher suites to be enabled in the specified order to application gateway.
+     *
+     * @param cipherSuites the cipherSuites value to set
+     * @return the ApplicationGatewaySslPolicy object itself.
+     */
+    public ApplicationGatewaySslPolicy withCipherSuites(List<ApplicationGatewaySslCipherSuite> cipherSuites) {
+        this.cipherSuites = cipherSuites;
+        return this;
+    }
+
+    /**
+     * Get minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     *
+     * @return the minProtocolVersion value
+     */
+    public ApplicationGatewaySslProtocol minProtocolVersion() {
+        return this.minProtocolVersion;
+    }
+
+    /**
+     * Set minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     *
+     * @param minProtocolVersion the minProtocolVersion value to set
+     * @return the ApplicationGatewaySslPolicy object itself.
+     */
+    public ApplicationGatewaySslPolicy withMinProtocolVersion(ApplicationGatewaySslProtocol minProtocolVersion) {
+        this.minProtocolVersion = minProtocolVersion;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyName.java
new file mode 100644
index 000000000000..1d71a739705b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewaySslPolicyName.
+ */
+public final class ApplicationGatewaySslPolicyName extends ExpandableStringEnum<ApplicationGatewaySslPolicyName> {
+    /** Static value AppGwSslPolicy20150501 for ApplicationGatewaySslPolicyName. */
+    public static final ApplicationGatewaySslPolicyName APP_GW_SSL_POLICY20150501 = fromString("AppGwSslPolicy20150501");
+
+    /** Static value AppGwSslPolicy20170401 for ApplicationGatewaySslPolicyName. */
+    public static final ApplicationGatewaySslPolicyName APP_GW_SSL_POLICY20170401 = fromString("AppGwSslPolicy20170401");
+
+    /** Static value AppGwSslPolicy20170401S for ApplicationGatewaySslPolicyName. */
+    public static final ApplicationGatewaySslPolicyName APP_GW_SSL_POLICY20170401S = fromString("AppGwSslPolicy20170401S");
+
+    /**
+     * Creates or finds a ApplicationGatewaySslPolicyName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewaySslPolicyName
+     */
+    @JsonCreator
+    public static ApplicationGatewaySslPolicyName fromString(String name) {
+        return fromString(name, ApplicationGatewaySslPolicyName.class);
+    }
+
+    /**
+     * @return known ApplicationGatewaySslPolicyName values
+     */
+    public static Collection<ApplicationGatewaySslPolicyName> values() {
+        return values(ApplicationGatewaySslPolicyName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyType.java
new file mode 100644
index 000000000000..41b34966977c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPolicyType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewaySslPolicyType.
+ */
+public final class ApplicationGatewaySslPolicyType extends ExpandableStringEnum<ApplicationGatewaySslPolicyType> {
+    /** Static value Predefined for ApplicationGatewaySslPolicyType. */
+    public static final ApplicationGatewaySslPolicyType PREDEFINED = fromString("Predefined");
+
+    /** Static value Custom for ApplicationGatewaySslPolicyType. */
+    public static final ApplicationGatewaySslPolicyType CUSTOM = fromString("Custom");
+
+    /**
+     * Creates or finds a ApplicationGatewaySslPolicyType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewaySslPolicyType
+     */
+    @JsonCreator
+    public static ApplicationGatewaySslPolicyType fromString(String name) {
+        return fromString(name, ApplicationGatewaySslPolicyType.class);
+    }
+
+    /**
+     * @return known ApplicationGatewaySslPolicyType values
+     */
+    public static Collection<ApplicationGatewaySslPolicyType> values() {
+        return values(ApplicationGatewaySslPolicyType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPredefinedPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPredefinedPolicy.java
new file mode 100644
index 000000000000..290f5b696fc2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslPredefinedPolicy.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewaySslPredefinedPolicyInner;
+import java.util.List;
+
+/**
+ * Type representing ApplicationGatewaySslPredefinedPolicy.
+ */
+public interface ApplicationGatewaySslPredefinedPolicy extends HasInner<ApplicationGatewaySslPredefinedPolicyInner>, HasManager<NetworkManager> {
+    /**
+     * @return the cipherSuites value.
+     */
+    List<ApplicationGatewaySslCipherSuite> cipherSuites();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the minProtocolVersion value.
+     */
+    ApplicationGatewaySslProtocol minProtocolVersion();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslProtocol.java
new file mode 100644
index 000000000000..50e9289badd5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewaySslProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewaySslProtocol.
+ */
+public final class ApplicationGatewaySslProtocol extends ExpandableStringEnum<ApplicationGatewaySslProtocol> {
+    /** Static value TLSv1_0 for ApplicationGatewaySslProtocol. */
+    public static final ApplicationGatewaySslProtocol TLSV1_0 = fromString("TLSv1_0");
+
+    /** Static value TLSv1_1 for ApplicationGatewaySslProtocol. */
+    public static final ApplicationGatewaySslProtocol TLSV1_1 = fromString("TLSv1_1");
+
+    /** Static value TLSv1_2 for ApplicationGatewaySslProtocol. */
+    public static final ApplicationGatewaySslProtocol TLSV1_2 = fromString("TLSv1_2");
+
+    /**
+     * Creates or finds a ApplicationGatewaySslProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewaySslProtocol
+     */
+    @JsonCreator
+    public static ApplicationGatewaySslProtocol fromString(String name) {
+        return fromString(name, ApplicationGatewaySslProtocol.class);
+    }
+
+    /**
+     * @return known ApplicationGatewaySslProtocol values
+     */
+    public static Collection<ApplicationGatewaySslProtocol> values() {
+        return values(ApplicationGatewaySslProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTier.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTier.java
new file mode 100644
index 000000000000..d72cadd5212f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTier.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ApplicationGatewayTier.
+ */
+public final class ApplicationGatewayTier extends ExpandableStringEnum<ApplicationGatewayTier> {
+    /** Static value Standard for ApplicationGatewayTier. */
+    public static final ApplicationGatewayTier STANDARD = fromString("Standard");
+
+    /** Static value WAF for ApplicationGatewayTier. */
+    public static final ApplicationGatewayTier WAF = fromString("WAF");
+
+    /** Static value Standard_v2 for ApplicationGatewayTier. */
+    public static final ApplicationGatewayTier STANDARD_V2 = fromString("Standard_v2");
+
+    /** Static value WAF_v2 for ApplicationGatewayTier. */
+    public static final ApplicationGatewayTier WAF_V2 = fromString("WAF_v2");
+
+    /**
+     * Creates or finds a ApplicationGatewayTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ApplicationGatewayTier
+     */
+    @JsonCreator
+    public static ApplicationGatewayTier fromString(String name) {
+        return fromString(name, ApplicationGatewayTier.class);
+    }
+
+    /**
+     * @return known ApplicationGatewayTier values
+     */
+    public static Collection<ApplicationGatewayTier> values() {
+        return values(ApplicationGatewayTier.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTrustedRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTrustedRootCertificate.java
new file mode 100644
index 000000000000..1494b2775c59
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayTrustedRootCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Trusted Root certificates of an application gateway.
+ */
+@JsonFlatten
+public class ApplicationGatewayTrustedRootCertificate extends SubResource {
+    /**
+     * Certificate public data.
+     */
+    @JsonProperty(value = "properties.data")
+    private String data;
+
+    /**
+     * Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate'
+     * object stored in KeyVault.
+     */
+    @JsonProperty(value = "properties.keyVaultSecretId")
+    private String keyVaultSecretId;
+
+    /**
+     * The provisioning state of the trusted root certificate resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the trusted root certificate that is unique within an
+     * Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get certificate public data.
+     *
+     * @return the data value
+     */
+    public String data() {
+        return this.data;
+    }
+
+    /**
+     * Set certificate public data.
+     *
+     * @param data the data value to set
+     * @return the ApplicationGatewayTrustedRootCertificate object itself.
+     */
+    public ApplicationGatewayTrustedRootCertificate withData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    /**
+     * Get secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @return the keyVaultSecretId value
+     */
+    public String keyVaultSecretId() {
+        return this.keyVaultSecretId;
+    }
+
+    /**
+     * Set secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @param keyVaultSecretId the keyVaultSecretId value to set
+     * @return the ApplicationGatewayTrustedRootCertificate object itself.
+     */
+    public ApplicationGatewayTrustedRootCertificate withKeyVaultSecretId(String keyVaultSecretId) {
+        this.keyVaultSecretId = keyVaultSecretId;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the trusted root certificate resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the trusted root certificate that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the trusted root certificate that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayTrustedRootCertificate object itself.
+     */
+    public ApplicationGatewayTrustedRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlConfiguration.java
new file mode 100644
index 000000000000..b806cf07f4e0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Url configuration of the Actions set in Application Gateway.
+ */
+public class ApplicationGatewayUrlConfiguration {
+    /**
+     * Url path which user has provided for url rewrite. Null means no path
+     * will be updated. Default value is null.
+     */
+    @JsonProperty(value = "modifiedPath")
+    private String modifiedPath;
+
+    /**
+     * Query string which user has provided for url rewrite. Null means no
+     * query string will be updated. Default value is null.
+     */
+    @JsonProperty(value = "modifiedQueryString")
+    private String modifiedQueryString;
+
+    /**
+     * If set as true, it will re-evaluate the url path map provided in path
+     * based request routing rules using modified path. Default value is false.
+     */
+    @JsonProperty(value = "reroute")
+    private Boolean reroute;
+
+    /**
+     * Get url path which user has provided for url rewrite. Null means no path will be updated. Default value is null.
+     *
+     * @return the modifiedPath value
+     */
+    public String modifiedPath() {
+        return this.modifiedPath;
+    }
+
+    /**
+     * Set url path which user has provided for url rewrite. Null means no path will be updated. Default value is null.
+     *
+     * @param modifiedPath the modifiedPath value to set
+     * @return the ApplicationGatewayUrlConfiguration object itself.
+     */
+    public ApplicationGatewayUrlConfiguration withModifiedPath(String modifiedPath) {
+        this.modifiedPath = modifiedPath;
+        return this;
+    }
+
+    /**
+     * Get query string which user has provided for url rewrite. Null means no query string will be updated. Default value is null.
+     *
+     * @return the modifiedQueryString value
+     */
+    public String modifiedQueryString() {
+        return this.modifiedQueryString;
+    }
+
+    /**
+     * Set query string which user has provided for url rewrite. Null means no query string will be updated. Default value is null.
+     *
+     * @param modifiedQueryString the modifiedQueryString value to set
+     * @return the ApplicationGatewayUrlConfiguration object itself.
+     */
+    public ApplicationGatewayUrlConfiguration withModifiedQueryString(String modifiedQueryString) {
+        this.modifiedQueryString = modifiedQueryString;
+        return this;
+    }
+
+    /**
+     * Get if set as true, it will re-evaluate the url path map provided in path based request routing rules using modified path. Default value is false.
+     *
+     * @return the reroute value
+     */
+    public Boolean reroute() {
+        return this.reroute;
+    }
+
+    /**
+     * Set if set as true, it will re-evaluate the url path map provided in path based request routing rules using modified path. Default value is false.
+     *
+     * @param reroute the reroute value to set
+     * @return the ApplicationGatewayUrlConfiguration object itself.
+     */
+    public ApplicationGatewayUrlConfiguration withReroute(Boolean reroute) {
+        this.reroute = reroute;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlPathMap.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlPathMap.java
new file mode 100644
index 000000000000..54f382c63b6e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayUrlPathMap.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * UrlPathMaps give a url path to the backend mapping information for
+ * PathBasedRouting.
+ */
+@JsonFlatten
+public class ApplicationGatewayUrlPathMap extends SubResource {
+    /**
+     * Default backend address pool resource of URL path map.
+     */
+    @JsonProperty(value = "properties.defaultBackendAddressPool")
+    private SubResource defaultBackendAddressPool;
+
+    /**
+     * Default backend http settings resource of URL path map.
+     */
+    @JsonProperty(value = "properties.defaultBackendHttpSettings")
+    private SubResource defaultBackendHttpSettings;
+
+    /**
+     * Default Rewrite rule set resource of URL path map.
+     */
+    @JsonProperty(value = "properties.defaultRewriteRuleSet")
+    private SubResource defaultRewriteRuleSet;
+
+    /**
+     * Default redirect configuration resource of URL path map.
+     */
+    @JsonProperty(value = "properties.defaultRedirectConfiguration")
+    private SubResource defaultRedirectConfiguration;
+
+    /**
+     * Path rule of URL path map resource.
+     */
+    @JsonProperty(value = "properties.pathRules")
+    private List<ApplicationGatewayPathRule> pathRules;
+
+    /**
+     * The provisioning state of the URL path map resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the URL path map that is unique within an Application Gateway.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get default backend address pool resource of URL path map.
+     *
+     * @return the defaultBackendAddressPool value
+     */
+    public SubResource defaultBackendAddressPool() {
+        return this.defaultBackendAddressPool;
+    }
+
+    /**
+     * Set default backend address pool resource of URL path map.
+     *
+     * @param defaultBackendAddressPool the defaultBackendAddressPool value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withDefaultBackendAddressPool(SubResource defaultBackendAddressPool) {
+        this.defaultBackendAddressPool = defaultBackendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get default backend http settings resource of URL path map.
+     *
+     * @return the defaultBackendHttpSettings value
+     */
+    public SubResource defaultBackendHttpSettings() {
+        return this.defaultBackendHttpSettings;
+    }
+
+    /**
+     * Set default backend http settings resource of URL path map.
+     *
+     * @param defaultBackendHttpSettings the defaultBackendHttpSettings value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withDefaultBackendHttpSettings(SubResource defaultBackendHttpSettings) {
+        this.defaultBackendHttpSettings = defaultBackendHttpSettings;
+        return this;
+    }
+
+    /**
+     * Get default Rewrite rule set resource of URL path map.
+     *
+     * @return the defaultRewriteRuleSet value
+     */
+    public SubResource defaultRewriteRuleSet() {
+        return this.defaultRewriteRuleSet;
+    }
+
+    /**
+     * Set default Rewrite rule set resource of URL path map.
+     *
+     * @param defaultRewriteRuleSet the defaultRewriteRuleSet value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withDefaultRewriteRuleSet(SubResource defaultRewriteRuleSet) {
+        this.defaultRewriteRuleSet = defaultRewriteRuleSet;
+        return this;
+    }
+
+    /**
+     * Get default redirect configuration resource of URL path map.
+     *
+     * @return the defaultRedirectConfiguration value
+     */
+    public SubResource defaultRedirectConfiguration() {
+        return this.defaultRedirectConfiguration;
+    }
+
+    /**
+     * Set default redirect configuration resource of URL path map.
+     *
+     * @param defaultRedirectConfiguration the defaultRedirectConfiguration value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withDefaultRedirectConfiguration(SubResource defaultRedirectConfiguration) {
+        this.defaultRedirectConfiguration = defaultRedirectConfiguration;
+        return this;
+    }
+
+    /**
+     * Get path rule of URL path map resource.
+     *
+     * @return the pathRules value
+     */
+    public List<ApplicationGatewayPathRule> pathRules() {
+        return this.pathRules;
+    }
+
+    /**
+     * Set path rule of URL path map resource.
+     *
+     * @param pathRules the pathRules value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withPathRules(List<ApplicationGatewayPathRule> pathRules) {
+        this.pathRules = pathRules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the URL path map resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the URL path map that is unique within an Application Gateway.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the URL path map that is unique within an Application Gateway.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewayUrlPathMap object itself.
+     */
+    public ApplicationGatewayUrlPathMap withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java
new file mode 100644
index 000000000000..be0fd6c77b93
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGatewayWebApplicationFirewallConfiguration.java
@@ -0,0 +1,280 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Application gateway web application firewall configuration.
+ */
+public class ApplicationGatewayWebApplicationFirewallConfiguration {
+    /**
+     * Whether the web application firewall is enabled or not.
+     */
+    @JsonProperty(value = "enabled", required = true)
+    private boolean enabled;
+
+    /**
+     * Web application firewall mode. Possible values include: 'Detection',
+     * 'Prevention'.
+     */
+    @JsonProperty(value = "firewallMode", required = true)
+    private ApplicationGatewayFirewallMode firewallMode;
+
+    /**
+     * The type of the web application firewall rule set. Possible values are:
+     * 'OWASP'.
+     */
+    @JsonProperty(value = "ruleSetType", required = true)
+    private String ruleSetType;
+
+    /**
+     * The version of the rule set type.
+     */
+    @JsonProperty(value = "ruleSetVersion", required = true)
+    private String ruleSetVersion;
+
+    /**
+     * The disabled rule groups.
+     */
+    @JsonProperty(value = "disabledRuleGroups")
+    private List<ApplicationGatewayFirewallDisabledRuleGroup> disabledRuleGroups;
+
+    /**
+     * Whether allow WAF to check request Body.
+     */
+    @JsonProperty(value = "requestBodyCheck")
+    private Boolean requestBodyCheck;
+
+    /**
+     * Maximum request body size for WAF.
+     */
+    @JsonProperty(value = "maxRequestBodySize")
+    private Integer maxRequestBodySize;
+
+    /**
+     * Maximum request body size in Kb for WAF.
+     */
+    @JsonProperty(value = "maxRequestBodySizeInKb")
+    private Integer maxRequestBodySizeInKb;
+
+    /**
+     * Maximum file upload size in Mb for WAF.
+     */
+    @JsonProperty(value = "fileUploadLimitInMb")
+    private Integer fileUploadLimitInMb;
+
+    /**
+     * The exclusion list.
+     */
+    @JsonProperty(value = "exclusions")
+    private List<ApplicationGatewayFirewallExclusion> exclusions;
+
+    /**
+     * Get whether the web application firewall is enabled or not.
+     *
+     * @return the enabled value
+     */
+    public boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set whether the web application firewall is enabled or not.
+     *
+     * @param enabled the enabled value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get web application firewall mode. Possible values include: 'Detection', 'Prevention'.
+     *
+     * @return the firewallMode value
+     */
+    public ApplicationGatewayFirewallMode firewallMode() {
+        return this.firewallMode;
+    }
+
+    /**
+     * Set web application firewall mode. Possible values include: 'Detection', 'Prevention'.
+     *
+     * @param firewallMode the firewallMode value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withFirewallMode(ApplicationGatewayFirewallMode firewallMode) {
+        this.firewallMode = firewallMode;
+        return this;
+    }
+
+    /**
+     * Get the type of the web application firewall rule set. Possible values are: 'OWASP'.
+     *
+     * @return the ruleSetType value
+     */
+    public String ruleSetType() {
+        return this.ruleSetType;
+    }
+
+    /**
+     * Set the type of the web application firewall rule set. Possible values are: 'OWASP'.
+     *
+     * @param ruleSetType the ruleSetType value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withRuleSetType(String ruleSetType) {
+        this.ruleSetType = ruleSetType;
+        return this;
+    }
+
+    /**
+     * Get the version of the rule set type.
+     *
+     * @return the ruleSetVersion value
+     */
+    public String ruleSetVersion() {
+        return this.ruleSetVersion;
+    }
+
+    /**
+     * Set the version of the rule set type.
+     *
+     * @param ruleSetVersion the ruleSetVersion value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withRuleSetVersion(String ruleSetVersion) {
+        this.ruleSetVersion = ruleSetVersion;
+        return this;
+    }
+
+    /**
+     * Get the disabled rule groups.
+     *
+     * @return the disabledRuleGroups value
+     */
+    public List<ApplicationGatewayFirewallDisabledRuleGroup> disabledRuleGroups() {
+        return this.disabledRuleGroups;
+    }
+
+    /**
+     * Set the disabled rule groups.
+     *
+     * @param disabledRuleGroups the disabledRuleGroups value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withDisabledRuleGroups(List<ApplicationGatewayFirewallDisabledRuleGroup> disabledRuleGroups) {
+        this.disabledRuleGroups = disabledRuleGroups;
+        return this;
+    }
+
+    /**
+     * Get whether allow WAF to check request Body.
+     *
+     * @return the requestBodyCheck value
+     */
+    public Boolean requestBodyCheck() {
+        return this.requestBodyCheck;
+    }
+
+    /**
+     * Set whether allow WAF to check request Body.
+     *
+     * @param requestBodyCheck the requestBodyCheck value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withRequestBodyCheck(Boolean requestBodyCheck) {
+        this.requestBodyCheck = requestBodyCheck;
+        return this;
+    }
+
+    /**
+     * Get maximum request body size for WAF.
+     *
+     * @return the maxRequestBodySize value
+     */
+    public Integer maxRequestBodySize() {
+        return this.maxRequestBodySize;
+    }
+
+    /**
+     * Set maximum request body size for WAF.
+     *
+     * @param maxRequestBodySize the maxRequestBodySize value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withMaxRequestBodySize(Integer maxRequestBodySize) {
+        this.maxRequestBodySize = maxRequestBodySize;
+        return this;
+    }
+
+    /**
+     * Get maximum request body size in Kb for WAF.
+     *
+     * @return the maxRequestBodySizeInKb value
+     */
+    public Integer maxRequestBodySizeInKb() {
+        return this.maxRequestBodySizeInKb;
+    }
+
+    /**
+     * Set maximum request body size in Kb for WAF.
+     *
+     * @param maxRequestBodySizeInKb the maxRequestBodySizeInKb value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withMaxRequestBodySizeInKb(Integer maxRequestBodySizeInKb) {
+        this.maxRequestBodySizeInKb = maxRequestBodySizeInKb;
+        return this;
+    }
+
+    /**
+     * Get maximum file upload size in Mb for WAF.
+     *
+     * @return the fileUploadLimitInMb value
+     */
+    public Integer fileUploadLimitInMb() {
+        return this.fileUploadLimitInMb;
+    }
+
+    /**
+     * Set maximum file upload size in Mb for WAF.
+     *
+     * @param fileUploadLimitInMb the fileUploadLimitInMb value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withFileUploadLimitInMb(Integer fileUploadLimitInMb) {
+        this.fileUploadLimitInMb = fileUploadLimitInMb;
+        return this;
+    }
+
+    /**
+     * Get the exclusion list.
+     *
+     * @return the exclusions value
+     */
+    public List<ApplicationGatewayFirewallExclusion> exclusions() {
+        return this.exclusions;
+    }
+
+    /**
+     * Set the exclusion list.
+     *
+     * @param exclusions the exclusions value to set
+     * @return the ApplicationGatewayWebApplicationFirewallConfiguration object itself.
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration withExclusions(List<ApplicationGatewayFirewallExclusion> exclusions) {
+        this.exclusions = exclusions;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateways.java
new file mode 100644
index 000000000000..d4b3487a065c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationGateways.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.network.v2020_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 rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ApplicationGateways.
+ */
+public interface ApplicationGateways extends SupportsCreating<ApplicationGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ApplicationGateway>, SupportsListingByResourceGroup<ApplicationGateway>, SupportsListing<ApplicationGateway>, HasInner<ApplicationGatewaysInner> {
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable startAsync(String resourceGroupName, String applicationGatewayName);
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable stopAsync(String resourceGroupName, String applicationGatewayName);
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewayBackendHealth> backendHealthAsync(String resourceGroupName, String applicationGatewayName);
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewayBackendHealthOnDemand> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest);
+
+    /**
+     * Lists all available server variables.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> listAvailableServerVariablesAsync();
+
+    /**
+     * Lists all available request headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> listAvailableRequestHeadersAsync();
+
+    /**
+     * Lists all available response headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> listAvailableResponseHeadersAsync();
+
+    /**
+     * Lists all available web application firewall rule sets.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewayAvailableWafRuleSetsResult> listAvailableWafRuleSetsAsync();
+
+    /**
+     * Lists available Ssl options for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewayAvailableSslOptions> listAvailableSslOptionsAsync();
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewaySslPredefinedPolicy> listAvailableSslPredefinedPoliciesAsync();
+
+    /**
+     * Gets Ssl predefined policy with the specified policy name.
+     *
+     * @param predefinedPolicyName Name of Ssl predefined policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ApplicationGatewaySslPredefinedPolicy> getSslPredefinedPolicyAsync(String predefinedPolicyName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
new file mode 100644
index 000000000000..37b590b061b1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
@@ -0,0 +1,204 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Rule condition of type application.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleConditionType", defaultImpl = ApplicationRuleCondition.class)
+@JsonTypeName("ApplicationRuleCondition")
+public class ApplicationRuleCondition extends FirewallPolicyRuleCondition {
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * List of destination IP addresses or Service Tags.
+     */
+    @JsonProperty(value = "destinationAddresses")
+    private List<String> destinationAddresses;
+
+    /**
+     * Array of Application Protocols.
+     */
+    @JsonProperty(value = "protocols")
+    private List<FirewallPolicyRuleConditionApplicationProtocol> protocols;
+
+    /**
+     * List of Urls for this rule condition.
+     */
+    @JsonProperty(value = "targetUrls")
+    private List<String> targetUrls;
+
+    /**
+     * List of FQDNs for this rule condition.
+     */
+    @JsonProperty(value = "targetFqdns")
+    private List<String> targetFqdns;
+
+    /**
+     * List of FQDN Tags for this rule condition.
+     */
+    @JsonProperty(value = "fqdnTags")
+    private List<String> fqdnTags;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination IP addresses or Service Tags.
+     *
+     * @return the destinationAddresses value
+     */
+    public List<String> destinationAddresses() {
+        return this.destinationAddresses;
+    }
+
+    /**
+     * Set list of destination IP addresses or Service Tags.
+     *
+     * @param destinationAddresses the destinationAddresses value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withDestinationAddresses(List<String> destinationAddresses) {
+        this.destinationAddresses = destinationAddresses;
+        return this;
+    }
+
+    /**
+     * Get array of Application Protocols.
+     *
+     * @return the protocols value
+     */
+    public List<FirewallPolicyRuleConditionApplicationProtocol> protocols() {
+        return this.protocols;
+    }
+
+    /**
+     * Set array of Application Protocols.
+     *
+     * @param protocols the protocols value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withProtocols(List<FirewallPolicyRuleConditionApplicationProtocol> protocols) {
+        this.protocols = protocols;
+        return this;
+    }
+
+    /**
+     * Get list of Urls for this rule condition.
+     *
+     * @return the targetUrls value
+     */
+    public List<String> targetUrls() {
+        return this.targetUrls;
+    }
+
+    /**
+     * Set list of Urls for this rule condition.
+     *
+     * @param targetUrls the targetUrls value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withTargetUrls(List<String> targetUrls) {
+        this.targetUrls = targetUrls;
+        return this;
+    }
+
+    /**
+     * Get list of FQDNs for this rule condition.
+     *
+     * @return the targetFqdns value
+     */
+    public List<String> targetFqdns() {
+        return this.targetFqdns;
+    }
+
+    /**
+     * Set list of FQDNs for this rule condition.
+     *
+     * @param targetFqdns the targetFqdns value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withTargetFqdns(List<String> targetFqdns) {
+        this.targetFqdns = targetFqdns;
+        return this;
+    }
+
+    /**
+     * Get list of FQDN Tags for this rule condition.
+     *
+     * @return the fqdnTags value
+     */
+    public List<String> fqdnTags() {
+        return this.fqdnTags;
+    }
+
+    /**
+     * Set list of FQDN Tags for this rule condition.
+     *
+     * @param fqdnTags the fqdnTags value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withFqdnTags(List<String> fqdnTags) {
+        this.fqdnTags = fqdnTags;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the ApplicationRuleCondition object itself.
+     */
+    public ApplicationRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroup.java
new file mode 100644
index 000000000000..7219d5c1dc7f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroup.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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationSecurityGroupInner;
+
+/**
+ * Type representing ApplicationSecurityGroup.
+ */
+public interface ApplicationSecurityGroup extends HasInner<ApplicationSecurityGroupInner>, Resource, GroupableResourceCore<NetworkManager, ApplicationSecurityGroupInner>, HasResourceGroup, Refreshable<ApplicationSecurityGroup>, Updatable<ApplicationSecurityGroup.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the ApplicationSecurityGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ApplicationSecurityGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ApplicationSecurityGroup definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ApplicationSecurityGroup definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * 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<ApplicationSecurityGroup>, Resource.DefinitionWithTags<WithCreate> {
+        }
+    }
+    /**
+     * The template for a ApplicationSecurityGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ApplicationSecurityGroup>, Resource.UpdateWithTags<Update> {
+    }
+
+    /**
+     * Grouping of ApplicationSecurityGroup update stages.
+     */
+    interface UpdateStages {
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroups.java
new file mode 100644
index 000000000000..fbb8831860d0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationSecurityGroups.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.ApplicationSecurityGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ApplicationSecurityGroups.
+ */
+public interface ApplicationSecurityGroups extends SupportsCreating<ApplicationSecurityGroup.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ApplicationSecurityGroup>, SupportsListingByResourceGroup<ApplicationSecurityGroup>, SupportsListing<ApplicationSecurityGroup>, HasInner<ApplicationSecurityGroupsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AssociationType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AssociationType.java
new file mode 100644
index 000000000000..0fd8726d1878
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AssociationType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AssociationType.
+ */
+public final class AssociationType extends ExpandableStringEnum<AssociationType> {
+    /** Static value Associated for AssociationType. */
+    public static final AssociationType ASSOCIATED = fromString("Associated");
+
+    /** Static value Contains for AssociationType. */
+    public static final AssociationType CONTAINS = fromString("Contains");
+
+    /**
+     * Creates or finds a AssociationType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AssociationType
+     */
+    @JsonCreator
+    public static AssociationType fromString(String name) {
+        return fromString(name, AssociationType.class);
+    }
+
+    /**
+     * @return known AssociationType values
+     */
+    public static Collection<AssociationType> values() {
+        return values(AssociationType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthenticationMethod.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthenticationMethod.java
new file mode 100644
index 000000000000..34e1b855278a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthenticationMethod.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AuthenticationMethod.
+ */
+public final class AuthenticationMethod extends ExpandableStringEnum<AuthenticationMethod> {
+    /** Static value EAPTLS for AuthenticationMethod. */
+    public static final AuthenticationMethod EAPTLS = fromString("EAPTLS");
+
+    /** Static value EAPMSCHAPv2 for AuthenticationMethod. */
+    public static final AuthenticationMethod EAPMSCHAPV2 = fromString("EAPMSCHAPv2");
+
+    /**
+     * Creates or finds a AuthenticationMethod from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AuthenticationMethod
+     */
+    @JsonCreator
+    public static AuthenticationMethod fromString(String name) {
+        return fromString(name, AuthenticationMethod.class);
+    }
+
+    /**
+     * @return known AuthenticationMethod values
+     */
+    public static Collection<AuthenticationMethod> values() {
+        return values(AuthenticationMethod.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthorizationUseStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthorizationUseStatus.java
new file mode 100644
index 000000000000..2fe1316e783d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AuthorizationUseStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AuthorizationUseStatus.
+ */
+public final class AuthorizationUseStatus extends ExpandableStringEnum<AuthorizationUseStatus> {
+    /** Static value Available for AuthorizationUseStatus. */
+    public static final AuthorizationUseStatus AVAILABLE = fromString("Available");
+
+    /** Static value InUse for AuthorizationUseStatus. */
+    public static final AuthorizationUseStatus IN_USE = fromString("InUse");
+
+    /**
+     * Creates or finds a AuthorizationUseStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AuthorizationUseStatus
+     */
+    @JsonCreator
+    public static AuthorizationUseStatus fromString(String name) {
+        return fromString(name, AuthorizationUseStatus.class);
+    }
+
+    /**
+     * @return known AuthorizationUseStatus values
+     */
+    public static Collection<AuthorizationUseStatus> values() {
+        return values(AuthorizationUseStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AutoApprovedPrivateLinkService.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AutoApprovedPrivateLinkService.java
new file mode 100644
index 000000000000..c7f223458e3e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AutoApprovedPrivateLinkService.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AutoApprovedPrivateLinkServiceInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing AutoApprovedPrivateLinkService.
+ */
+public interface AutoApprovedPrivateLinkService extends HasInner<AutoApprovedPrivateLinkServiceInner>, HasManager<NetworkManager> {
+    /**
+     * @return the privateLinkService value.
+     */
+    String privateLinkService();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Availability.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Availability.java
new file mode 100644
index 000000000000..2aa2b7bc0ed7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Availability.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Availability of the metric.
+ */
+public class Availability {
+    /**
+     * The time grain of the availability.
+     */
+    @JsonProperty(value = "timeGrain")
+    private String timeGrain;
+
+    /**
+     * The retention of the availability.
+     */
+    @JsonProperty(value = "retention")
+    private String retention;
+
+    /**
+     * Duration of the availability blob.
+     */
+    @JsonProperty(value = "blobDuration")
+    private String blobDuration;
+
+    /**
+     * Get the time grain of the availability.
+     *
+     * @return the timeGrain value
+     */
+    public String timeGrain() {
+        return this.timeGrain;
+    }
+
+    /**
+     * Set the time grain of the availability.
+     *
+     * @param timeGrain the timeGrain value to set
+     * @return the Availability object itself.
+     */
+    public Availability withTimeGrain(String timeGrain) {
+        this.timeGrain = timeGrain;
+        return this;
+    }
+
+    /**
+     * Get the retention of the availability.
+     *
+     * @return the retention value
+     */
+    public String retention() {
+        return this.retention;
+    }
+
+    /**
+     * Set the retention of the availability.
+     *
+     * @param retention the retention value to set
+     * @return the Availability object itself.
+     */
+    public Availability withRetention(String retention) {
+        this.retention = retention;
+        return this;
+    }
+
+    /**
+     * Get duration of the availability blob.
+     *
+     * @return the blobDuration value
+     */
+    public String blobDuration() {
+        return this.blobDuration;
+    }
+
+    /**
+     * Set duration of the availability blob.
+     *
+     * @param blobDuration the blobDuration value to set
+     * @return the Availability object itself.
+     */
+    public Availability withBlobDuration(String blobDuration) {
+        this.blobDuration = blobDuration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableDelegations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableDelegations.java
new file mode 100644
index 000000000000..6f7ed553f1fb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableDelegations.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableDelegationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AvailableDelegations.
+ */
+public interface AvailableDelegations extends HasInner<AvailableDelegationsInner> {
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @param location The location of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LocationAvailableDelegation> listAsync(final String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableEndpointServices.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableEndpointServices.java
new file mode 100644
index 000000000000..2e5e6d22f918
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableEndpointServices.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableEndpointServicesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AvailableEndpointServices.
+ */
+public interface AvailableEndpointServices extends HasInner<AvailableEndpointServicesInner> {
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @param location The location to check available endpoint services.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EndpointServiceResult> listAsync(final String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointType.java
new file mode 100644
index 000000000000..59a41e56d058
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointType.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailablePrivateEndpointTypeInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing AvailablePrivateEndpointType.
+ */
+public interface AvailablePrivateEndpointType extends HasInner<AvailablePrivateEndpointTypeInner>, HasManager<NetworkManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the resourceName value.
+     */
+    String resourceName();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointTypes.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointTypes.java
new file mode 100644
index 000000000000..5c1424ac6f21
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailablePrivateEndpointTypes.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailablePrivateEndpointTypesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AvailablePrivateEndpointTypes.
+ */
+public interface AvailablePrivateEndpointTypes extends HasInner<AvailablePrivateEndpointTypesInner> {
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailablePrivateEndpointType> listByResourceGroupAsync(final String location, final String resourceGroupName);
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailablePrivateEndpointType> listAsync(final String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersList.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersList.java
new file mode 100644
index 000000000000..b2803178ef4f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersList.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableProvidersListInner;
+import java.util.List;
+
+/**
+ * Type representing AvailableProvidersList.
+ */
+public interface AvailableProvidersList extends HasInner<AvailableProvidersListInner>, HasManager<NetworkManager> {
+    /**
+     * @return the countries value.
+     */
+    List<AvailableProvidersListCountry> countries();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCity.java
new file mode 100644
index 000000000000..63477e8bfea0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCity.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * City or town details.
+ */
+public class AvailableProvidersListCity {
+    /**
+     * The city or town name.
+     */
+    @JsonProperty(value = "cityName")
+    private String cityName;
+
+    /**
+     * A list of Internet service providers.
+     */
+    @JsonProperty(value = "providers")
+    private List<String> providers;
+
+    /**
+     * Get the city or town name.
+     *
+     * @return the cityName value
+     */
+    public String cityName() {
+        return this.cityName;
+    }
+
+    /**
+     * Set the city or town name.
+     *
+     * @param cityName the cityName value to set
+     * @return the AvailableProvidersListCity object itself.
+     */
+    public AvailableProvidersListCity withCityName(String cityName) {
+        this.cityName = cityName;
+        return this;
+    }
+
+    /**
+     * Get a list of Internet service providers.
+     *
+     * @return the providers value
+     */
+    public List<String> providers() {
+        return this.providers;
+    }
+
+    /**
+     * Set a list of Internet service providers.
+     *
+     * @param providers the providers value to set
+     * @return the AvailableProvidersListCity object itself.
+     */
+    public AvailableProvidersListCity withProviders(List<String> providers) {
+        this.providers = providers;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCountry.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCountry.java
new file mode 100644
index 000000000000..aa3031cdad49
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListCountry.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Country details.
+ */
+public class AvailableProvidersListCountry {
+    /**
+     * The country name.
+     */
+    @JsonProperty(value = "countryName")
+    private String countryName;
+
+    /**
+     * A list of Internet service providers.
+     */
+    @JsonProperty(value = "providers")
+    private List<String> providers;
+
+    /**
+     * List of available states in the country.
+     */
+    @JsonProperty(value = "states")
+    private List<AvailableProvidersListState> states;
+
+    /**
+     * Get the country name.
+     *
+     * @return the countryName value
+     */
+    public String countryName() {
+        return this.countryName;
+    }
+
+    /**
+     * Set the country name.
+     *
+     * @param countryName the countryName value to set
+     * @return the AvailableProvidersListCountry object itself.
+     */
+    public AvailableProvidersListCountry withCountryName(String countryName) {
+        this.countryName = countryName;
+        return this;
+    }
+
+    /**
+     * Get a list of Internet service providers.
+     *
+     * @return the providers value
+     */
+    public List<String> providers() {
+        return this.providers;
+    }
+
+    /**
+     * Set a list of Internet service providers.
+     *
+     * @param providers the providers value to set
+     * @return the AvailableProvidersListCountry object itself.
+     */
+    public AvailableProvidersListCountry withProviders(List<String> providers) {
+        this.providers = providers;
+        return this;
+    }
+
+    /**
+     * Get list of available states in the country.
+     *
+     * @return the states value
+     */
+    public List<AvailableProvidersListState> states() {
+        return this.states;
+    }
+
+    /**
+     * Set list of available states in the country.
+     *
+     * @param states the states value to set
+     * @return the AvailableProvidersListCountry object itself.
+     */
+    public AvailableProvidersListCountry withStates(List<AvailableProvidersListState> states) {
+        this.states = states;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListParameters.java
new file mode 100644
index 000000000000..902247008633
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListParameters.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Constraints that determine the list of available Internet service providers.
+ */
+public class AvailableProvidersListParameters {
+    /**
+     * A list of Azure regions.
+     */
+    @JsonProperty(value = "azureLocations")
+    private List<String> azureLocations;
+
+    /**
+     * The country for available providers list.
+     */
+    @JsonProperty(value = "country")
+    private String country;
+
+    /**
+     * The state for available providers list.
+     */
+    @JsonProperty(value = "state")
+    private String state;
+
+    /**
+     * The city or town for available providers list.
+     */
+    @JsonProperty(value = "city")
+    private String city;
+
+    /**
+     * Get a list of Azure regions.
+     *
+     * @return the azureLocations value
+     */
+    public List<String> azureLocations() {
+        return this.azureLocations;
+    }
+
+    /**
+     * Set a list of Azure regions.
+     *
+     * @param azureLocations the azureLocations value to set
+     * @return the AvailableProvidersListParameters object itself.
+     */
+    public AvailableProvidersListParameters withAzureLocations(List<String> azureLocations) {
+        this.azureLocations = azureLocations;
+        return this;
+    }
+
+    /**
+     * Get the country for available providers list.
+     *
+     * @return the country value
+     */
+    public String country() {
+        return this.country;
+    }
+
+    /**
+     * Set the country for available providers list.
+     *
+     * @param country the country value to set
+     * @return the AvailableProvidersListParameters object itself.
+     */
+    public AvailableProvidersListParameters withCountry(String country) {
+        this.country = country;
+        return this;
+    }
+
+    /**
+     * Get the state for available providers list.
+     *
+     * @return the state value
+     */
+    public String state() {
+        return this.state;
+    }
+
+    /**
+     * Set the state for available providers list.
+     *
+     * @param state the state value to set
+     * @return the AvailableProvidersListParameters object itself.
+     */
+    public AvailableProvidersListParameters withState(String state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the city or town for available providers list.
+     *
+     * @return the city value
+     */
+    public String city() {
+        return this.city;
+    }
+
+    /**
+     * Set the city or town for available providers list.
+     *
+     * @param city the city value to set
+     * @return the AvailableProvidersListParameters object itself.
+     */
+    public AvailableProvidersListParameters withCity(String city) {
+        this.city = city;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListState.java
new file mode 100644
index 000000000000..453999984811
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableProvidersListState.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * State details.
+ */
+public class AvailableProvidersListState {
+    /**
+     * The state name.
+     */
+    @JsonProperty(value = "stateName")
+    private String stateName;
+
+    /**
+     * A list of Internet service providers.
+     */
+    @JsonProperty(value = "providers")
+    private List<String> providers;
+
+    /**
+     * List of available cities or towns in the state.
+     */
+    @JsonProperty(value = "cities")
+    private List<AvailableProvidersListCity> cities;
+
+    /**
+     * Get the state name.
+     *
+     * @return the stateName value
+     */
+    public String stateName() {
+        return this.stateName;
+    }
+
+    /**
+     * Set the state name.
+     *
+     * @param stateName the stateName value to set
+     * @return the AvailableProvidersListState object itself.
+     */
+    public AvailableProvidersListState withStateName(String stateName) {
+        this.stateName = stateName;
+        return this;
+    }
+
+    /**
+     * Get a list of Internet service providers.
+     *
+     * @return the providers value
+     */
+    public List<String> providers() {
+        return this.providers;
+    }
+
+    /**
+     * Set a list of Internet service providers.
+     *
+     * @param providers the providers value to set
+     * @return the AvailableProvidersListState object itself.
+     */
+    public AvailableProvidersListState withProviders(List<String> providers) {
+        this.providers = providers;
+        return this;
+    }
+
+    /**
+     * Get list of available cities or towns in the state.
+     *
+     * @return the cities value
+     */
+    public List<AvailableProvidersListCity> cities() {
+        return this.cities;
+    }
+
+    /**
+     * Set list of available cities or towns in the state.
+     *
+     * @param cities the cities value to set
+     * @return the AvailableProvidersListState object itself.
+     */
+    public AvailableProvidersListState withCities(List<AvailableProvidersListCity> cities) {
+        this.cities = cities;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableResourceGroupDelegations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableResourceGroupDelegations.java
new file mode 100644
index 000000000000..bb4220d4886c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableResourceGroupDelegations.java
@@ -0,0 +1,29 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableResourceGroupDelegationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AvailableResourceGroupDelegations.
+ */
+public interface AvailableResourceGroupDelegations extends HasInner<AvailableResourceGroupDelegationsInner> {
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LocationAvailableDelegationModel> listAsync(final String location, final String resourceGroupName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAlias.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAlias.java
new file mode 100644
index 000000000000..97c22169313c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAlias.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableServiceAliasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing AvailableServiceAlias.
+ */
+public interface AvailableServiceAlias extends HasInner<AvailableServiceAliasInner>, HasManager<NetworkManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the resourceName value.
+     */
+    String resourceName();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAliases.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAliases.java
new file mode 100644
index 000000000000..9da74fd3e50a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AvailableServiceAliases.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableServiceAliasesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AvailableServiceAliases.
+ */
+public interface AvailableServiceAliases extends HasInner<AvailableServiceAliasesInner> {
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailableServiceAlias> listByResourceGroupAsync(final String resourceGroupName, final String location);
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailableServiceAlias> listAsync(final String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureAsyncOperationResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureAsyncOperationResult.java
new file mode 100644
index 000000000000..c8af494f87b9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureAsyncOperationResult.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The response body contains the status of the specified asynchronous
+ * operation, indicating whether it has succeeded, is in progress, or has
+ * failed. Note that this status is distinct from the HTTP status code returned
+ * for the Get Operation Status operation itself. If the asynchronous operation
+ * succeeded, the response body includes the HTTP status code for the
+ * successful request. If the asynchronous operation failed, the response body
+ * includes the HTTP status code for the failed request and error information
+ * regarding the failure.
+ */
+public class AzureAsyncOperationResult {
+    /**
+     * Status of the Azure async operation. Possible values include:
+     * 'InProgress', 'Succeeded', 'Failed'.
+     */
+    @JsonProperty(value = "status")
+    private NetworkOperationStatus status;
+
+    /**
+     * Details of the error occurred during specified asynchronous operation.
+     */
+    @JsonProperty(value = "error")
+    private Error error;
+
+    /**
+     * Get status of the Azure async operation. Possible values include: 'InProgress', 'Succeeded', 'Failed'.
+     *
+     * @return the status value
+     */
+    public NetworkOperationStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Set status of the Azure async operation. Possible values include: 'InProgress', 'Succeeded', 'Failed'.
+     *
+     * @param status the status value to set
+     * @return the AzureAsyncOperationResult object itself.
+     */
+    public AzureAsyncOperationResult withStatus(NetworkOperationStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get details of the error occurred during specified asynchronous operation.
+     *
+     * @return the error value
+     */
+    public Error error() {
+        return this.error;
+    }
+
+    /**
+     * Set details of the error occurred during specified asynchronous operation.
+     *
+     * @param error the error value to set
+     * @return the AzureAsyncOperationResult object itself.
+     */
+    public AzureAsyncOperationResult withError(Error error) {
+        this.error = error;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewall.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewall.java
new file mode 100644
index 000000000000..1b4c40b651f3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewall.java
@@ -0,0 +1,410 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AzureFirewallInner;
+
+/**
+ * Type representing AzureFirewall.
+ */
+public interface AzureFirewall extends HasInner<AzureFirewallInner>, Resource, GroupableResourceCore<NetworkManager, AzureFirewallInner>, HasResourceGroup, Refreshable<AzureFirewall>, Updatable<AzureFirewall.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the additionalProperties value.
+     */
+    Map<String, String> additionalProperties();
+
+    /**
+     * @return the applicationRuleCollections value.
+     */
+    List<AzureFirewallApplicationRuleCollection> applicationRuleCollections();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the firewallPolicy value.
+     */
+    SubResource firewallPolicy();
+
+    /**
+     * @return the hubIpAddresses value.
+     */
+    HubIPAddresses hubIpAddresses();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<AzureFirewallIPConfiguration> ipConfigurations();
+
+    /**
+     * @return the ipGroups value.
+     */
+    List<AzureFirewallIpGroups> ipGroups();
+
+    /**
+     * @return the managementIpConfiguration value.
+     */
+    AzureFirewallIPConfiguration managementIpConfiguration();
+
+    /**
+     * @return the natRuleCollections value.
+     */
+    List<AzureFirewallNatRuleCollection> natRuleCollections();
+
+    /**
+     * @return the networkRuleCollections value.
+     */
+    List<AzureFirewallNetworkRuleCollection> networkRuleCollections();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the sku value.
+     */
+    AzureFirewallSku sku();
+
+    /**
+     * @return the threatIntelMode value.
+     */
+    AzureFirewallThreatIntelMode threatIntelMode();
+
+    /**
+     * @return the virtualHub value.
+     */
+    SubResource virtualHub();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * The entirety of the AzureFirewall definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of AzureFirewall definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a AzureFirewall definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the AzureFirewall definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify AdditionalProperties.
+         */
+        interface WithAdditionalProperties {
+            /**
+             * Specifies additionalProperties.
+             * @param additionalProperties The additional properties used to further config this azure firewall
+             * @return the next definition stage
+             */
+            WithCreate withAdditionalProperties(Map<String, String> additionalProperties);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify ApplicationRuleCollections.
+         */
+        interface WithApplicationRuleCollections {
+            /**
+             * Specifies applicationRuleCollections.
+             * @param applicationRuleCollections Collection of application rule collections used by Azure Firewall
+             * @return the next definition stage
+             */
+            WithCreate withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify FirewallPolicy.
+         */
+        interface WithFirewallPolicy {
+            /**
+             * Specifies firewallPolicy.
+             * @param firewallPolicy The firewallPolicy associated with this azure firewall
+             * @return the next definition stage
+             */
+            WithCreate withFirewallPolicy(SubResource firewallPolicy);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configuration of the Azure Firewall resource
+             * @return the next definition stage
+             */
+            WithCreate withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify ManagementIpConfiguration.
+         */
+        interface WithManagementIpConfiguration {
+            /**
+             * Specifies managementIpConfiguration.
+             * @param managementIpConfiguration IP configuration of the Azure Firewall used for management traffic
+             * @return the next definition stage
+             */
+            WithCreate withManagementIpConfiguration(AzureFirewallIPConfiguration managementIpConfiguration);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify NatRuleCollections.
+         */
+        interface WithNatRuleCollections {
+            /**
+             * Specifies natRuleCollections.
+             * @param natRuleCollections Collection of NAT rule collections used by Azure Firewall
+             * @return the next definition stage
+             */
+            WithCreate withNatRuleCollections(List<AzureFirewallNatRuleCollection> natRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify NetworkRuleCollections.
+         */
+        interface WithNetworkRuleCollections {
+            /**
+             * Specifies networkRuleCollections.
+             * @param networkRuleCollections Collection of network rule collections used by Azure Firewall
+             * @return the next definition stage
+             */
+            WithCreate withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The Azure Firewall Resource SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(AzureFirewallSku sku);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify ThreatIntelMode.
+         */
+        interface WithThreatIntelMode {
+            /**
+             * Specifies threatIntelMode.
+             * @param threatIntelMode The operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'
+             * @return the next definition stage
+             */
+            WithCreate withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The virtualHub to which the firewall belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the azurefirewall definition allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting where the resource needs to come from
+             * @return the next definition stage
+             */
+            WithCreate withZones(List<String> zones);
+        }
+
+        /**
+         * 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<AzureFirewall>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdditionalProperties, DefinitionStages.WithApplicationRuleCollections, DefinitionStages.WithFirewallPolicy, DefinitionStages.WithIpConfigurations, DefinitionStages.WithManagementIpConfiguration, DefinitionStages.WithNatRuleCollections, DefinitionStages.WithNetworkRuleCollections, DefinitionStages.WithSku, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithVirtualHub, DefinitionStages.WithZones {
+        }
+    }
+    /**
+     * The template for a AzureFirewall update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<AzureFirewall>, Resource.UpdateWithTags<Update>, UpdateStages.WithAdditionalProperties, UpdateStages.WithApplicationRuleCollections, UpdateStages.WithFirewallPolicy, UpdateStages.WithIpConfigurations, UpdateStages.WithManagementIpConfiguration, UpdateStages.WithNatRuleCollections, UpdateStages.WithNetworkRuleCollections, UpdateStages.WithSku, UpdateStages.WithThreatIntelMode, UpdateStages.WithVirtualHub, UpdateStages.WithZones {
+    }
+
+    /**
+     * Grouping of AzureFirewall update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the azurefirewall update allowing to specify AdditionalProperties.
+         */
+        interface WithAdditionalProperties {
+            /**
+             * Specifies additionalProperties.
+             * @param additionalProperties The additional properties used to further config this azure firewall
+             * @return the next update stage
+             */
+            Update withAdditionalProperties(Map<String, String> additionalProperties);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify ApplicationRuleCollections.
+         */
+        interface WithApplicationRuleCollections {
+            /**
+             * Specifies applicationRuleCollections.
+             * @param applicationRuleCollections Collection of application rule collections used by Azure Firewall
+             * @return the next update stage
+             */
+            Update withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify FirewallPolicy.
+         */
+        interface WithFirewallPolicy {
+            /**
+             * Specifies firewallPolicy.
+             * @param firewallPolicy The firewallPolicy associated with this azure firewall
+             * @return the next update stage
+             */
+            Update withFirewallPolicy(SubResource firewallPolicy);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configuration of the Azure Firewall resource
+             * @return the next update stage
+             */
+            Update withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify ManagementIpConfiguration.
+         */
+        interface WithManagementIpConfiguration {
+            /**
+             * Specifies managementIpConfiguration.
+             * @param managementIpConfiguration IP configuration of the Azure Firewall used for management traffic
+             * @return the next update stage
+             */
+            Update withManagementIpConfiguration(AzureFirewallIPConfiguration managementIpConfiguration);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify NatRuleCollections.
+         */
+        interface WithNatRuleCollections {
+            /**
+             * Specifies natRuleCollections.
+             * @param natRuleCollections Collection of NAT rule collections used by Azure Firewall
+             * @return the next update stage
+             */
+            Update withNatRuleCollections(List<AzureFirewallNatRuleCollection> natRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify NetworkRuleCollections.
+         */
+        interface WithNetworkRuleCollections {
+            /**
+             * Specifies networkRuleCollections.
+             * @param networkRuleCollections Collection of network rule collections used by Azure Firewall
+             * @return the next update stage
+             */
+            Update withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The Azure Firewall Resource SKU
+             * @return the next update stage
+             */
+            Update withSku(AzureFirewallSku sku);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify ThreatIntelMode.
+         */
+        interface WithThreatIntelMode {
+            /**
+             * Specifies threatIntelMode.
+             * @param threatIntelMode The operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'
+             * @return the next update stage
+             */
+            Update withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The virtualHub to which the firewall belongs
+             * @return the next update stage
+             */
+            Update withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the azurefirewall update allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting where the resource needs to come from
+             * @return the next update stage
+             */
+            Update withZones(List<String> zones);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRule.java
new file mode 100644
index 000000000000..694cb64c562a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRule.java
@@ -0,0 +1,200 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of an application rule.
+ */
+public class AzureFirewallApplicationRule {
+    /**
+     * Name of the application rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Description of the rule.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * Array of ApplicationRuleProtocols.
+     */
+    @JsonProperty(value = "protocols")
+    private List<AzureFirewallApplicationRuleProtocol> protocols;
+
+    /**
+     * List of FQDNs for this rule.
+     */
+    @JsonProperty(value = "targetFqdns")
+    private List<String> targetFqdns;
+
+    /**
+     * List of FQDN Tags for this rule.
+     */
+    @JsonProperty(value = "fqdnTags")
+    private List<String> fqdnTags;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * Get name of the application rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the application rule.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get description of the rule.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the rule.
+     *
+     * @param description the description value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get array of ApplicationRuleProtocols.
+     *
+     * @return the protocols value
+     */
+    public List<AzureFirewallApplicationRuleProtocol> protocols() {
+        return this.protocols;
+    }
+
+    /**
+     * Set array of ApplicationRuleProtocols.
+     *
+     * @param protocols the protocols value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withProtocols(List<AzureFirewallApplicationRuleProtocol> protocols) {
+        this.protocols = protocols;
+        return this;
+    }
+
+    /**
+     * Get list of FQDNs for this rule.
+     *
+     * @return the targetFqdns value
+     */
+    public List<String> targetFqdns() {
+        return this.targetFqdns;
+    }
+
+    /**
+     * Set list of FQDNs for this rule.
+     *
+     * @param targetFqdns the targetFqdns value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withTargetFqdns(List<String> targetFqdns) {
+        this.targetFqdns = targetFqdns;
+        return this;
+    }
+
+    /**
+     * Get list of FQDN Tags for this rule.
+     *
+     * @return the fqdnTags value
+     */
+    public List<String> fqdnTags() {
+        return this.fqdnTags;
+    }
+
+    /**
+     * Set list of FQDN Tags for this rule.
+     *
+     * @param fqdnTags the fqdnTags value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withFqdnTags(List<String> fqdnTags) {
+        this.fqdnTags = fqdnTags;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the AzureFirewallApplicationRule object itself.
+     */
+    public AzureFirewallApplicationRule withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleCollection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleCollection.java
new file mode 100644
index 000000000000..2848a42aa360
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleCollection.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Application rule collection resource.
+ */
+@JsonFlatten
+public class AzureFirewallApplicationRuleCollection extends SubResource {
+    /**
+     * Priority of the application rule collection resource.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * The action type of a rule collection.
+     */
+    @JsonProperty(value = "properties.action")
+    private AzureFirewallRCAction action;
+
+    /**
+     * Collection of rules used by a application rule collection.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<AzureFirewallApplicationRule> rules;
+
+    /**
+     * The provisioning state of the application rule collection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the Azure firewall. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get priority of the application rule collection resource.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the application rule collection resource.
+     *
+     * @param priority the priority value to set
+     * @return the AzureFirewallApplicationRuleCollection object itself.
+     */
+    public AzureFirewallApplicationRuleCollection withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the action type of a rule collection.
+     *
+     * @return the action value
+     */
+    public AzureFirewallRCAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action type of a rule collection.
+     *
+     * @param action the action value to set
+     * @return the AzureFirewallApplicationRuleCollection object itself.
+     */
+    public AzureFirewallApplicationRuleCollection withAction(AzureFirewallRCAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get collection of rules used by a application rule collection.
+     *
+     * @return the rules value
+     */
+    public List<AzureFirewallApplicationRule> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set collection of rules used by a application rule collection.
+     *
+     * @param rules the rules value to set
+     * @return the AzureFirewallApplicationRuleCollection object itself.
+     */
+    public AzureFirewallApplicationRuleCollection withRules(List<AzureFirewallApplicationRule> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the application rule collection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallApplicationRuleCollection object itself.
+     */
+    public AzureFirewallApplicationRuleCollection withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocol.java
new file mode 100644
index 000000000000..b408dddbf82d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocol.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the application rule protocol.
+ */
+public class AzureFirewallApplicationRuleProtocol {
+    /**
+     * Protocol type. Possible values include: 'Http', 'Https', 'Mssql'.
+     */
+    @JsonProperty(value = "protocolType")
+    private AzureFirewallApplicationRuleProtocolType protocolType;
+
+    /**
+     * Port number for the protocol, cannot be greater than 64000. This field
+     * is optional.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get protocol type. Possible values include: 'Http', 'Https', 'Mssql'.
+     *
+     * @return the protocolType value
+     */
+    public AzureFirewallApplicationRuleProtocolType protocolType() {
+        return this.protocolType;
+    }
+
+    /**
+     * Set protocol type. Possible values include: 'Http', 'Https', 'Mssql'.
+     *
+     * @param protocolType the protocolType value to set
+     * @return the AzureFirewallApplicationRuleProtocol object itself.
+     */
+    public AzureFirewallApplicationRuleProtocol withProtocolType(AzureFirewallApplicationRuleProtocolType protocolType) {
+        this.protocolType = protocolType;
+        return this;
+    }
+
+    /**
+     * Get port number for the protocol, cannot be greater than 64000. This field is optional.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set port number for the protocol, cannot be greater than 64000. This field is optional.
+     *
+     * @param port the port value to set
+     * @return the AzureFirewallApplicationRuleProtocol object itself.
+     */
+    public AzureFirewallApplicationRuleProtocol withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocolType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocolType.java
new file mode 100644
index 000000000000..283c0a0aef14
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallApplicationRuleProtocolType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallApplicationRuleProtocolType.
+ */
+public final class AzureFirewallApplicationRuleProtocolType extends ExpandableStringEnum<AzureFirewallApplicationRuleProtocolType> {
+    /** Static value Http for AzureFirewallApplicationRuleProtocolType. */
+    public static final AzureFirewallApplicationRuleProtocolType HTTP = fromString("Http");
+
+    /** Static value Https for AzureFirewallApplicationRuleProtocolType. */
+    public static final AzureFirewallApplicationRuleProtocolType HTTPS = fromString("Https");
+
+    /** Static value Mssql for AzureFirewallApplicationRuleProtocolType. */
+    public static final AzureFirewallApplicationRuleProtocolType MSSQL = fromString("Mssql");
+
+    /**
+     * Creates or finds a AzureFirewallApplicationRuleProtocolType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallApplicationRuleProtocolType
+     */
+    @JsonCreator
+    public static AzureFirewallApplicationRuleProtocolType fromString(String name) {
+        return fromString(name, AzureFirewallApplicationRuleProtocolType.class);
+    }
+
+    /**
+     * @return known AzureFirewallApplicationRuleProtocolType values
+     */
+    public static Collection<AzureFirewallApplicationRuleProtocolType> values() {
+        return values(AzureFirewallApplicationRuleProtocolType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTag.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTag.java
new file mode 100644
index 000000000000..eb57216a71b4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTag.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.network.v2020_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.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AzureFirewallFqdnTagInner;
+
+/**
+ * Type representing AzureFirewallFqdnTag.
+ */
+public interface AzureFirewallFqdnTag extends HasInner<AzureFirewallFqdnTagInner>, Resource, GroupableResourceCore<NetworkManager, AzureFirewallFqdnTagInner>, HasResourceGroup, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the fqdnTagName value.
+     */
+    String fqdnTagName();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTags.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTags.java
new file mode 100644
index 000000000000..f282cadd2b04
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallFqdnTags.java
@@ -0,0 +1,19 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AzureFirewallFqdnTagsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AzureFirewallFqdnTags.
+ */
+public interface AzureFirewallFqdnTags extends SupportsListing<AzureFirewallFqdnTag>, HasInner<AzureFirewallFqdnTagsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIPConfiguration.java
new file mode 100644
index 000000000000..6e396c18076f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIPConfiguration.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * IP configuration of an Azure Firewall.
+ */
+@JsonFlatten
+public class AzureFirewallIPConfiguration extends SubResource {
+    /**
+     * The Firewall Internal Load Balancer IP to be used as the next hop in
+     * User Defined Routes.
+     */
+    @JsonProperty(value = "properties.privateIPAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String privateIPAddress;
+
+    /**
+     * Reference to the subnet resource. This resource must be named
+     * 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubResource subnet;
+
+    /**
+     * Reference to the PublicIP resource. This field is a mandatory input if
+     * subnet is not null.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private SubResource publicIPAddress;
+
+    /**
+     * The provisioning state of the Azure firewall IP configuration resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the Firewall Internal Load Balancer IP to be used as the next hop in User Defined Routes.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Get reference to the subnet resource. This resource must be named 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set reference to the subnet resource. This resource must be named 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'.
+     *
+     * @param subnet the subnet value to set
+     * @return the AzureFirewallIPConfiguration object itself.
+     */
+    public AzureFirewallIPConfiguration withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get reference to the PublicIP resource. This field is a mandatory input if subnet is not null.
+     *
+     * @return the publicIPAddress value
+     */
+    public SubResource publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set reference to the PublicIP resource. This field is a mandatory input if subnet is not null.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the AzureFirewallIPConfiguration object itself.
+     */
+    public AzureFirewallIPConfiguration withPublicIPAddress(SubResource publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the Azure firewall IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallIPConfiguration object itself.
+     */
+    public AzureFirewallIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIpGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIpGroups.java
new file mode 100644
index 000000000000..e6d9efedf18f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallIpGroups.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * IpGroups associated with azure firewall.
+ */
+public class AzureFirewallIpGroups {
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * The iteration number.
+     */
+    @JsonProperty(value = "changeNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private String changeNumber;
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the iteration number.
+     *
+     * @return the changeNumber value
+     */
+    public String changeNumber() {
+        return this.changeNumber;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCAction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCAction.java
new file mode 100644
index 000000000000..4172b2ee5cb4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCAction.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * AzureFirewall NAT Rule Collection Action.
+ */
+public class AzureFirewallNatRCAction {
+    /**
+     * The type of action. Possible values include: 'Snat', 'Dnat'.
+     */
+    @JsonProperty(value = "type")
+    private AzureFirewallNatRCActionType type;
+
+    /**
+     * Get the type of action. Possible values include: 'Snat', 'Dnat'.
+     *
+     * @return the type value
+     */
+    public AzureFirewallNatRCActionType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of action. Possible values include: 'Snat', 'Dnat'.
+     *
+     * @param type the type value to set
+     * @return the AzureFirewallNatRCAction object itself.
+     */
+    public AzureFirewallNatRCAction withType(AzureFirewallNatRCActionType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCActionType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCActionType.java
new file mode 100644
index 000000000000..009d1e813afd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRCActionType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallNatRCActionType.
+ */
+public final class AzureFirewallNatRCActionType extends ExpandableStringEnum<AzureFirewallNatRCActionType> {
+    /** Static value Snat for AzureFirewallNatRCActionType. */
+    public static final AzureFirewallNatRCActionType SNAT = fromString("Snat");
+
+    /** Static value Dnat for AzureFirewallNatRCActionType. */
+    public static final AzureFirewallNatRCActionType DNAT = fromString("Dnat");
+
+    /**
+     * Creates or finds a AzureFirewallNatRCActionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallNatRCActionType
+     */
+    @JsonCreator
+    public static AzureFirewallNatRCActionType fromString(String name) {
+        return fromString(name, AzureFirewallNatRCActionType.class);
+    }
+
+    /**
+     * @return known AzureFirewallNatRCActionType values
+     */
+    public static Collection<AzureFirewallNatRCActionType> values() {
+        return values(AzureFirewallNatRCActionType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRule.java
new file mode 100644
index 000000000000..2522b67ab003
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRule.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.
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of a NAT rule.
+ */
+public class AzureFirewallNatRule {
+    /**
+     * Name of the NAT rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Description of the rule.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * List of destination IP addresses for this rule. Supports IP ranges,
+     * prefixes, and service tags.
+     */
+    @JsonProperty(value = "destinationAddresses")
+    private List<String> destinationAddresses;
+
+    /**
+     * List of destination ports.
+     */
+    @JsonProperty(value = "destinationPorts")
+    private List<String> destinationPorts;
+
+    /**
+     * Array of AzureFirewallNetworkRuleProtocols applicable to this NAT rule.
+     */
+    @JsonProperty(value = "protocols")
+    private List<AzureFirewallNetworkRuleProtocol> protocols;
+
+    /**
+     * The translated address for this NAT rule.
+     */
+    @JsonProperty(value = "translatedAddress")
+    private String translatedAddress;
+
+    /**
+     * The translated port for this NAT rule.
+     */
+    @JsonProperty(value = "translatedPort")
+    private String translatedPort;
+
+    /**
+     * The translated FQDN for this NAT rule.
+     */
+    @JsonProperty(value = "translatedFqdn")
+    private String translatedFqdn;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * Get name of the NAT rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the NAT rule.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get description of the rule.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the rule.
+     *
+     * @param description the description value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination IP addresses for this rule. Supports IP ranges, prefixes, and service tags.
+     *
+     * @return the destinationAddresses value
+     */
+    public List<String> destinationAddresses() {
+        return this.destinationAddresses;
+    }
+
+    /**
+     * Set list of destination IP addresses for this rule. Supports IP ranges, prefixes, and service tags.
+     *
+     * @param destinationAddresses the destinationAddresses value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withDestinationAddresses(List<String> destinationAddresses) {
+        this.destinationAddresses = destinationAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination ports.
+     *
+     * @return the destinationPorts value
+     */
+    public List<String> destinationPorts() {
+        return this.destinationPorts;
+    }
+
+    /**
+     * Set list of destination ports.
+     *
+     * @param destinationPorts the destinationPorts value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withDestinationPorts(List<String> destinationPorts) {
+        this.destinationPorts = destinationPorts;
+        return this;
+    }
+
+    /**
+     * Get array of AzureFirewallNetworkRuleProtocols applicable to this NAT rule.
+     *
+     * @return the protocols value
+     */
+    public List<AzureFirewallNetworkRuleProtocol> protocols() {
+        return this.protocols;
+    }
+
+    /**
+     * Set array of AzureFirewallNetworkRuleProtocols applicable to this NAT rule.
+     *
+     * @param protocols the protocols value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withProtocols(List<AzureFirewallNetworkRuleProtocol> protocols) {
+        this.protocols = protocols;
+        return this;
+    }
+
+    /**
+     * Get the translated address for this NAT rule.
+     *
+     * @return the translatedAddress value
+     */
+    public String translatedAddress() {
+        return this.translatedAddress;
+    }
+
+    /**
+     * Set the translated address for this NAT rule.
+     *
+     * @param translatedAddress the translatedAddress value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withTranslatedAddress(String translatedAddress) {
+        this.translatedAddress = translatedAddress;
+        return this;
+    }
+
+    /**
+     * Get the translated port for this NAT rule.
+     *
+     * @return the translatedPort value
+     */
+    public String translatedPort() {
+        return this.translatedPort;
+    }
+
+    /**
+     * Set the translated port for this NAT rule.
+     *
+     * @param translatedPort the translatedPort value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withTranslatedPort(String translatedPort) {
+        this.translatedPort = translatedPort;
+        return this;
+    }
+
+    /**
+     * Get the translated FQDN for this NAT rule.
+     *
+     * @return the translatedFqdn value
+     */
+    public String translatedFqdn() {
+        return this.translatedFqdn;
+    }
+
+    /**
+     * Set the translated FQDN for this NAT rule.
+     *
+     * @param translatedFqdn the translatedFqdn value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withTranslatedFqdn(String translatedFqdn) {
+        this.translatedFqdn = translatedFqdn;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the AzureFirewallNatRule object itself.
+     */
+    public AzureFirewallNatRule withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRuleCollection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRuleCollection.java
new file mode 100644
index 000000000000..92652a44fbc8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNatRuleCollection.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * NAT rule collection resource.
+ */
+@JsonFlatten
+public class AzureFirewallNatRuleCollection extends SubResource {
+    /**
+     * Priority of the NAT rule collection resource.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * The action type of a NAT rule collection.
+     */
+    @JsonProperty(value = "properties.action")
+    private AzureFirewallNatRCAction action;
+
+    /**
+     * Collection of rules used by a NAT rule collection.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<AzureFirewallNatRule> rules;
+
+    /**
+     * The provisioning state of the NAT rule collection resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the Azure firewall. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get priority of the NAT rule collection resource.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the NAT rule collection resource.
+     *
+     * @param priority the priority value to set
+     * @return the AzureFirewallNatRuleCollection object itself.
+     */
+    public AzureFirewallNatRuleCollection withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the action type of a NAT rule collection.
+     *
+     * @return the action value
+     */
+    public AzureFirewallNatRCAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action type of a NAT rule collection.
+     *
+     * @param action the action value to set
+     * @return the AzureFirewallNatRuleCollection object itself.
+     */
+    public AzureFirewallNatRuleCollection withAction(AzureFirewallNatRCAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get collection of rules used by a NAT rule collection.
+     *
+     * @return the rules value
+     */
+    public List<AzureFirewallNatRule> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set collection of rules used by a NAT rule collection.
+     *
+     * @param rules the rules value to set
+     * @return the AzureFirewallNatRuleCollection object itself.
+     */
+    public AzureFirewallNatRuleCollection withRules(List<AzureFirewallNatRule> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the NAT rule collection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallNatRuleCollection object itself.
+     */
+    public AzureFirewallNatRuleCollection withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRule.java
new file mode 100644
index 000000000000..d24528669ffa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRule.java
@@ -0,0 +1,252 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the network rule.
+ */
+public class AzureFirewallNetworkRule {
+    /**
+     * Name of the network rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Description of the rule.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Array of AzureFirewallNetworkRuleProtocols.
+     */
+    @JsonProperty(value = "protocols")
+    private List<AzureFirewallNetworkRuleProtocol> protocols;
+
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * List of destination IP addresses.
+     */
+    @JsonProperty(value = "destinationAddresses")
+    private List<String> destinationAddresses;
+
+    /**
+     * List of destination ports.
+     */
+    @JsonProperty(value = "destinationPorts")
+    private List<String> destinationPorts;
+
+    /**
+     * List of destination FQDNs.
+     */
+    @JsonProperty(value = "destinationFqdns")
+    private List<String> destinationFqdns;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * List of destination IpGroups for this rule.
+     */
+    @JsonProperty(value = "destinationIpGroups")
+    private List<String> destinationIpGroups;
+
+    /**
+     * Get name of the network rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the network rule.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get description of the rule.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the rule.
+     *
+     * @param description the description value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get array of AzureFirewallNetworkRuleProtocols.
+     *
+     * @return the protocols value
+     */
+    public List<AzureFirewallNetworkRuleProtocol> protocols() {
+        return this.protocols;
+    }
+
+    /**
+     * Set array of AzureFirewallNetworkRuleProtocols.
+     *
+     * @param protocols the protocols value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withProtocols(List<AzureFirewallNetworkRuleProtocol> protocols) {
+        this.protocols = protocols;
+        return this;
+    }
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination IP addresses.
+     *
+     * @return the destinationAddresses value
+     */
+    public List<String> destinationAddresses() {
+        return this.destinationAddresses;
+    }
+
+    /**
+     * Set list of destination IP addresses.
+     *
+     * @param destinationAddresses the destinationAddresses value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withDestinationAddresses(List<String> destinationAddresses) {
+        this.destinationAddresses = destinationAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination ports.
+     *
+     * @return the destinationPorts value
+     */
+    public List<String> destinationPorts() {
+        return this.destinationPorts;
+    }
+
+    /**
+     * Set list of destination ports.
+     *
+     * @param destinationPorts the destinationPorts value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withDestinationPorts(List<String> destinationPorts) {
+        this.destinationPorts = destinationPorts;
+        return this;
+    }
+
+    /**
+     * Get list of destination FQDNs.
+     *
+     * @return the destinationFqdns value
+     */
+    public List<String> destinationFqdns() {
+        return this.destinationFqdns;
+    }
+
+    /**
+     * Set list of destination FQDNs.
+     *
+     * @param destinationFqdns the destinationFqdns value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withDestinationFqdns(List<String> destinationFqdns) {
+        this.destinationFqdns = destinationFqdns;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+    /**
+     * Get list of destination IpGroups for this rule.
+     *
+     * @return the destinationIpGroups value
+     */
+    public List<String> destinationIpGroups() {
+        return this.destinationIpGroups;
+    }
+
+    /**
+     * Set list of destination IpGroups for this rule.
+     *
+     * @param destinationIpGroups the destinationIpGroups value to set
+     * @return the AzureFirewallNetworkRule object itself.
+     */
+    public AzureFirewallNetworkRule withDestinationIpGroups(List<String> destinationIpGroups) {
+        this.destinationIpGroups = destinationIpGroups;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleCollection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleCollection.java
new file mode 100644
index 000000000000..bfa68b655797
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleCollection.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Network rule collection resource.
+ */
+@JsonFlatten
+public class AzureFirewallNetworkRuleCollection extends SubResource {
+    /**
+     * Priority of the network rule collection resource.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * The action type of a rule collection.
+     */
+    @JsonProperty(value = "properties.action")
+    private AzureFirewallRCAction action;
+
+    /**
+     * Collection of rules used by a network rule collection.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<AzureFirewallNetworkRule> rules;
+
+    /**
+     * The provisioning state of the network rule collection resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the Azure firewall. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get priority of the network rule collection resource.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the network rule collection resource.
+     *
+     * @param priority the priority value to set
+     * @return the AzureFirewallNetworkRuleCollection object itself.
+     */
+    public AzureFirewallNetworkRuleCollection withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the action type of a rule collection.
+     *
+     * @return the action value
+     */
+    public AzureFirewallRCAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action type of a rule collection.
+     *
+     * @param action the action value to set
+     * @return the AzureFirewallNetworkRuleCollection object itself.
+     */
+    public AzureFirewallNetworkRuleCollection withAction(AzureFirewallRCAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get collection of rules used by a network rule collection.
+     *
+     * @return the rules value
+     */
+    public List<AzureFirewallNetworkRule> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set collection of rules used by a network rule collection.
+     *
+     * @param rules the rules value to set
+     * @return the AzureFirewallNetworkRuleCollection object itself.
+     */
+    public AzureFirewallNetworkRuleCollection withRules(List<AzureFirewallNetworkRule> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the network rule collection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the Azure firewall. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallNetworkRuleCollection object itself.
+     */
+    public AzureFirewallNetworkRuleCollection withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleProtocol.java
new file mode 100644
index 000000000000..d63056492b1b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallNetworkRuleProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallNetworkRuleProtocol.
+ */
+public final class AzureFirewallNetworkRuleProtocol extends ExpandableStringEnum<AzureFirewallNetworkRuleProtocol> {
+    /** Static value TCP for AzureFirewallNetworkRuleProtocol. */
+    public static final AzureFirewallNetworkRuleProtocol TCP = fromString("TCP");
+
+    /** Static value UDP for AzureFirewallNetworkRuleProtocol. */
+    public static final AzureFirewallNetworkRuleProtocol UDP = fromString("UDP");
+
+    /** Static value Any for AzureFirewallNetworkRuleProtocol. */
+    public static final AzureFirewallNetworkRuleProtocol ANY = fromString("Any");
+
+    /** Static value ICMP for AzureFirewallNetworkRuleProtocol. */
+    public static final AzureFirewallNetworkRuleProtocol ICMP = fromString("ICMP");
+
+    /**
+     * Creates or finds a AzureFirewallNetworkRuleProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallNetworkRuleProtocol
+     */
+    @JsonCreator
+    public static AzureFirewallNetworkRuleProtocol fromString(String name) {
+        return fromString(name, AzureFirewallNetworkRuleProtocol.class);
+    }
+
+    /**
+     * @return known AzureFirewallNetworkRuleProtocol values
+     */
+    public static Collection<AzureFirewallNetworkRuleProtocol> values() {
+        return values(AzureFirewallNetworkRuleProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallPublicIPAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallPublicIPAddress.java
new file mode 100644
index 000000000000..c2798c26913e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallPublicIPAddress.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Public IP Address associated with azure firewall.
+ */
+public class AzureFirewallPublicIPAddress {
+    /**
+     * Public IP Address value.
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * Get public IP Address value.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set public IP Address value.
+     *
+     * @param address the address value to set
+     * @return the AzureFirewallPublicIPAddress object itself.
+     */
+    public AzureFirewallPublicIPAddress withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCAction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCAction.java
new file mode 100644
index 000000000000..8d73fbedf413
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCAction.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the AzureFirewallRCAction.
+ */
+public class AzureFirewallRCAction {
+    /**
+     * The type of action. Possible values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "type")
+    private AzureFirewallRCActionType type;
+
+    /**
+     * Get the type of action. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the type value
+     */
+    public AzureFirewallRCActionType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of action. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param type the type value to set
+     * @return the AzureFirewallRCAction object itself.
+     */
+    public AzureFirewallRCAction withType(AzureFirewallRCActionType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCActionType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCActionType.java
new file mode 100644
index 000000000000..26c2e41dfa78
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallRCActionType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallRCActionType.
+ */
+public final class AzureFirewallRCActionType extends ExpandableStringEnum<AzureFirewallRCActionType> {
+    /** Static value Allow for AzureFirewallRCActionType. */
+    public static final AzureFirewallRCActionType ALLOW = fromString("Allow");
+
+    /** Static value Deny for AzureFirewallRCActionType. */
+    public static final AzureFirewallRCActionType DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a AzureFirewallRCActionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallRCActionType
+     */
+    @JsonCreator
+    public static AzureFirewallRCActionType fromString(String name) {
+        return fromString(name, AzureFirewallRCActionType.class);
+    }
+
+    /**
+     * @return known AzureFirewallRCActionType values
+     */
+    public static Collection<AzureFirewallRCActionType> values() {
+        return values(AzureFirewallRCActionType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSku.java
new file mode 100644
index 000000000000..d8c2035a17c4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSku.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of an Azure Firewall.
+ */
+public class AzureFirewallSku {
+    /**
+     * Name of an Azure Firewall SKU. Possible values include: 'AZFW_VNet',
+     * 'AZFW_Hub'.
+     */
+    @JsonProperty(value = "name")
+    private AzureFirewallSkuName name;
+
+    /**
+     * Tier of an Azure Firewall. Possible values include: 'Standard',
+     * 'Premium'.
+     */
+    @JsonProperty(value = "tier")
+    private AzureFirewallSkuTier tier;
+
+    /**
+     * Get name of an Azure Firewall SKU. Possible values include: 'AZFW_VNet', 'AZFW_Hub'.
+     *
+     * @return the name value
+     */
+    public AzureFirewallSkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of an Azure Firewall SKU. Possible values include: 'AZFW_VNet', 'AZFW_Hub'.
+     *
+     * @param name the name value to set
+     * @return the AzureFirewallSku object itself.
+     */
+    public AzureFirewallSku withName(AzureFirewallSkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get tier of an Azure Firewall. Possible values include: 'Standard', 'Premium'.
+     *
+     * @return the tier value
+     */
+    public AzureFirewallSkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set tier of an Azure Firewall. Possible values include: 'Standard', 'Premium'.
+     *
+     * @param tier the tier value to set
+     * @return the AzureFirewallSku object itself.
+     */
+    public AzureFirewallSku withTier(AzureFirewallSkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuName.java
new file mode 100644
index 000000000000..9001c5bcc012
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallSkuName.
+ */
+public final class AzureFirewallSkuName extends ExpandableStringEnum<AzureFirewallSkuName> {
+    /** Static value AZFW_VNet for AzureFirewallSkuName. */
+    public static final AzureFirewallSkuName AZFW_VNET = fromString("AZFW_VNet");
+
+    /** Static value AZFW_Hub for AzureFirewallSkuName. */
+    public static final AzureFirewallSkuName AZFW_HUB = fromString("AZFW_Hub");
+
+    /**
+     * Creates or finds a AzureFirewallSkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallSkuName
+     */
+    @JsonCreator
+    public static AzureFirewallSkuName fromString(String name) {
+        return fromString(name, AzureFirewallSkuName.class);
+    }
+
+    /**
+     * @return known AzureFirewallSkuName values
+     */
+    public static Collection<AzureFirewallSkuName> values() {
+        return values(AzureFirewallSkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuTier.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuTier.java
new file mode 100644
index 000000000000..327d8210ee3c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallSkuTier.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallSkuTier.
+ */
+public final class AzureFirewallSkuTier extends ExpandableStringEnum<AzureFirewallSkuTier> {
+    /** Static value Standard for AzureFirewallSkuTier. */
+    public static final AzureFirewallSkuTier STANDARD = fromString("Standard");
+
+    /** Static value Premium for AzureFirewallSkuTier. */
+    public static final AzureFirewallSkuTier PREMIUM = fromString("Premium");
+
+    /**
+     * Creates or finds a AzureFirewallSkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallSkuTier
+     */
+    @JsonCreator
+    public static AzureFirewallSkuTier fromString(String name) {
+        return fromString(name, AzureFirewallSkuTier.class);
+    }
+
+    /**
+     * @return known AzureFirewallSkuTier values
+     */
+    public static Collection<AzureFirewallSkuTier> values() {
+        return values(AzureFirewallSkuTier.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallThreatIntelMode.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallThreatIntelMode.java
new file mode 100644
index 000000000000..6cfc41490fbf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewallThreatIntelMode.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AzureFirewallThreatIntelMode.
+ */
+public final class AzureFirewallThreatIntelMode extends ExpandableStringEnum<AzureFirewallThreatIntelMode> {
+    /** Static value Alert for AzureFirewallThreatIntelMode. */
+    public static final AzureFirewallThreatIntelMode ALERT = fromString("Alert");
+
+    /** Static value Deny for AzureFirewallThreatIntelMode. */
+    public static final AzureFirewallThreatIntelMode DENY = fromString("Deny");
+
+    /** Static value Off for AzureFirewallThreatIntelMode. */
+    public static final AzureFirewallThreatIntelMode OFF = fromString("Off");
+
+    /**
+     * Creates or finds a AzureFirewallThreatIntelMode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AzureFirewallThreatIntelMode
+     */
+    @JsonCreator
+    public static AzureFirewallThreatIntelMode fromString(String name) {
+        return fromString(name, AzureFirewallThreatIntelMode.class);
+    }
+
+    /**
+     * @return known AzureFirewallThreatIntelMode values
+     */
+    public static Collection<AzureFirewallThreatIntelMode> values() {
+        return values(AzureFirewallThreatIntelMode.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewalls.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewalls.java
new file mode 100644
index 000000000000..8c205b5c19a7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureFirewalls.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.AzureFirewallsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AzureFirewalls.
+ */
+public interface AzureFirewalls extends SupportsCreating<AzureFirewall.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<AzureFirewall>, SupportsListingByResourceGroup<AzureFirewall>, SupportsListing<AzureFirewall>, HasInner<AzureFirewallsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReport.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReport.java
new file mode 100644
index 000000000000..41a936a917bc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReport.java
@@ -0,0 +1,36 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AzureReachabilityReportInner;
+import java.util.List;
+
+/**
+ * Type representing AzureReachabilityReport.
+ */
+public interface AzureReachabilityReport extends HasInner<AzureReachabilityReportInner>, HasManager<NetworkManager> {
+    /**
+     * @return the aggregationLevel value.
+     */
+    String aggregationLevel();
+
+    /**
+     * @return the providerLocation value.
+     */
+    AzureReachabilityReportLocation providerLocation();
+
+    /**
+     * @return the reachabilityReport value.
+     */
+    List<AzureReachabilityReportItem> reachabilityReport();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportItem.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportItem.java
new file mode 100644
index 000000000000..6bf32543d057
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportItem.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Azure reachability report details for a given provider location.
+ */
+public class AzureReachabilityReportItem {
+    /**
+     * The Internet service provider.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * The Azure region.
+     */
+    @JsonProperty(value = "azureLocation")
+    private String azureLocation;
+
+    /**
+     * List of latency details for each of the time series.
+     */
+    @JsonProperty(value = "latencies")
+    private List<AzureReachabilityReportLatencyInfo> latencies;
+
+    /**
+     * Get the Internet service provider.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set the Internet service provider.
+     *
+     * @param provider the provider value to set
+     * @return the AzureReachabilityReportItem object itself.
+     */
+    public AzureReachabilityReportItem withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get the Azure region.
+     *
+     * @return the azureLocation value
+     */
+    public String azureLocation() {
+        return this.azureLocation;
+    }
+
+    /**
+     * Set the Azure region.
+     *
+     * @param azureLocation the azureLocation value to set
+     * @return the AzureReachabilityReportItem object itself.
+     */
+    public AzureReachabilityReportItem withAzureLocation(String azureLocation) {
+        this.azureLocation = azureLocation;
+        return this;
+    }
+
+    /**
+     * Get list of latency details for each of the time series.
+     *
+     * @return the latencies value
+     */
+    public List<AzureReachabilityReportLatencyInfo> latencies() {
+        return this.latencies;
+    }
+
+    /**
+     * Set list of latency details for each of the time series.
+     *
+     * @param latencies the latencies value to set
+     * @return the AzureReachabilityReportItem object itself.
+     */
+    public AzureReachabilityReportItem withLatencies(List<AzureReachabilityReportLatencyInfo> latencies) {
+        this.latencies = latencies;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLatencyInfo.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLatencyInfo.java
new file mode 100644
index 000000000000..512adc0e6a3d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLatencyInfo.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Details on latency for a time series.
+ */
+public class AzureReachabilityReportLatencyInfo {
+    /**
+     * The time stamp.
+     */
+    @JsonProperty(value = "timeStamp")
+    private DateTime timeStamp;
+
+    /**
+     * The relative latency score between 1 and 100, higher values indicating a
+     * faster connection.
+     */
+    @JsonProperty(value = "score")
+    private Integer score;
+
+    /**
+     * Get the time stamp.
+     *
+     * @return the timeStamp value
+     */
+    public DateTime timeStamp() {
+        return this.timeStamp;
+    }
+
+    /**
+     * Set the time stamp.
+     *
+     * @param timeStamp the timeStamp value to set
+     * @return the AzureReachabilityReportLatencyInfo object itself.
+     */
+    public AzureReachabilityReportLatencyInfo withTimeStamp(DateTime timeStamp) {
+        this.timeStamp = timeStamp;
+        return this;
+    }
+
+    /**
+     * Get the relative latency score between 1 and 100, higher values indicating a faster connection.
+     *
+     * @return the score value
+     */
+    public Integer score() {
+        return this.score;
+    }
+
+    /**
+     * Set the relative latency score between 1 and 100, higher values indicating a faster connection.
+     *
+     * @param score the score value to set
+     * @return the AzureReachabilityReportLatencyInfo object itself.
+     */
+    public AzureReachabilityReportLatencyInfo withScore(Integer score) {
+        this.score = score;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLocation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLocation.java
new file mode 100644
index 000000000000..ade514dd75ea
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportLocation.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define a geographic location.
+ */
+public class AzureReachabilityReportLocation {
+    /**
+     * The name of the country.
+     */
+    @JsonProperty(value = "country", required = true)
+    private String country;
+
+    /**
+     * The name of the state.
+     */
+    @JsonProperty(value = "state")
+    private String state;
+
+    /**
+     * The name of the city or town.
+     */
+    @JsonProperty(value = "city")
+    private String city;
+
+    /**
+     * Get the name of the country.
+     *
+     * @return the country value
+     */
+    public String country() {
+        return this.country;
+    }
+
+    /**
+     * Set the name of the country.
+     *
+     * @param country the country value to set
+     * @return the AzureReachabilityReportLocation object itself.
+     */
+    public AzureReachabilityReportLocation withCountry(String country) {
+        this.country = country;
+        return this;
+    }
+
+    /**
+     * Get the name of the state.
+     *
+     * @return the state value
+     */
+    public String state() {
+        return this.state;
+    }
+
+    /**
+     * Set the name of the state.
+     *
+     * @param state the state value to set
+     * @return the AzureReachabilityReportLocation object itself.
+     */
+    public AzureReachabilityReportLocation withState(String state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the name of the city or town.
+     *
+     * @return the city value
+     */
+    public String city() {
+        return this.city;
+    }
+
+    /**
+     * Set the name of the city or town.
+     *
+     * @param city the city value to set
+     * @return the AzureReachabilityReportLocation object itself.
+     */
+    public AzureReachabilityReportLocation withCity(String city) {
+        this.city = city;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportParameters.java
new file mode 100644
index 000000000000..b6c0d9d1b0c7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/AzureReachabilityReportParameters.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.network.v2020_04_01;
+
+import java.util.List;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Geographic and time constraints for Azure reachability report.
+ */
+public class AzureReachabilityReportParameters {
+    /**
+     * Parameters that define a geographic location.
+     */
+    @JsonProperty(value = "providerLocation", required = true)
+    private AzureReachabilityReportLocation providerLocation;
+
+    /**
+     * List of Internet service providers.
+     */
+    @JsonProperty(value = "providers")
+    private List<String> providers;
+
+    /**
+     * Optional Azure regions to scope the query to.
+     */
+    @JsonProperty(value = "azureLocations")
+    private List<String> azureLocations;
+
+    /**
+     * The start time for the Azure reachability report.
+     */
+    @JsonProperty(value = "startTime", required = true)
+    private DateTime startTime;
+
+    /**
+     * The end time for the Azure reachability report.
+     */
+    @JsonProperty(value = "endTime", required = true)
+    private DateTime endTime;
+
+    /**
+     * Get parameters that define a geographic location.
+     *
+     * @return the providerLocation value
+     */
+    public AzureReachabilityReportLocation providerLocation() {
+        return this.providerLocation;
+    }
+
+    /**
+     * Set parameters that define a geographic location.
+     *
+     * @param providerLocation the providerLocation value to set
+     * @return the AzureReachabilityReportParameters object itself.
+     */
+    public AzureReachabilityReportParameters withProviderLocation(AzureReachabilityReportLocation providerLocation) {
+        this.providerLocation = providerLocation;
+        return this;
+    }
+
+    /**
+     * Get list of Internet service providers.
+     *
+     * @return the providers value
+     */
+    public List<String> providers() {
+        return this.providers;
+    }
+
+    /**
+     * Set list of Internet service providers.
+     *
+     * @param providers the providers value to set
+     * @return the AzureReachabilityReportParameters object itself.
+     */
+    public AzureReachabilityReportParameters withProviders(List<String> providers) {
+        this.providers = providers;
+        return this;
+    }
+
+    /**
+     * Get optional Azure regions to scope the query to.
+     *
+     * @return the azureLocations value
+     */
+    public List<String> azureLocations() {
+        return this.azureLocations;
+    }
+
+    /**
+     * Set optional Azure regions to scope the query to.
+     *
+     * @param azureLocations the azureLocations value to set
+     * @return the AzureReachabilityReportParameters object itself.
+     */
+    public AzureReachabilityReportParameters withAzureLocations(List<String> azureLocations) {
+        this.azureLocations = azureLocations;
+        return this;
+    }
+
+    /**
+     * Get the start time for the Azure reachability report.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Set the start time for the Azure reachability report.
+     *
+     * @param startTime the startTime value to set
+     * @return the AzureReachabilityReportParameters object itself.
+     */
+    public AzureReachabilityReportParameters withStartTime(DateTime startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    /**
+     * Get the end time for the Azure reachability report.
+     *
+     * @return the endTime value
+     */
+    public DateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Set the end time for the Azure reachability report.
+     *
+     * @param endTime the endTime value to set
+     * @return the AzureReachabilityReportParameters object itself.
+     */
+    public AzureReachabilityReportParameters withEndTime(DateTime endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BGPCommunity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BGPCommunity.java
new file mode 100644
index 000000000000..1dda1d04dc8f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BGPCommunity.java
@@ -0,0 +1,175 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains bgp community information offered in Service Community resources.
+ */
+public class BGPCommunity {
+    /**
+     * The region which the service support. e.g. For O365, region is Global.
+     */
+    @JsonProperty(value = "serviceSupportedRegion")
+    private String serviceSupportedRegion;
+
+    /**
+     * The name of the bgp community. e.g. Skype.
+     */
+    @JsonProperty(value = "communityName")
+    private String communityName;
+
+    /**
+     * The value of the bgp community. For more information:
+     * https://docs.microsoft.com/en-us/azure/expressroute/expressroute-routing.
+     */
+    @JsonProperty(value = "communityValue")
+    private String communityValue;
+
+    /**
+     * The prefixes that the bgp community contains.
+     */
+    @JsonProperty(value = "communityPrefixes")
+    private List<String> communityPrefixes;
+
+    /**
+     * Customer is authorized to use bgp community or not.
+     */
+    @JsonProperty(value = "isAuthorizedToUse")
+    private Boolean isAuthorizedToUse;
+
+    /**
+     * The service group of the bgp community contains.
+     */
+    @JsonProperty(value = "serviceGroup")
+    private String serviceGroup;
+
+    /**
+     * Get the region which the service support. e.g. For O365, region is Global.
+     *
+     * @return the serviceSupportedRegion value
+     */
+    public String serviceSupportedRegion() {
+        return this.serviceSupportedRegion;
+    }
+
+    /**
+     * Set the region which the service support. e.g. For O365, region is Global.
+     *
+     * @param serviceSupportedRegion the serviceSupportedRegion value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withServiceSupportedRegion(String serviceSupportedRegion) {
+        this.serviceSupportedRegion = serviceSupportedRegion;
+        return this;
+    }
+
+    /**
+     * Get the name of the bgp community. e.g. Skype.
+     *
+     * @return the communityName value
+     */
+    public String communityName() {
+        return this.communityName;
+    }
+
+    /**
+     * Set the name of the bgp community. e.g. Skype.
+     *
+     * @param communityName the communityName value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withCommunityName(String communityName) {
+        this.communityName = communityName;
+        return this;
+    }
+
+    /**
+     * Get the value of the bgp community. For more information: https://docs.microsoft.com/en-us/azure/expressroute/expressroute-routing.
+     *
+     * @return the communityValue value
+     */
+    public String communityValue() {
+        return this.communityValue;
+    }
+
+    /**
+     * Set the value of the bgp community. For more information: https://docs.microsoft.com/en-us/azure/expressroute/expressroute-routing.
+     *
+     * @param communityValue the communityValue value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withCommunityValue(String communityValue) {
+        this.communityValue = communityValue;
+        return this;
+    }
+
+    /**
+     * Get the prefixes that the bgp community contains.
+     *
+     * @return the communityPrefixes value
+     */
+    public List<String> communityPrefixes() {
+        return this.communityPrefixes;
+    }
+
+    /**
+     * Set the prefixes that the bgp community contains.
+     *
+     * @param communityPrefixes the communityPrefixes value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withCommunityPrefixes(List<String> communityPrefixes) {
+        this.communityPrefixes = communityPrefixes;
+        return this;
+    }
+
+    /**
+     * Get customer is authorized to use bgp community or not.
+     *
+     * @return the isAuthorizedToUse value
+     */
+    public Boolean isAuthorizedToUse() {
+        return this.isAuthorizedToUse;
+    }
+
+    /**
+     * Set customer is authorized to use bgp community or not.
+     *
+     * @param isAuthorizedToUse the isAuthorizedToUse value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withIsAuthorizedToUse(Boolean isAuthorizedToUse) {
+        this.isAuthorizedToUse = isAuthorizedToUse;
+        return this;
+    }
+
+    /**
+     * Get the service group of the bgp community contains.
+     *
+     * @return the serviceGroup value
+     */
+    public String serviceGroup() {
+        return this.serviceGroup;
+    }
+
+    /**
+     * Set the service group of the bgp community contains.
+     *
+     * @param serviceGroup the serviceGroup value to set
+     * @return the BGPCommunity object itself.
+     */
+    public BGPCommunity withServiceGroup(String serviceGroup) {
+        this.serviceGroup = serviceGroup;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BackendAddressPool.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BackendAddressPool.java
new file mode 100644
index 000000000000..89869ef6d8d8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BackendAddressPool.java
@@ -0,0 +1,197 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BackendAddressPoolInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing BackendAddressPool.
+ */
+public interface BackendAddressPool extends HasInner<BackendAddressPoolInner>, Indexable, Refreshable<BackendAddressPool>, Updatable<BackendAddressPool.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the backendIPConfigurations value.
+     */
+    List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> backendIPConfigurations();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the loadBalancerBackendAddresses value.
+     */
+    List<LoadBalancerBackendAddress> loadBalancerBackendAddresses();
+
+    /**
+     * @return the loadBalancingRules value.
+     */
+    List<SubResource> loadBalancingRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the outboundRule value.
+     */
+    SubResource outboundRule();
+
+    /**
+     * @return the outboundRules value.
+     */
+    List<SubResource> outboundRules();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the BackendAddressPool definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLoadBalancer, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of BackendAddressPool definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a BackendAddressPool definition.
+         */
+        interface Blank extends WithLoadBalancer {
+        }
+
+        /**
+         * The stage of the backendaddresspool definition allowing to specify LoadBalancer.
+         */
+        interface WithLoadBalancer {
+           /**
+            * Specifies resourceGroupName, loadBalancerName.
+            * @param resourceGroupName The name of the resource group
+            * @param loadBalancerName The name of the load balancer
+            * @return the next definition stage
+            */
+            WithCreate withExistingLoadBalancer(String resourceGroupName, String loadBalancerName);
+        }
+
+        /**
+         * The stage of the backendaddresspool definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the backendaddresspool definition allowing to specify LoadBalancerBackendAddresses.
+         */
+        interface WithLoadBalancerBackendAddresses {
+            /**
+             * Specifies loadBalancerBackendAddresses.
+             * @param loadBalancerBackendAddresses An array of backend addresses
+             * @return the next definition stage
+             */
+            WithCreate withLoadBalancerBackendAddresses(List<LoadBalancerBackendAddress> loadBalancerBackendAddresses);
+        }
+
+        /**
+         * The stage of the backendaddresspool definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within the set of backend address pools used by the load balancer. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            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<BackendAddressPool>, DefinitionStages.WithId, DefinitionStages.WithLoadBalancerBackendAddresses, DefinitionStages.WithName {
+        }
+    }
+    /**
+     * The template for a BackendAddressPool update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<BackendAddressPool>, UpdateStages.WithId, UpdateStages.WithLoadBalancerBackendAddresses, UpdateStages.WithName {
+    }
+
+    /**
+     * Grouping of BackendAddressPool update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the backendaddresspool update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the backendaddresspool update allowing to specify LoadBalancerBackendAddresses.
+         */
+        interface WithLoadBalancerBackendAddresses {
+            /**
+             * Specifies loadBalancerBackendAddresses.
+             * @param loadBalancerBackendAddresses An array of backend addresses
+             * @return the next update stage
+             */
+            Update withLoadBalancerBackendAddresses(List<LoadBalancerBackendAddress> loadBalancerBackendAddresses);
+        }
+
+        /**
+         * The stage of the backendaddresspool update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within the set of backend address pools used by the load balancer. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionConnectProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionConnectProtocol.java
new file mode 100644
index 000000000000..65881bd8026d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionConnectProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for BastionConnectProtocol.
+ */
+public final class BastionConnectProtocol extends ExpandableStringEnum<BastionConnectProtocol> {
+    /** Static value SSH for BastionConnectProtocol. */
+    public static final BastionConnectProtocol SSH = fromString("SSH");
+
+    /** Static value RDP for BastionConnectProtocol. */
+    public static final BastionConnectProtocol RDP = fromString("RDP");
+
+    /**
+     * Creates or finds a BastionConnectProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding BastionConnectProtocol
+     */
+    @JsonCreator
+    public static BastionConnectProtocol fromString(String name) {
+        return fromString(name, BastionConnectProtocol.class);
+    }
+
+    /**
+     * @return known BastionConnectProtocol values
+     */
+    public static Collection<BastionConnectProtocol> values() {
+        return values(BastionConnectProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHost.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHost.java
new file mode 100644
index 000000000000..765823465bc2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHost.java
@@ -0,0 +1,137 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BastionHostInner;
+
+/**
+ * Type representing BastionHost.
+ */
+public interface BastionHost extends HasInner<BastionHostInner>, Resource, GroupableResourceCore<NetworkManager, BastionHostInner>, HasResourceGroup, Refreshable<BastionHost>, Updatable<BastionHost.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the dnsName value.
+     */
+    String dnsName();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<BastionHostIPConfiguration> ipConfigurations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * The entirety of the BastionHost definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of BastionHost definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a BastionHost definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the BastionHost definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the bastionhost definition allowing to specify DnsName.
+         */
+        interface WithDnsName {
+            /**
+             * Specifies dnsName.
+             * @param dnsName FQDN for the endpoint on which bastion host is accessible
+             * @return the next definition stage
+             */
+            WithCreate withDnsName(String dnsName);
+        }
+
+        /**
+         * The stage of the bastionhost definition allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configuration of the Bastion Host resource
+             * @return the next definition stage
+             */
+            WithCreate withIpConfigurations(List<BastionHostIPConfiguration> ipConfigurations);
+        }
+
+        /**
+         * 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<BastionHost>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithDnsName, DefinitionStages.WithIpConfigurations {
+        }
+    }
+    /**
+     * The template for a BastionHost update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<BastionHost>, Resource.UpdateWithTags<Update>, UpdateStages.WithDnsName, UpdateStages.WithIpConfigurations {
+    }
+
+    /**
+     * Grouping of BastionHost update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the bastionhost update allowing to specify DnsName.
+         */
+        interface WithDnsName {
+            /**
+             * Specifies dnsName.
+             * @param dnsName FQDN for the endpoint on which bastion host is accessible
+             * @return the next update stage
+             */
+            Update withDnsName(String dnsName);
+        }
+
+        /**
+         * The stage of the bastionhost update allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configuration of the Bastion Host resource
+             * @return the next update stage
+             */
+            Update withIpConfigurations(List<BastionHostIPConfiguration> ipConfigurations);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHostIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHostIPConfiguration.java
new file mode 100644
index 000000000000..12d6a8d7ef34
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHostIPConfiguration.java
@@ -0,0 +1,172 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * IP configuration of an Bastion Host.
+ */
+@JsonFlatten
+public class BastionHostIPConfiguration extends SubResource {
+    /**
+     * Reference of the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet", required = true)
+    private SubResource subnet;
+
+    /**
+     * Reference of the PublicIP resource.
+     */
+    @JsonProperty(value = "properties.publicIPAddress", required = true)
+    private SubResource publicIPAddress;
+
+    /**
+     * The provisioning state of the bastion host IP configuration resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Private IP allocation method. Possible values include: 'Static',
+     * 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Ip configuration type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get reference of the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set reference of the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the BastionHostIPConfiguration object itself.
+     */
+    public BastionHostIPConfiguration withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get reference of the PublicIP resource.
+     *
+     * @return the publicIPAddress value
+     */
+    public SubResource publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set reference of the PublicIP resource.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the BastionHostIPConfiguration object itself.
+     */
+    public BastionHostIPConfiguration withPublicIPAddress(SubResource publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the bastion host IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get private IP allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set private IP allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the BastionHostIPConfiguration object itself.
+     */
+    public BastionHostIPConfiguration withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the BastionHostIPConfiguration object itself.
+     */
+    public BastionHostIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get ip configuration type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHosts.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHosts.java
new file mode 100644
index 000000000000..556a50bfbaff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionHosts.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.BastionHostsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing BastionHosts.
+ */
+public interface BastionHosts extends SupportsCreating<BastionHost.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<BastionHost>, SupportsListingByResourceGroup<BastionHost>, SupportsListing<BastionHost>, HasInner<BastionHostsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionShareableLinkListRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionShareableLinkListRequest.java
new file mode 100644
index 000000000000..06a80a83684c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BastionShareableLinkListRequest.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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BastionShareableLinkInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Post request for all the Bastion Shareable Link endpoints.
+ */
+public class BastionShareableLinkListRequest {
+    /**
+     * List of VM references.
+     */
+    @JsonProperty(value = "vms")
+    private List<BastionShareableLinkInner> vms;
+
+    /**
+     * Get list of VM references.
+     *
+     * @return the vms value
+     */
+    public List<BastionShareableLinkInner> vms() {
+        return this.vms;
+    }
+
+    /**
+     * Set list of VM references.
+     *
+     * @param vms the vms value to set
+     * @return the BastionShareableLinkListRequest object itself.
+     */
+    public BastionShareableLinkListRequest withVms(List<BastionShareableLinkInner> vms) {
+        this.vms = vms;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerState.java
new file mode 100644
index 000000000000..2e7b9f57c43b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerState.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for BgpPeerState.
+ */
+public final class BgpPeerState extends ExpandableStringEnum<BgpPeerState> {
+    /** Static value Unknown for BgpPeerState. */
+    public static final BgpPeerState UNKNOWN = fromString("Unknown");
+
+    /** Static value Stopped for BgpPeerState. */
+    public static final BgpPeerState STOPPED = fromString("Stopped");
+
+    /** Static value Idle for BgpPeerState. */
+    public static final BgpPeerState IDLE = fromString("Idle");
+
+    /** Static value Connecting for BgpPeerState. */
+    public static final BgpPeerState CONNECTING = fromString("Connecting");
+
+    /** Static value Connected for BgpPeerState. */
+    public static final BgpPeerState CONNECTED = fromString("Connected");
+
+    /**
+     * Creates or finds a BgpPeerState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding BgpPeerState
+     */
+    @JsonCreator
+    public static BgpPeerState fromString(String name) {
+        return fromString(name, BgpPeerState.class);
+    }
+
+    /**
+     * @return known BgpPeerState values
+     */
+    public static Collection<BgpPeerState> values() {
+        return values(BgpPeerState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatus.java
new file mode 100644
index 000000000000..2da10bafff50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatus.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * BGP peer status details.
+ */
+public class BgpPeerStatus {
+    /**
+     * The virtual network gateway's local address.
+     */
+    @JsonProperty(value = "localAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String localAddress;
+
+    /**
+     * The remote BGP peer.
+     */
+    @JsonProperty(value = "neighbor", access = JsonProperty.Access.WRITE_ONLY)
+    private String neighbor;
+
+    /**
+     * The autonomous system number of the remote BGP peer.
+     */
+    @JsonProperty(value = "asn", access = JsonProperty.Access.WRITE_ONLY)
+    private Long asn;
+
+    /**
+     * The BGP peer state. Possible values include: 'Unknown', 'Stopped',
+     * 'Idle', 'Connecting', 'Connected'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private BgpPeerState state;
+
+    /**
+     * For how long the peering has been up.
+     */
+    @JsonProperty(value = "connectedDuration", access = JsonProperty.Access.WRITE_ONLY)
+    private String connectedDuration;
+
+    /**
+     * The number of routes learned from this peer.
+     */
+    @JsonProperty(value = "routesReceived", access = JsonProperty.Access.WRITE_ONLY)
+    private Long routesReceived;
+
+    /**
+     * The number of BGP messages sent.
+     */
+    @JsonProperty(value = "messagesSent", access = JsonProperty.Access.WRITE_ONLY)
+    private Long messagesSent;
+
+    /**
+     * The number of BGP messages received.
+     */
+    @JsonProperty(value = "messagesReceived", access = JsonProperty.Access.WRITE_ONLY)
+    private Long messagesReceived;
+
+    /**
+     * Get the virtual network gateway's local address.
+     *
+     * @return the localAddress value
+     */
+    public String localAddress() {
+        return this.localAddress;
+    }
+
+    /**
+     * Get the remote BGP peer.
+     *
+     * @return the neighbor value
+     */
+    public String neighbor() {
+        return this.neighbor;
+    }
+
+    /**
+     * Get the autonomous system number of the remote BGP peer.
+     *
+     * @return the asn value
+     */
+    public Long asn() {
+        return this.asn;
+    }
+
+    /**
+     * Get the BGP peer state. Possible values include: 'Unknown', 'Stopped', 'Idle', 'Connecting', 'Connected'.
+     *
+     * @return the state value
+     */
+    public BgpPeerState state() {
+        return this.state;
+    }
+
+    /**
+     * Get for how long the peering has been up.
+     *
+     * @return the connectedDuration value
+     */
+    public String connectedDuration() {
+        return this.connectedDuration;
+    }
+
+    /**
+     * Get the number of routes learned from this peer.
+     *
+     * @return the routesReceived value
+     */
+    public Long routesReceived() {
+        return this.routesReceived;
+    }
+
+    /**
+     * Get the number of BGP messages sent.
+     *
+     * @return the messagesSent value
+     */
+    public Long messagesSent() {
+        return this.messagesSent;
+    }
+
+    /**
+     * Get the number of BGP messages received.
+     *
+     * @return the messagesReceived value
+     */
+    public Long messagesReceived() {
+        return this.messagesReceived;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatusListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatusListResult.java
new file mode 100644
index 000000000000..cdc46d070baf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpPeerStatusListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BgpPeerStatusListResultInner;
+import java.util.List;
+
+/**
+ * Type representing BgpPeerStatusListResult.
+ */
+public interface BgpPeerStatusListResult extends HasInner<BgpPeerStatusListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the value value.
+     */
+    List<BgpPeerStatus> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunities.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunities.java
new file mode 100644
index 000000000000..b62b5bc69d5c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunities.java
@@ -0,0 +1,19 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BgpServiceCommunitiesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing BgpServiceCommunities.
+ */
+public interface BgpServiceCommunities extends SupportsListing<BgpServiceCommunity>, HasInner<BgpServiceCommunitiesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunity.java
new file mode 100644
index 000000000000..5769347b3fff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpServiceCommunity.java
@@ -0,0 +1,34 @@
+/**
+ * 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.network.v2020_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.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BgpServiceCommunityInner;
+
+/**
+ * Type representing BgpServiceCommunity.
+ */
+public interface BgpServiceCommunity extends HasInner<BgpServiceCommunityInner>, Resource, GroupableResourceCore<NetworkManager, BgpServiceCommunityInner>, HasResourceGroup, HasManager<NetworkManager> {
+    /**
+     * @return the bgpCommunities value.
+     */
+    List<BGPCommunity> bgpCommunities();
+
+    /**
+     * @return the serviceName value.
+     */
+    String serviceName();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpSettings.java
new file mode 100644
index 000000000000..b0c395d14644
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/BgpSettings.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * BGP settings details.
+ */
+public class BgpSettings {
+    /**
+     * The BGP speaker's ASN.
+     */
+    @JsonProperty(value = "asn")
+    private Long asn;
+
+    /**
+     * The BGP peering address and BGP identifier of this BGP speaker.
+     */
+    @JsonProperty(value = "bgpPeeringAddress")
+    private String bgpPeeringAddress;
+
+    /**
+     * The weight added to routes learned from this BGP speaker.
+     */
+    @JsonProperty(value = "peerWeight")
+    private Integer peerWeight;
+
+    /**
+     * BGP peering address with IP configuration ID for virtual network
+     * gateway.
+     */
+    @JsonProperty(value = "bgpPeeringAddresses")
+    private List<IPConfigurationBgpPeeringAddress> bgpPeeringAddresses;
+
+    /**
+     * Get the BGP speaker's ASN.
+     *
+     * @return the asn value
+     */
+    public Long asn() {
+        return this.asn;
+    }
+
+    /**
+     * Set the BGP speaker's ASN.
+     *
+     * @param asn the asn value to set
+     * @return the BgpSettings object itself.
+     */
+    public BgpSettings withAsn(Long asn) {
+        this.asn = asn;
+        return this;
+    }
+
+    /**
+     * Get the BGP peering address and BGP identifier of this BGP speaker.
+     *
+     * @return the bgpPeeringAddress value
+     */
+    public String bgpPeeringAddress() {
+        return this.bgpPeeringAddress;
+    }
+
+    /**
+     * Set the BGP peering address and BGP identifier of this BGP speaker.
+     *
+     * @param bgpPeeringAddress the bgpPeeringAddress value to set
+     * @return the BgpSettings object itself.
+     */
+    public BgpSettings withBgpPeeringAddress(String bgpPeeringAddress) {
+        this.bgpPeeringAddress = bgpPeeringAddress;
+        return this;
+    }
+
+    /**
+     * Get the weight added to routes learned from this BGP speaker.
+     *
+     * @return the peerWeight value
+     */
+    public Integer peerWeight() {
+        return this.peerWeight;
+    }
+
+    /**
+     * Set the weight added to routes learned from this BGP speaker.
+     *
+     * @param peerWeight the peerWeight value to set
+     * @return the BgpSettings object itself.
+     */
+    public BgpSettings withPeerWeight(Integer peerWeight) {
+        this.peerWeight = peerWeight;
+        return this;
+    }
+
+    /**
+     * Get bGP peering address with IP configuration ID for virtual network gateway.
+     *
+     * @return the bgpPeeringAddresses value
+     */
+    public List<IPConfigurationBgpPeeringAddress> bgpPeeringAddresses() {
+        return this.bgpPeeringAddresses;
+    }
+
+    /**
+     * Set bGP peering address with IP configuration ID for virtual network gateway.
+     *
+     * @param bgpPeeringAddresses the bgpPeeringAddresses value to set
+     * @return the BgpSettings object itself.
+     */
+    public BgpSettings withBgpPeeringAddresses(List<IPConfigurationBgpPeeringAddress> bgpPeeringAddresses) {
+        this.bgpPeeringAddresses = bgpPeeringAddresses;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CheckPrivateLinkServiceVisibilityRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CheckPrivateLinkServiceVisibilityRequest.java
new file mode 100644
index 000000000000..b8915d0b17c8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CheckPrivateLinkServiceVisibilityRequest.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request body of the CheckPrivateLinkServiceVisibility API service call.
+ */
+public class CheckPrivateLinkServiceVisibilityRequest {
+    /**
+     * The alias of the private link service.
+     */
+    @JsonProperty(value = "privateLinkServiceAlias")
+    private String privateLinkServiceAlias;
+
+    /**
+     * Get the alias of the private link service.
+     *
+     * @return the privateLinkServiceAlias value
+     */
+    public String privateLinkServiceAlias() {
+        return this.privateLinkServiceAlias;
+    }
+
+    /**
+     * Set the alias of the private link service.
+     *
+     * @param privateLinkServiceAlias the privateLinkServiceAlias value to set
+     * @return the CheckPrivateLinkServiceVisibilityRequest object itself.
+     */
+    public CheckPrivateLinkServiceVisibilityRequest withPrivateLinkServiceAlias(String privateLinkServiceAlias) {
+        this.privateLinkServiceAlias = privateLinkServiceAlias;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CircuitConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CircuitConnectionStatus.java
new file mode 100644
index 000000000000..a37be64b9ff7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CircuitConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for CircuitConnectionStatus.
+ */
+public final class CircuitConnectionStatus extends ExpandableStringEnum<CircuitConnectionStatus> {
+    /** Static value Connected for CircuitConnectionStatus. */
+    public static final CircuitConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value Connecting for CircuitConnectionStatus. */
+    public static final CircuitConnectionStatus CONNECTING = fromString("Connecting");
+
+    /** Static value Disconnected for CircuitConnectionStatus. */
+    public static final CircuitConnectionStatus DISCONNECTED = fromString("Disconnected");
+
+    /**
+     * Creates or finds a CircuitConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding CircuitConnectionStatus
+     */
+    @JsonCreator
+    public static CircuitConnectionStatus fromString(String name) {
+        return fromString(name, CircuitConnectionStatus.class);
+    }
+
+    /**
+     * @return known CircuitConnectionStatus values
+     */
+    public static Collection<CircuitConnectionStatus> values() {
+        return values(CircuitConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorDestination.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorDestination.java
new file mode 100644
index 000000000000..f5f29f290d70
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorDestination.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the destination of connection monitor.
+ */
+public class ConnectionMonitorDestination {
+    /**
+     * The ID of the resource used as the destination by connection monitor.
+     */
+    @JsonProperty(value = "resourceId")
+    private String resourceId;
+
+    /**
+     * Address of the connection monitor destination (IP or domain name).
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * The destination port used by connection monitor.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get the ID of the resource used as the destination by connection monitor.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the ID of the resource used as the destination by connection monitor.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the ConnectionMonitorDestination object itself.
+     */
+    public ConnectionMonitorDestination withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get address of the connection monitor destination (IP or domain name).
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set address of the connection monitor destination (IP or domain name).
+     *
+     * @param address the address value to set
+     * @return the ConnectionMonitorDestination object itself.
+     */
+    public ConnectionMonitorDestination withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    /**
+     * Get the destination port used by connection monitor.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the destination port used by connection monitor.
+     *
+     * @param port the port value to set
+     * @return the ConnectionMonitorDestination object itself.
+     */
+    public ConnectionMonitorDestination withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpoint.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpoint.java
new file mode 100644
index 000000000000..c9d8e4a707c8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpoint.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the connection monitor endpoint.
+ */
+public class ConnectionMonitorEndpoint {
+    /**
+     * The name of the connection monitor endpoint.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Resource ID of the connection monitor endpoint.
+     */
+    @JsonProperty(value = "resourceId")
+    private String resourceId;
+
+    /**
+     * Address of the connection monitor endpoint (IP or domain name).
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * Filter for sub-items within the endpoint.
+     */
+    @JsonProperty(value = "filter")
+    private ConnectionMonitorEndpointFilter filter;
+
+    /**
+     * Get the name of the connection monitor endpoint.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the connection monitor endpoint.
+     *
+     * @param name the name value to set
+     * @return the ConnectionMonitorEndpoint object itself.
+     */
+    public ConnectionMonitorEndpoint withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get resource ID of the connection monitor endpoint.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set resource ID of the connection monitor endpoint.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the ConnectionMonitorEndpoint object itself.
+     */
+    public ConnectionMonitorEndpoint withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get address of the connection monitor endpoint (IP or domain name).
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set address of the connection monitor endpoint (IP or domain name).
+     *
+     * @param address the address value to set
+     * @return the ConnectionMonitorEndpoint object itself.
+     */
+    public ConnectionMonitorEndpoint withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    /**
+     * Get filter for sub-items within the endpoint.
+     *
+     * @return the filter value
+     */
+    public ConnectionMonitorEndpointFilter filter() {
+        return this.filter;
+    }
+
+    /**
+     * Set filter for sub-items within the endpoint.
+     *
+     * @param filter the filter value to set
+     * @return the ConnectionMonitorEndpoint object itself.
+     */
+    public ConnectionMonitorEndpoint withFilter(ConnectionMonitorEndpointFilter filter) {
+        this.filter = filter;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilter.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilter.java
new file mode 100644
index 000000000000..941b032aa141
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilter.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the connection monitor endpoint filter.
+ */
+public class ConnectionMonitorEndpointFilter {
+    /**
+     * The behavior of the endpoint filter. Currently only 'Include' is
+     * supported. Possible values include: 'Include'.
+     */
+    @JsonProperty(value = "type")
+    private ConnectionMonitorEndpointFilterType type;
+
+    /**
+     * List of items in the filter.
+     */
+    @JsonProperty(value = "items")
+    private List<ConnectionMonitorEndpointFilterItem> items;
+
+    /**
+     * Get the behavior of the endpoint filter. Currently only 'Include' is supported. Possible values include: 'Include'.
+     *
+     * @return the type value
+     */
+    public ConnectionMonitorEndpointFilterType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the behavior of the endpoint filter. Currently only 'Include' is supported. Possible values include: 'Include'.
+     *
+     * @param type the type value to set
+     * @return the ConnectionMonitorEndpointFilter object itself.
+     */
+    public ConnectionMonitorEndpointFilter withType(ConnectionMonitorEndpointFilterType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get list of items in the filter.
+     *
+     * @return the items value
+     */
+    public List<ConnectionMonitorEndpointFilterItem> items() {
+        return this.items;
+    }
+
+    /**
+     * Set list of items in the filter.
+     *
+     * @param items the items value to set
+     * @return the ConnectionMonitorEndpointFilter object itself.
+     */
+    public ConnectionMonitorEndpointFilter withItems(List<ConnectionMonitorEndpointFilterItem> items) {
+        this.items = items;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItem.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItem.java
new file mode 100644
index 000000000000..51fcbf0be985
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItem.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the connection monitor endpoint filter item.
+ */
+public class ConnectionMonitorEndpointFilterItem {
+    /**
+     * The type of item included in the filter. Currently only 'AgentAddress'
+     * is supported. Possible values include: 'AgentAddress'.
+     */
+    @JsonProperty(value = "type")
+    private ConnectionMonitorEndpointFilterItemType type;
+
+    /**
+     * The address of the filter item.
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * Get the type of item included in the filter. Currently only 'AgentAddress' is supported. Possible values include: 'AgentAddress'.
+     *
+     * @return the type value
+     */
+    public ConnectionMonitorEndpointFilterItemType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of item included in the filter. Currently only 'AgentAddress' is supported. Possible values include: 'AgentAddress'.
+     *
+     * @param type the type value to set
+     * @return the ConnectionMonitorEndpointFilterItem object itself.
+     */
+    public ConnectionMonitorEndpointFilterItem withType(ConnectionMonitorEndpointFilterItemType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the address of the filter item.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set the address of the filter item.
+     *
+     * @param address the address value to set
+     * @return the ConnectionMonitorEndpointFilterItem object itself.
+     */
+    public ConnectionMonitorEndpointFilterItem withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItemType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItemType.java
new file mode 100644
index 000000000000..af1cf3b8c317
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterItemType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionMonitorEndpointFilterItemType.
+ */
+public final class ConnectionMonitorEndpointFilterItemType extends ExpandableStringEnum<ConnectionMonitorEndpointFilterItemType> {
+    /** Static value AgentAddress for ConnectionMonitorEndpointFilterItemType. */
+    public static final ConnectionMonitorEndpointFilterItemType AGENT_ADDRESS = fromString("AgentAddress");
+
+    /**
+     * Creates or finds a ConnectionMonitorEndpointFilterItemType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionMonitorEndpointFilterItemType
+     */
+    @JsonCreator
+    public static ConnectionMonitorEndpointFilterItemType fromString(String name) {
+        return fromString(name, ConnectionMonitorEndpointFilterItemType.class);
+    }
+
+    /**
+     * @return known ConnectionMonitorEndpointFilterItemType values
+     */
+    public static Collection<ConnectionMonitorEndpointFilterItemType> values() {
+        return values(ConnectionMonitorEndpointFilterItemType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterType.java
new file mode 100644
index 000000000000..11cf17acf7d6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorEndpointFilterType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionMonitorEndpointFilterType.
+ */
+public final class ConnectionMonitorEndpointFilterType extends ExpandableStringEnum<ConnectionMonitorEndpointFilterType> {
+    /** Static value Include for ConnectionMonitorEndpointFilterType. */
+    public static final ConnectionMonitorEndpointFilterType INCLUDE = fromString("Include");
+
+    /**
+     * Creates or finds a ConnectionMonitorEndpointFilterType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionMonitorEndpointFilterType
+     */
+    @JsonCreator
+    public static ConnectionMonitorEndpointFilterType fromString(String name) {
+        return fromString(name, ConnectionMonitorEndpointFilterType.class);
+    }
+
+    /**
+     * @return known ConnectionMonitorEndpointFilterType values
+     */
+    public static Collection<ConnectionMonitorEndpointFilterType> values() {
+        return values(ConnectionMonitorEndpointFilterType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorHttpConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorHttpConfiguration.java
new file mode 100644
index 000000000000..f3921edea9fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorHttpConfiguration.java
@@ -0,0 +1,176 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the HTTP configuration.
+ */
+public class ConnectionMonitorHttpConfiguration {
+    /**
+     * The port to connect to.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * The HTTP method to use. Possible values include: 'Get', 'Post'.
+     */
+    @JsonProperty(value = "method")
+    private HTTPConfigurationMethod method;
+
+    /**
+     * The path component of the URI. For instance, "/dir1/dir2".
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * The HTTP headers to transmit with the request.
+     */
+    @JsonProperty(value = "requestHeaders")
+    private List<HTTPHeader> requestHeaders;
+
+    /**
+     * HTTP status codes to consider successful. For instance,
+     * "2xx,301-304,418".
+     */
+    @JsonProperty(value = "validStatusCodeRanges")
+    private List<String> validStatusCodeRanges;
+
+    /**
+     * Value indicating whether HTTPS is preferred over HTTP in cases where the
+     * choice is not explicit.
+     */
+    @JsonProperty(value = "preferHTTPS")
+    private Boolean preferHTTPS;
+
+    /**
+     * Get the port to connect to.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the port to connect to.
+     *
+     * @param port the port value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get the HTTP method to use. Possible values include: 'Get', 'Post'.
+     *
+     * @return the method value
+     */
+    public HTTPConfigurationMethod method() {
+        return this.method;
+    }
+
+    /**
+     * Set the HTTP method to use. Possible values include: 'Get', 'Post'.
+     *
+     * @param method the method value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withMethod(HTTPConfigurationMethod method) {
+        this.method = method;
+        return this;
+    }
+
+    /**
+     * Get the path component of the URI. For instance, "/dir1/dir2".
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set the path component of the URI. For instance, "/dir1/dir2".
+     *
+     * @param path the path value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the HTTP headers to transmit with the request.
+     *
+     * @return the requestHeaders value
+     */
+    public List<HTTPHeader> requestHeaders() {
+        return this.requestHeaders;
+    }
+
+    /**
+     * Set the HTTP headers to transmit with the request.
+     *
+     * @param requestHeaders the requestHeaders value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withRequestHeaders(List<HTTPHeader> requestHeaders) {
+        this.requestHeaders = requestHeaders;
+        return this;
+    }
+
+    /**
+     * Get hTTP status codes to consider successful. For instance, "2xx,301-304,418".
+     *
+     * @return the validStatusCodeRanges value
+     */
+    public List<String> validStatusCodeRanges() {
+        return this.validStatusCodeRanges;
+    }
+
+    /**
+     * Set hTTP status codes to consider successful. For instance, "2xx,301-304,418".
+     *
+     * @param validStatusCodeRanges the validStatusCodeRanges value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withValidStatusCodeRanges(List<String> validStatusCodeRanges) {
+        this.validStatusCodeRanges = validStatusCodeRanges;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether HTTPS is preferred over HTTP in cases where the choice is not explicit.
+     *
+     * @return the preferHTTPS value
+     */
+    public Boolean preferHTTPS() {
+        return this.preferHTTPS;
+    }
+
+    /**
+     * Set value indicating whether HTTPS is preferred over HTTP in cases where the choice is not explicit.
+     *
+     * @param preferHTTPS the preferHTTPS value to set
+     * @return the ConnectionMonitorHttpConfiguration object itself.
+     */
+    public ConnectionMonitorHttpConfiguration withPreferHTTPS(Boolean preferHTTPS) {
+        this.preferHTTPS = preferHTTPS;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorIcmpConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorIcmpConfiguration.java
new file mode 100644
index 000000000000..331455454562
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorIcmpConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the ICMP configuration.
+ */
+public class ConnectionMonitorIcmpConfiguration {
+    /**
+     * Value indicating whether path evaluation with trace route should be
+     * disabled.
+     */
+    @JsonProperty(value = "disableTraceRoute")
+    private Boolean disableTraceRoute;
+
+    /**
+     * Get value indicating whether path evaluation with trace route should be disabled.
+     *
+     * @return the disableTraceRoute value
+     */
+    public Boolean disableTraceRoute() {
+        return this.disableTraceRoute;
+    }
+
+    /**
+     * Set value indicating whether path evaluation with trace route should be disabled.
+     *
+     * @param disableTraceRoute the disableTraceRoute value to set
+     * @return the ConnectionMonitorIcmpConfiguration object itself.
+     */
+    public ConnectionMonitorIcmpConfiguration withDisableTraceRoute(Boolean disableTraceRoute) {
+        this.disableTraceRoute = disableTraceRoute;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorOutput.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorOutput.java
new file mode 100644
index 000000000000..b50db5f0e168
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorOutput.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes a connection monitor output destination.
+ */
+public class ConnectionMonitorOutput {
+    /**
+     * Connection monitor output destination type. Currently, only "Workspace"
+     * is supported. Possible values include: 'Workspace'.
+     */
+    @JsonProperty(value = "type")
+    private OutputType type;
+
+    /**
+     * Describes the settings for producing output into a log analytics
+     * workspace.
+     */
+    @JsonProperty(value = "workspaceSettings")
+    private ConnectionMonitorWorkspaceSettings workspaceSettings;
+
+    /**
+     * Get connection monitor output destination type. Currently, only "Workspace" is supported. Possible values include: 'Workspace'.
+     *
+     * @return the type value
+     */
+    public OutputType type() {
+        return this.type;
+    }
+
+    /**
+     * Set connection monitor output destination type. Currently, only "Workspace" is supported. Possible values include: 'Workspace'.
+     *
+     * @param type the type value to set
+     * @return the ConnectionMonitorOutput object itself.
+     */
+    public ConnectionMonitorOutput withType(OutputType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get describes the settings for producing output into a log analytics workspace.
+     *
+     * @return the workspaceSettings value
+     */
+    public ConnectionMonitorWorkspaceSettings workspaceSettings() {
+        return this.workspaceSettings;
+    }
+
+    /**
+     * Set describes the settings for producing output into a log analytics workspace.
+     *
+     * @param workspaceSettings the workspaceSettings value to set
+     * @return the ConnectionMonitorOutput object itself.
+     */
+    public ConnectionMonitorOutput withWorkspaceSettings(ConnectionMonitorWorkspaceSettings workspaceSettings) {
+        this.workspaceSettings = workspaceSettings;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorParameters.java
new file mode 100644
index 000000000000..e02e3e88c95a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorParameters.java
@@ -0,0 +1,253 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the operation to create a connection monitor.
+ */
+public class ConnectionMonitorParameters {
+    /**
+     * Describes the source of connection monitor.
+     */
+    @JsonProperty(value = "source")
+    private ConnectionMonitorSource source;
+
+    /**
+     * Describes the destination of connection monitor.
+     */
+    @JsonProperty(value = "destination")
+    private ConnectionMonitorDestination destination;
+
+    /**
+     * Determines if the connection monitor will start automatically once
+     * created.
+     */
+    @JsonProperty(value = "autoStart")
+    private Boolean autoStart;
+
+    /**
+     * Monitoring interval in seconds.
+     */
+    @JsonProperty(value = "monitoringIntervalInSeconds")
+    private Integer monitoringIntervalInSeconds;
+
+    /**
+     * List of connection monitor endpoints.
+     */
+    @JsonProperty(value = "endpoints")
+    private List<ConnectionMonitorEndpoint> endpoints;
+
+    /**
+     * List of connection monitor test configurations.
+     */
+    @JsonProperty(value = "testConfigurations")
+    private List<ConnectionMonitorTestConfiguration> testConfigurations;
+
+    /**
+     * List of connection monitor test groups.
+     */
+    @JsonProperty(value = "testGroups")
+    private List<ConnectionMonitorTestGroup> testGroups;
+
+    /**
+     * List of connection monitor outputs.
+     */
+    @JsonProperty(value = "outputs")
+    private List<ConnectionMonitorOutput> outputs;
+
+    /**
+     * Optional notes to be associated with the connection monitor.
+     */
+    @JsonProperty(value = "notes")
+    private String notes;
+
+    /**
+     * Get describes the source of connection monitor.
+     *
+     * @return the source value
+     */
+    public ConnectionMonitorSource source() {
+        return this.source;
+    }
+
+    /**
+     * Set describes the source of connection monitor.
+     *
+     * @param source the source value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withSource(ConnectionMonitorSource source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get describes the destination of connection monitor.
+     *
+     * @return the destination value
+     */
+    public ConnectionMonitorDestination destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set describes the destination of connection monitor.
+     *
+     * @param destination the destination value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withDestination(ConnectionMonitorDestination destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get determines if the connection monitor will start automatically once created.
+     *
+     * @return the autoStart value
+     */
+    public Boolean autoStart() {
+        return this.autoStart;
+    }
+
+    /**
+     * Set determines if the connection monitor will start automatically once created.
+     *
+     * @param autoStart the autoStart value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withAutoStart(Boolean autoStart) {
+        this.autoStart = autoStart;
+        return this;
+    }
+
+    /**
+     * Get monitoring interval in seconds.
+     *
+     * @return the monitoringIntervalInSeconds value
+     */
+    public Integer monitoringIntervalInSeconds() {
+        return this.monitoringIntervalInSeconds;
+    }
+
+    /**
+     * Set monitoring interval in seconds.
+     *
+     * @param monitoringIntervalInSeconds the monitoringIntervalInSeconds value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds) {
+        this.monitoringIntervalInSeconds = monitoringIntervalInSeconds;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor endpoints.
+     *
+     * @return the endpoints value
+     */
+    public List<ConnectionMonitorEndpoint> endpoints() {
+        return this.endpoints;
+    }
+
+    /**
+     * Set list of connection monitor endpoints.
+     *
+     * @param endpoints the endpoints value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withEndpoints(List<ConnectionMonitorEndpoint> endpoints) {
+        this.endpoints = endpoints;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test configurations.
+     *
+     * @return the testConfigurations value
+     */
+    public List<ConnectionMonitorTestConfiguration> testConfigurations() {
+        return this.testConfigurations;
+    }
+
+    /**
+     * Set list of connection monitor test configurations.
+     *
+     * @param testConfigurations the testConfigurations value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations) {
+        this.testConfigurations = testConfigurations;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test groups.
+     *
+     * @return the testGroups value
+     */
+    public List<ConnectionMonitorTestGroup> testGroups() {
+        return this.testGroups;
+    }
+
+    /**
+     * Set list of connection monitor test groups.
+     *
+     * @param testGroups the testGroups value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withTestGroups(List<ConnectionMonitorTestGroup> testGroups) {
+        this.testGroups = testGroups;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor outputs.
+     *
+     * @return the outputs value
+     */
+    public List<ConnectionMonitorOutput> outputs() {
+        return this.outputs;
+    }
+
+    /**
+     * Set list of connection monitor outputs.
+     *
+     * @param outputs the outputs value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withOutputs(List<ConnectionMonitorOutput> outputs) {
+        this.outputs = outputs;
+        return this;
+    }
+
+    /**
+     * Get optional notes to be associated with the connection monitor.
+     *
+     * @return the notes value
+     */
+    public String notes() {
+        return this.notes;
+    }
+
+    /**
+     * Set optional notes to be associated with the connection monitor.
+     *
+     * @param notes the notes value to set
+     * @return the ConnectionMonitorParameters object itself.
+     */
+    public ConnectionMonitorParameters withNotes(String notes) {
+        this.notes = notes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorQueryResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorQueryResult.java
new file mode 100644
index 000000000000..2d72f9795d6b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorQueryResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectionMonitorQueryResultInner;
+import java.util.List;
+
+/**
+ * Type representing ConnectionMonitorQueryResult.
+ */
+public interface ConnectionMonitorQueryResult extends HasInner<ConnectionMonitorQueryResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the sourceStatus value.
+     */
+    ConnectionMonitorSourceStatus sourceStatus();
+
+    /**
+     * @return the states value.
+     */
+    List<ConnectionStateSnapshot> states();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorResult.java
new file mode 100644
index 000000000000..e7d8ef8d8da5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorResult.java
@@ -0,0 +1,435 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectionMonitorResultInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.Map;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ConnectionMonitorResult.
+ */
+public interface ConnectionMonitorResult extends HasInner<ConnectionMonitorResultInner>, Indexable, Refreshable<ConnectionMonitorResult>, Updatable<ConnectionMonitorResult.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the autoStart value.
+     */
+    Boolean autoStart();
+
+    /**
+     * @return the connectionMonitorType value.
+     */
+    ConnectionMonitorType connectionMonitorType();
+
+    /**
+     * @return the destination value.
+     */
+    ConnectionMonitorDestination destination();
+
+    /**
+     * @return the endpoints value.
+     */
+    List<ConnectionMonitorEndpoint> endpoints();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the monitoringIntervalInSeconds value.
+     */
+    Integer monitoringIntervalInSeconds();
+
+    /**
+     * @return the monitoringStatus value.
+     */
+    String monitoringStatus();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the notes value.
+     */
+    String notes();
+
+    /**
+     * @return the outputs value.
+     */
+    List<ConnectionMonitorOutput> outputs();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the source value.
+     */
+    ConnectionMonitorSource source();
+
+    /**
+     * @return the startTime value.
+     */
+    DateTime startTime();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the testConfigurations value.
+     */
+    List<ConnectionMonitorTestConfiguration> testConfigurations();
+
+    /**
+     * @return the testGroups value.
+     */
+    List<ConnectionMonitorTestGroup> testGroups();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ConnectionMonitorResult definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetworkWatcher, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ConnectionMonitorResult definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ConnectionMonitorResult definition.
+         */
+        interface Blank extends WithNetworkWatcher {
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify NetworkWatcher.
+         */
+        interface WithNetworkWatcher {
+           /**
+            * Specifies resourceGroupName, networkWatcherName.
+            * @param resourceGroupName The name of the resource group containing Network Watcher
+            * @param networkWatcherName The name of the Network Watcher resource
+            * @return the next definition stage
+            */
+            WithCreate withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify AutoStart.
+         */
+        interface WithAutoStart {
+            /**
+             * Specifies autoStart.
+             * @param autoStart Determines if the connection monitor will start automatically once created
+             * @return the next definition stage
+             */
+            WithCreate withAutoStart(Boolean autoStart);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Destination.
+         */
+        interface WithDestination {
+            /**
+             * Specifies destination.
+             * @param destination Describes the destination of connection monitor
+             * @return the next definition stage
+             */
+            WithCreate withDestination(ConnectionMonitorDestination destination);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Endpoints.
+         */
+        interface WithEndpoints {
+            /**
+             * Specifies endpoints.
+             * @param endpoints List of connection monitor endpoints
+             * @return the next definition stage
+             */
+            WithCreate withEndpoints(List<ConnectionMonitorEndpoint> endpoints);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Connection monitor location
+             * @return the next definition stage
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify MonitoringIntervalInSeconds.
+         */
+        interface WithMonitoringIntervalInSeconds {
+            /**
+             * Specifies monitoringIntervalInSeconds.
+             * @param monitoringIntervalInSeconds Monitoring interval in seconds
+             * @return the next definition stage
+             */
+            WithCreate withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Notes.
+         */
+        interface WithNotes {
+            /**
+             * Specifies notes.
+             * @param notes Optional notes to be associated with the connection monitor
+             * @return the next definition stage
+             */
+            WithCreate withNotes(String notes);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Outputs.
+         */
+        interface WithOutputs {
+            /**
+             * Specifies outputs.
+             * @param outputs List of connection monitor outputs
+             * @return the next definition stage
+             */
+            WithCreate withOutputs(List<ConnectionMonitorOutput> outputs);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Source.
+         */
+        interface WithSource {
+            /**
+             * Specifies source.
+             * @param source Describes the source of connection monitor
+             * @return the next definition stage
+             */
+            WithCreate withSource(ConnectionMonitorSource source);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             * @param tags Connection monitor tags
+             * @return the next definition stage
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify TestConfigurations.
+         */
+        interface WithTestConfigurations {
+            /**
+             * Specifies testConfigurations.
+             * @param testConfigurations List of connection monitor test configurations
+             * @return the next definition stage
+             */
+            WithCreate withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult definition allowing to specify TestGroups.
+         */
+        interface WithTestGroups {
+            /**
+             * Specifies testGroups.
+             * @param testGroups List of connection monitor test groups
+             * @return the next definition stage
+             */
+            WithCreate withTestGroups(List<ConnectionMonitorTestGroup> testGroups);
+        }
+
+        /**
+         * 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<ConnectionMonitorResult>, DefinitionStages.WithAutoStart, DefinitionStages.WithDestination, DefinitionStages.WithEndpoints, DefinitionStages.WithLocation, DefinitionStages.WithMonitoringIntervalInSeconds, DefinitionStages.WithNotes, DefinitionStages.WithOutputs, DefinitionStages.WithSource, DefinitionStages.WithTags, DefinitionStages.WithTestConfigurations, DefinitionStages.WithTestGroups {
+        }
+    }
+    /**
+     * The template for a ConnectionMonitorResult update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ConnectionMonitorResult>, UpdateStages.WithAutoStart, UpdateStages.WithDestination, UpdateStages.WithEndpoints, UpdateStages.WithLocation, UpdateStages.WithMonitoringIntervalInSeconds, UpdateStages.WithNotes, UpdateStages.WithOutputs, UpdateStages.WithSource, UpdateStages.WithTags, UpdateStages.WithTestConfigurations, UpdateStages.WithTestGroups {
+    }
+
+    /**
+     * Grouping of ConnectionMonitorResult update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify AutoStart.
+         */
+        interface WithAutoStart {
+            /**
+             * Specifies autoStart.
+             * @param autoStart Determines if the connection monitor will start automatically once created
+             * @return the next update stage
+             */
+            Update withAutoStart(Boolean autoStart);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Destination.
+         */
+        interface WithDestination {
+            /**
+             * Specifies destination.
+             * @param destination Describes the destination of connection monitor
+             * @return the next update stage
+             */
+            Update withDestination(ConnectionMonitorDestination destination);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Endpoints.
+         */
+        interface WithEndpoints {
+            /**
+             * Specifies endpoints.
+             * @param endpoints List of connection monitor endpoints
+             * @return the next update stage
+             */
+            Update withEndpoints(List<ConnectionMonitorEndpoint> endpoints);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Connection monitor location
+             * @return the next update stage
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify MonitoringIntervalInSeconds.
+         */
+        interface WithMonitoringIntervalInSeconds {
+            /**
+             * Specifies monitoringIntervalInSeconds.
+             * @param monitoringIntervalInSeconds Monitoring interval in seconds
+             * @return the next update stage
+             */
+            Update withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Notes.
+         */
+        interface WithNotes {
+            /**
+             * Specifies notes.
+             * @param notes Optional notes to be associated with the connection monitor
+             * @return the next update stage
+             */
+            Update withNotes(String notes);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Outputs.
+         */
+        interface WithOutputs {
+            /**
+             * Specifies outputs.
+             * @param outputs List of connection monitor outputs
+             * @return the next update stage
+             */
+            Update withOutputs(List<ConnectionMonitorOutput> outputs);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Source.
+         */
+        interface WithSource {
+            /**
+             * Specifies source.
+             * @param source Describes the source of connection monitor
+             * @return the next update stage
+             */
+            Update withSource(ConnectionMonitorSource source);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             * @param tags Connection monitor tags
+             * @return the next update stage
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify TestConfigurations.
+         */
+        interface WithTestConfigurations {
+            /**
+             * Specifies testConfigurations.
+             * @param testConfigurations List of connection monitor test configurations
+             * @return the next update stage
+             */
+            Update withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations);
+        }
+
+        /**
+         * The stage of the connectionmonitorresult update allowing to specify TestGroups.
+         */
+        interface WithTestGroups {
+            /**
+             * Specifies testGroups.
+             * @param testGroups List of connection monitor test groups
+             * @return the next update stage
+             */
+            Update withTestGroups(List<ConnectionMonitorTestGroup> testGroups);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSource.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSource.java
new file mode 100644
index 000000000000..d93f9e321ca3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSource.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the source of connection monitor.
+ */
+public class ConnectionMonitorSource {
+    /**
+     * The ID of the resource used as the source by connection monitor.
+     */
+    @JsonProperty(value = "resourceId", required = true)
+    private String resourceId;
+
+    /**
+     * The source port used by connection monitor.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get the ID of the resource used as the source by connection monitor.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the ID of the resource used as the source by connection monitor.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the ConnectionMonitorSource object itself.
+     */
+    public ConnectionMonitorSource withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get the source port used by connection monitor.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the source port used by connection monitor.
+     *
+     * @param port the port value to set
+     * @return the ConnectionMonitorSource object itself.
+     */
+    public ConnectionMonitorSource withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSourceStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSourceStatus.java
new file mode 100644
index 000000000000..f46b11d9cd86
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSourceStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionMonitorSourceStatus.
+ */
+public final class ConnectionMonitorSourceStatus extends ExpandableStringEnum<ConnectionMonitorSourceStatus> {
+    /** Static value Unknown for ConnectionMonitorSourceStatus. */
+    public static final ConnectionMonitorSourceStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Active for ConnectionMonitorSourceStatus. */
+    public static final ConnectionMonitorSourceStatus ACTIVE = fromString("Active");
+
+    /** Static value Inactive for ConnectionMonitorSourceStatus. */
+    public static final ConnectionMonitorSourceStatus INACTIVE = fromString("Inactive");
+
+    /**
+     * Creates or finds a ConnectionMonitorSourceStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionMonitorSourceStatus
+     */
+    @JsonCreator
+    public static ConnectionMonitorSourceStatus fromString(String name) {
+        return fromString(name, ConnectionMonitorSourceStatus.class);
+    }
+
+    /**
+     * @return known ConnectionMonitorSourceStatus values
+     */
+    public static Collection<ConnectionMonitorSourceStatus> values() {
+        return values(ConnectionMonitorSourceStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSuccessThreshold.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSuccessThreshold.java
new file mode 100644
index 000000000000..300ea8cd281f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorSuccessThreshold.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the threshold for declaring a test successful.
+ */
+public class ConnectionMonitorSuccessThreshold {
+    /**
+     * The maximum percentage of failed checks permitted for a test to evaluate
+     * as successful.
+     */
+    @JsonProperty(value = "checksFailedPercent")
+    private Integer checksFailedPercent;
+
+    /**
+     * The maximum round-trip time in milliseconds permitted for a test to
+     * evaluate as successful.
+     */
+    @JsonProperty(value = "roundTripTimeMs")
+    private Double roundTripTimeMs;
+
+    /**
+     * Get the maximum percentage of failed checks permitted for a test to evaluate as successful.
+     *
+     * @return the checksFailedPercent value
+     */
+    public Integer checksFailedPercent() {
+        return this.checksFailedPercent;
+    }
+
+    /**
+     * Set the maximum percentage of failed checks permitted for a test to evaluate as successful.
+     *
+     * @param checksFailedPercent the checksFailedPercent value to set
+     * @return the ConnectionMonitorSuccessThreshold object itself.
+     */
+    public ConnectionMonitorSuccessThreshold withChecksFailedPercent(Integer checksFailedPercent) {
+        this.checksFailedPercent = checksFailedPercent;
+        return this;
+    }
+
+    /**
+     * Get the maximum round-trip time in milliseconds permitted for a test to evaluate as successful.
+     *
+     * @return the roundTripTimeMs value
+     */
+    public Double roundTripTimeMs() {
+        return this.roundTripTimeMs;
+    }
+
+    /**
+     * Set the maximum round-trip time in milliseconds permitted for a test to evaluate as successful.
+     *
+     * @param roundTripTimeMs the roundTripTimeMs value to set
+     * @return the ConnectionMonitorSuccessThreshold object itself.
+     */
+    public ConnectionMonitorSuccessThreshold withRoundTripTimeMs(Double roundTripTimeMs) {
+        this.roundTripTimeMs = roundTripTimeMs;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTcpConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTcpConfiguration.java
new file mode 100644
index 000000000000..949f7b65f559
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTcpConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the TCP configuration.
+ */
+public class ConnectionMonitorTcpConfiguration {
+    /**
+     * The port to connect to.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Value indicating whether path evaluation with trace route should be
+     * disabled.
+     */
+    @JsonProperty(value = "disableTraceRoute")
+    private Boolean disableTraceRoute;
+
+    /**
+     * Get the port to connect to.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the port to connect to.
+     *
+     * @param port the port value to set
+     * @return the ConnectionMonitorTcpConfiguration object itself.
+     */
+    public ConnectionMonitorTcpConfiguration withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether path evaluation with trace route should be disabled.
+     *
+     * @return the disableTraceRoute value
+     */
+    public Boolean disableTraceRoute() {
+        return this.disableTraceRoute;
+    }
+
+    /**
+     * Set value indicating whether path evaluation with trace route should be disabled.
+     *
+     * @param disableTraceRoute the disableTraceRoute value to set
+     * @return the ConnectionMonitorTcpConfiguration object itself.
+     */
+    public ConnectionMonitorTcpConfiguration withDisableTraceRoute(Boolean disableTraceRoute) {
+        this.disableTraceRoute = disableTraceRoute;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfiguration.java
new file mode 100644
index 000000000000..67b4cf02cb96
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfiguration.java
@@ -0,0 +1,228 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes a connection monitor test configuration.
+ */
+public class ConnectionMonitorTestConfiguration {
+    /**
+     * The name of the connection monitor test configuration.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * The frequency of test evaluation, in seconds.
+     */
+    @JsonProperty(value = "testFrequencySec")
+    private Integer testFrequencySec;
+
+    /**
+     * The protocol to use in test evaluation. Possible values include: 'Tcp',
+     * 'Http', 'Icmp'.
+     */
+    @JsonProperty(value = "protocol", required = true)
+    private ConnectionMonitorTestConfigurationProtocol protocol;
+
+    /**
+     * The preferred IP version to use in test evaluation. The connection
+     * monitor may choose to use a different version depending on other
+     * parameters. Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "preferredIPVersion")
+    private PreferredIPVersion preferredIPVersion;
+
+    /**
+     * The parameters used to perform test evaluation over HTTP.
+     */
+    @JsonProperty(value = "httpConfiguration")
+    private ConnectionMonitorHttpConfiguration httpConfiguration;
+
+    /**
+     * The parameters used to perform test evaluation over TCP.
+     */
+    @JsonProperty(value = "tcpConfiguration")
+    private ConnectionMonitorTcpConfiguration tcpConfiguration;
+
+    /**
+     * The parameters used to perform test evaluation over ICMP.
+     */
+    @JsonProperty(value = "icmpConfiguration")
+    private ConnectionMonitorIcmpConfiguration icmpConfiguration;
+
+    /**
+     * The threshold for declaring a test successful.
+     */
+    @JsonProperty(value = "successThreshold")
+    private ConnectionMonitorSuccessThreshold successThreshold;
+
+    /**
+     * Get the name of the connection monitor test configuration.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the connection monitor test configuration.
+     *
+     * @param name the name value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the frequency of test evaluation, in seconds.
+     *
+     * @return the testFrequencySec value
+     */
+    public Integer testFrequencySec() {
+        return this.testFrequencySec;
+    }
+
+    /**
+     * Set the frequency of test evaluation, in seconds.
+     *
+     * @param testFrequencySec the testFrequencySec value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withTestFrequencySec(Integer testFrequencySec) {
+        this.testFrequencySec = testFrequencySec;
+        return this;
+    }
+
+    /**
+     * Get the protocol to use in test evaluation. Possible values include: 'Tcp', 'Http', 'Icmp'.
+     *
+     * @return the protocol value
+     */
+    public ConnectionMonitorTestConfigurationProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol to use in test evaluation. Possible values include: 'Tcp', 'Http', 'Icmp'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withProtocol(ConnectionMonitorTestConfigurationProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the preferred IP version to use in test evaluation. The connection monitor may choose to use a different version depending on other parameters. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the preferredIPVersion value
+     */
+    public PreferredIPVersion preferredIPVersion() {
+        return this.preferredIPVersion;
+    }
+
+    /**
+     * Set the preferred IP version to use in test evaluation. The connection monitor may choose to use a different version depending on other parameters. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param preferredIPVersion the preferredIPVersion value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withPreferredIPVersion(PreferredIPVersion preferredIPVersion) {
+        this.preferredIPVersion = preferredIPVersion;
+        return this;
+    }
+
+    /**
+     * Get the parameters used to perform test evaluation over HTTP.
+     *
+     * @return the httpConfiguration value
+     */
+    public ConnectionMonitorHttpConfiguration httpConfiguration() {
+        return this.httpConfiguration;
+    }
+
+    /**
+     * Set the parameters used to perform test evaluation over HTTP.
+     *
+     * @param httpConfiguration the httpConfiguration value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withHttpConfiguration(ConnectionMonitorHttpConfiguration httpConfiguration) {
+        this.httpConfiguration = httpConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the parameters used to perform test evaluation over TCP.
+     *
+     * @return the tcpConfiguration value
+     */
+    public ConnectionMonitorTcpConfiguration tcpConfiguration() {
+        return this.tcpConfiguration;
+    }
+
+    /**
+     * Set the parameters used to perform test evaluation over TCP.
+     *
+     * @param tcpConfiguration the tcpConfiguration value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withTcpConfiguration(ConnectionMonitorTcpConfiguration tcpConfiguration) {
+        this.tcpConfiguration = tcpConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the parameters used to perform test evaluation over ICMP.
+     *
+     * @return the icmpConfiguration value
+     */
+    public ConnectionMonitorIcmpConfiguration icmpConfiguration() {
+        return this.icmpConfiguration;
+    }
+
+    /**
+     * Set the parameters used to perform test evaluation over ICMP.
+     *
+     * @param icmpConfiguration the icmpConfiguration value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withIcmpConfiguration(ConnectionMonitorIcmpConfiguration icmpConfiguration) {
+        this.icmpConfiguration = icmpConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the threshold for declaring a test successful.
+     *
+     * @return the successThreshold value
+     */
+    public ConnectionMonitorSuccessThreshold successThreshold() {
+        return this.successThreshold;
+    }
+
+    /**
+     * Set the threshold for declaring a test successful.
+     *
+     * @param successThreshold the successThreshold value to set
+     * @return the ConnectionMonitorTestConfiguration object itself.
+     */
+    public ConnectionMonitorTestConfiguration withSuccessThreshold(ConnectionMonitorSuccessThreshold successThreshold) {
+        this.successThreshold = successThreshold;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfigurationProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfigurationProtocol.java
new file mode 100644
index 000000000000..2e736fe9ec54
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestConfigurationProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionMonitorTestConfigurationProtocol.
+ */
+public final class ConnectionMonitorTestConfigurationProtocol extends ExpandableStringEnum<ConnectionMonitorTestConfigurationProtocol> {
+    /** Static value Tcp for ConnectionMonitorTestConfigurationProtocol. */
+    public static final ConnectionMonitorTestConfigurationProtocol TCP = fromString("Tcp");
+
+    /** Static value Http for ConnectionMonitorTestConfigurationProtocol. */
+    public static final ConnectionMonitorTestConfigurationProtocol HTTP = fromString("Http");
+
+    /** Static value Icmp for ConnectionMonitorTestConfigurationProtocol. */
+    public static final ConnectionMonitorTestConfigurationProtocol ICMP = fromString("Icmp");
+
+    /**
+     * Creates or finds a ConnectionMonitorTestConfigurationProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionMonitorTestConfigurationProtocol
+     */
+    @JsonCreator
+    public static ConnectionMonitorTestConfigurationProtocol fromString(String name) {
+        return fromString(name, ConnectionMonitorTestConfigurationProtocol.class);
+    }
+
+    /**
+     * @return known ConnectionMonitorTestConfigurationProtocol values
+     */
+    public static Collection<ConnectionMonitorTestConfigurationProtocol> values() {
+        return values(ConnectionMonitorTestConfigurationProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestGroup.java
new file mode 100644
index 000000000000..e8024da7e474
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorTestGroup.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the connection monitor test group.
+ */
+public class ConnectionMonitorTestGroup {
+    /**
+     * The name of the connection monitor test group.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Value indicating whether test group is disabled.
+     */
+    @JsonProperty(value = "disable")
+    private Boolean disable;
+
+    /**
+     * List of test configuration names.
+     */
+    @JsonProperty(value = "testConfigurations", required = true)
+    private List<String> testConfigurations;
+
+    /**
+     * List of source endpoint names.
+     */
+    @JsonProperty(value = "sources", required = true)
+    private List<String> sources;
+
+    /**
+     * List of destination endpoint names.
+     */
+    @JsonProperty(value = "destinations", required = true)
+    private List<String> destinations;
+
+    /**
+     * Get the name of the connection monitor test group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the connection monitor test group.
+     *
+     * @param name the name value to set
+     * @return the ConnectionMonitorTestGroup object itself.
+     */
+    public ConnectionMonitorTestGroup withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether test group is disabled.
+     *
+     * @return the disable value
+     */
+    public Boolean disable() {
+        return this.disable;
+    }
+
+    /**
+     * Set value indicating whether test group is disabled.
+     *
+     * @param disable the disable value to set
+     * @return the ConnectionMonitorTestGroup object itself.
+     */
+    public ConnectionMonitorTestGroup withDisable(Boolean disable) {
+        this.disable = disable;
+        return this;
+    }
+
+    /**
+     * Get list of test configuration names.
+     *
+     * @return the testConfigurations value
+     */
+    public List<String> testConfigurations() {
+        return this.testConfigurations;
+    }
+
+    /**
+     * Set list of test configuration names.
+     *
+     * @param testConfigurations the testConfigurations value to set
+     * @return the ConnectionMonitorTestGroup object itself.
+     */
+    public ConnectionMonitorTestGroup withTestConfigurations(List<String> testConfigurations) {
+        this.testConfigurations = testConfigurations;
+        return this;
+    }
+
+    /**
+     * Get list of source endpoint names.
+     *
+     * @return the sources value
+     */
+    public List<String> sources() {
+        return this.sources;
+    }
+
+    /**
+     * Set list of source endpoint names.
+     *
+     * @param sources the sources value to set
+     * @return the ConnectionMonitorTestGroup object itself.
+     */
+    public ConnectionMonitorTestGroup withSources(List<String> sources) {
+        this.sources = sources;
+        return this;
+    }
+
+    /**
+     * Get list of destination endpoint names.
+     *
+     * @return the destinations value
+     */
+    public List<String> destinations() {
+        return this.destinations;
+    }
+
+    /**
+     * Set list of destination endpoint names.
+     *
+     * @param destinations the destinations value to set
+     * @return the ConnectionMonitorTestGroup object itself.
+     */
+    public ConnectionMonitorTestGroup withDestinations(List<String> destinations) {
+        this.destinations = destinations;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorType.java
new file mode 100644
index 000000000000..3d548902d8ab
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionMonitorType.
+ */
+public final class ConnectionMonitorType extends ExpandableStringEnum<ConnectionMonitorType> {
+    /** Static value MultiEndpoint for ConnectionMonitorType. */
+    public static final ConnectionMonitorType MULTI_ENDPOINT = fromString("MultiEndpoint");
+
+    /** Static value SingleSourceDestination for ConnectionMonitorType. */
+    public static final ConnectionMonitorType SINGLE_SOURCE_DESTINATION = fromString("SingleSourceDestination");
+
+    /**
+     * Creates or finds a ConnectionMonitorType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionMonitorType
+     */
+    @JsonCreator
+    public static ConnectionMonitorType fromString(String name) {
+        return fromString(name, ConnectionMonitorType.class);
+    }
+
+    /**
+     * @return known ConnectionMonitorType values
+     */
+    public static Collection<ConnectionMonitorType> values() {
+        return values(ConnectionMonitorType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorWorkspaceSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorWorkspaceSettings.java
new file mode 100644
index 000000000000..6d8b2b030fc6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitorWorkspaceSettings.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the settings for producing output into a log analytics workspace.
+ */
+public class ConnectionMonitorWorkspaceSettings {
+    /**
+     * Log analytics workspace resource ID.
+     */
+    @JsonProperty(value = "workspaceResourceId")
+    private String workspaceResourceId;
+
+    /**
+     * Get log analytics workspace resource ID.
+     *
+     * @return the workspaceResourceId value
+     */
+    public String workspaceResourceId() {
+        return this.workspaceResourceId;
+    }
+
+    /**
+     * Set log analytics workspace resource ID.
+     *
+     * @param workspaceResourceId the workspaceResourceId value to set
+     * @return the ConnectionMonitorWorkspaceSettings object itself.
+     */
+    public ConnectionMonitorWorkspaceSettings withWorkspaceResourceId(String workspaceResourceId) {
+        this.workspaceResourceId = workspaceResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitors.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitors.java
new file mode 100644
index 000000000000..75e654eaf9b6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionMonitors.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectionMonitorsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ConnectionMonitors.
+ */
+public interface ConnectionMonitors extends SupportsCreating<ConnectionMonitorResult.DefinitionStages.Blank>, HasInner<ConnectionMonitorsInner> {
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable stopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName);
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable startAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName);
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionMonitorQueryResult> queryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName);
+
+    /**
+     * Gets a connection monitor by name.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionMonitorResult> getAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName);
+
+    /**
+     * Lists all connection monitors for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionMonitorResult> listAsync(String resourceGroupName, String networkWatcherName);
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionResetSharedKey.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionResetSharedKey.java
new file mode 100644
index 000000000000..19a5348cf551
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionResetSharedKey.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectionResetSharedKeyInner;
+
+/**
+ * Type representing ConnectionResetSharedKey.
+ */
+public interface ConnectionResetSharedKey extends HasInner<ConnectionResetSharedKeyInner>, HasManager<NetworkManager> {
+    /**
+     * @return the keyLength value.
+     */
+    int keyLength();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionSharedKey.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionSharedKey.java
new file mode 100644
index 000000000000..d74c668db57f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionSharedKey.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectionSharedKeyInner;
+
+/**
+ * Type representing ConnectionSharedKey.
+ */
+public interface ConnectionSharedKey extends HasInner<ConnectionSharedKeyInner>, HasManager<NetworkManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the value value.
+     */
+    String value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionState.java
new file mode 100644
index 000000000000..cd9aadf57104
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionState.
+ */
+public final class ConnectionState extends ExpandableStringEnum<ConnectionState> {
+    /** Static value Reachable for ConnectionState. */
+    public static final ConnectionState REACHABLE = fromString("Reachable");
+
+    /** Static value Unreachable for ConnectionState. */
+    public static final ConnectionState UNREACHABLE = fromString("Unreachable");
+
+    /** Static value Unknown for ConnectionState. */
+    public static final ConnectionState UNKNOWN = fromString("Unknown");
+
+    /**
+     * Creates or finds a ConnectionState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionState
+     */
+    @JsonCreator
+    public static ConnectionState fromString(String name) {
+        return fromString(name, ConnectionState.class);
+    }
+
+    /**
+     * @return known ConnectionState values
+     */
+    public static Collection<ConnectionState> values() {
+        return values(ConnectionState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStateSnapshot.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStateSnapshot.java
new file mode 100644
index 000000000000..88a21cdc578d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStateSnapshot.java
@@ -0,0 +1,270 @@
+/**
+ * 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.network.v2020_04_01;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Connection state snapshot.
+ */
+public class ConnectionStateSnapshot {
+    /**
+     * The connection state. Possible values include: 'Reachable',
+     * 'Unreachable', 'Unknown'.
+     */
+    @JsonProperty(value = "connectionState")
+    private ConnectionState connectionState;
+
+    /**
+     * The start time of the connection snapshot.
+     */
+    @JsonProperty(value = "startTime")
+    private DateTime startTime;
+
+    /**
+     * The end time of the connection snapshot.
+     */
+    @JsonProperty(value = "endTime")
+    private DateTime endTime;
+
+    /**
+     * Connectivity analysis evaluation state. Possible values include:
+     * 'NotStarted', 'InProgress', 'Completed'.
+     */
+    @JsonProperty(value = "evaluationState")
+    private EvaluationState evaluationState;
+
+    /**
+     * Average latency in ms.
+     */
+    @JsonProperty(value = "avgLatencyInMs")
+    private Integer avgLatencyInMs;
+
+    /**
+     * Minimum latency in ms.
+     */
+    @JsonProperty(value = "minLatencyInMs")
+    private Integer minLatencyInMs;
+
+    /**
+     * Maximum latency in ms.
+     */
+    @JsonProperty(value = "maxLatencyInMs")
+    private Integer maxLatencyInMs;
+
+    /**
+     * The number of sent probes.
+     */
+    @JsonProperty(value = "probesSent")
+    private Integer probesSent;
+
+    /**
+     * The number of failed probes.
+     */
+    @JsonProperty(value = "probesFailed")
+    private Integer probesFailed;
+
+    /**
+     * List of hops between the source and the destination.
+     */
+    @JsonProperty(value = "hops", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectivityHop> hops;
+
+    /**
+     * Get the connection state. Possible values include: 'Reachable', 'Unreachable', 'Unknown'.
+     *
+     * @return the connectionState value
+     */
+    public ConnectionState connectionState() {
+        return this.connectionState;
+    }
+
+    /**
+     * Set the connection state. Possible values include: 'Reachable', 'Unreachable', 'Unknown'.
+     *
+     * @param connectionState the connectionState value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withConnectionState(ConnectionState connectionState) {
+        this.connectionState = connectionState;
+        return this;
+    }
+
+    /**
+     * Get the start time of the connection snapshot.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Set the start time of the connection snapshot.
+     *
+     * @param startTime the startTime value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withStartTime(DateTime startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    /**
+     * Get the end time of the connection snapshot.
+     *
+     * @return the endTime value
+     */
+    public DateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Set the end time of the connection snapshot.
+     *
+     * @param endTime the endTime value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withEndTime(DateTime endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+    /**
+     * Get connectivity analysis evaluation state. Possible values include: 'NotStarted', 'InProgress', 'Completed'.
+     *
+     * @return the evaluationState value
+     */
+    public EvaluationState evaluationState() {
+        return this.evaluationState;
+    }
+
+    /**
+     * Set connectivity analysis evaluation state. Possible values include: 'NotStarted', 'InProgress', 'Completed'.
+     *
+     * @param evaluationState the evaluationState value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withEvaluationState(EvaluationState evaluationState) {
+        this.evaluationState = evaluationState;
+        return this;
+    }
+
+    /**
+     * Get average latency in ms.
+     *
+     * @return the avgLatencyInMs value
+     */
+    public Integer avgLatencyInMs() {
+        return this.avgLatencyInMs;
+    }
+
+    /**
+     * Set average latency in ms.
+     *
+     * @param avgLatencyInMs the avgLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withAvgLatencyInMs(Integer avgLatencyInMs) {
+        this.avgLatencyInMs = avgLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get minimum latency in ms.
+     *
+     * @return the minLatencyInMs value
+     */
+    public Integer minLatencyInMs() {
+        return this.minLatencyInMs;
+    }
+
+    /**
+     * Set minimum latency in ms.
+     *
+     * @param minLatencyInMs the minLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withMinLatencyInMs(Integer minLatencyInMs) {
+        this.minLatencyInMs = minLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get maximum latency in ms.
+     *
+     * @return the maxLatencyInMs value
+     */
+    public Integer maxLatencyInMs() {
+        return this.maxLatencyInMs;
+    }
+
+    /**
+     * Set maximum latency in ms.
+     *
+     * @param maxLatencyInMs the maxLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withMaxLatencyInMs(Integer maxLatencyInMs) {
+        this.maxLatencyInMs = maxLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get the number of sent probes.
+     *
+     * @return the probesSent value
+     */
+    public Integer probesSent() {
+        return this.probesSent;
+    }
+
+    /**
+     * Set the number of sent probes.
+     *
+     * @param probesSent the probesSent value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withProbesSent(Integer probesSent) {
+        this.probesSent = probesSent;
+        return this;
+    }
+
+    /**
+     * Get the number of failed probes.
+     *
+     * @return the probesFailed value
+     */
+    public Integer probesFailed() {
+        return this.probesFailed;
+    }
+
+    /**
+     * Set the number of failed probes.
+     *
+     * @param probesFailed the probesFailed value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withProbesFailed(Integer probesFailed) {
+        this.probesFailed = probesFailed;
+        return this;
+    }
+
+    /**
+     * Get list of hops between the source and the destination.
+     *
+     * @return the hops value
+     */
+    public List<ConnectivityHop> hops() {
+        return this.hops;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStatus.java
new file mode 100644
index 000000000000..ec3a497b716a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ConnectionStatus.
+ */
+public final class ConnectionStatus extends ExpandableStringEnum<ConnectionStatus> {
+    /** Static value Unknown for ConnectionStatus. */
+    public static final ConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Connected for ConnectionStatus. */
+    public static final ConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value Disconnected for ConnectionStatus. */
+    public static final ConnectionStatus DISCONNECTED = fromString("Disconnected");
+
+    /** Static value Degraded for ConnectionStatus. */
+    public static final ConnectionStatus DEGRADED = fromString("Degraded");
+
+    /**
+     * Creates or finds a ConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ConnectionStatus
+     */
+    @JsonCreator
+    public static ConnectionStatus fromString(String name) {
+        return fromString(name, ConnectionStatus.class);
+    }
+
+    /**
+     * @return known ConnectionStatus values
+     */
+    public static Collection<ConnectionStatus> values() {
+        return values(ConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityDestination.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityDestination.java
new file mode 100644
index 000000000000..fccefb7e7de0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityDestination.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define destination of connection.
+ */
+public class ConnectivityDestination {
+    /**
+     * The ID of the resource to which a connection attempt will be made.
+     */
+    @JsonProperty(value = "resourceId")
+    private String resourceId;
+
+    /**
+     * The IP address or URI the resource to which a connection attempt will be
+     * made.
+     */
+    @JsonProperty(value = "address")
+    private String address;
+
+    /**
+     * Port on which check connectivity will be performed.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get the ID of the resource to which a connection attempt will be made.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the ID of the resource to which a connection attempt will be made.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the ConnectivityDestination object itself.
+     */
+    public ConnectivityDestination withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get the IP address or URI the resource to which a connection attempt will be made.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Set the IP address or URI the resource to which a connection attempt will be made.
+     *
+     * @param address the address value to set
+     * @return the ConnectivityDestination object itself.
+     */
+    public ConnectivityDestination withAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    /**
+     * Get port on which check connectivity will be performed.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set port on which check connectivity will be performed.
+     *
+     * @param port the port value to set
+     * @return the ConnectivityDestination object itself.
+     */
+    public ConnectivityDestination withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityHop.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityHop.java
new file mode 100644
index 000000000000..2618bfc9688b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityHop.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information about a hop between the source and the destination.
+ */
+public class ConnectivityHop {
+    /**
+     * The type of the hop.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * The ID of the hop.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * The IP address of the hop.
+     */
+    @JsonProperty(value = "address", access = JsonProperty.Access.WRITE_ONLY)
+    private String address;
+
+    /**
+     * The ID of the resource corresponding to this hop.
+     */
+    @JsonProperty(value = "resourceId", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceId;
+
+    /**
+     * List of next hop identifiers.
+     */
+    @JsonProperty(value = "nextHopIds", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> nextHopIds;
+
+    /**
+     * List of issues.
+     */
+    @JsonProperty(value = "issues", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectivityIssue> issues;
+
+    /**
+     * Get the type of the hop.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the ID of the hop.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the IP address of the hop.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Get the ID of the resource corresponding to this hop.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Get list of next hop identifiers.
+     *
+     * @return the nextHopIds value
+     */
+    public List<String> nextHopIds() {
+        return this.nextHopIds;
+    }
+
+    /**
+     * Get list of issues.
+     *
+     * @return the issues value
+     */
+    public List<ConnectivityIssue> issues() {
+        return this.issues;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityInformation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityInformation.java
new file mode 100644
index 000000000000..f3af6fc734ab
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityInformation.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ConnectivityInformationInner;
+import java.util.List;
+
+/**
+ * Type representing ConnectivityInformation.
+ */
+public interface ConnectivityInformation extends HasInner<ConnectivityInformationInner>, HasManager<NetworkManager> {
+    /**
+     * @return the avgLatencyInMs value.
+     */
+    Integer avgLatencyInMs();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    ConnectionStatus connectionStatus();
+
+    /**
+     * @return the hops value.
+     */
+    List<ConnectivityHop> hops();
+
+    /**
+     * @return the maxLatencyInMs value.
+     */
+    Integer maxLatencyInMs();
+
+    /**
+     * @return the minLatencyInMs value.
+     */
+    Integer minLatencyInMs();
+
+    /**
+     * @return the probesFailed value.
+     */
+    Integer probesFailed();
+
+    /**
+     * @return the probesSent value.
+     */
+    Integer probesSent();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityIssue.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityIssue.java
new file mode 100644
index 000000000000..e9b0de356f18
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityIssue.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.network.v2020_04_01;
+
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information about an issue encountered in the process of checking for
+ * connectivity.
+ */
+public class ConnectivityIssue {
+    /**
+     * The origin of the issue. Possible values include: 'Local', 'Inbound',
+     * 'Outbound'.
+     */
+    @JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY)
+    private Origin origin;
+
+    /**
+     * The severity of the issue. Possible values include: 'Error', 'Warning'.
+     */
+    @JsonProperty(value = "severity", access = JsonProperty.Access.WRITE_ONLY)
+    private Severity severity;
+
+    /**
+     * The type of issue. Possible values include: 'Unknown', 'AgentStopped',
+     * 'GuestFirewall', 'DnsResolution', 'SocketBind', 'NetworkSecurityRule',
+     * 'UserDefinedRoute', 'PortThrottled', 'Platform'.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private IssueType type;
+
+    /**
+     * Provides additional context on the issue.
+     */
+    @JsonProperty(value = "context", access = JsonProperty.Access.WRITE_ONLY)
+    private List<Map<String, String>> context;
+
+    /**
+     * Get the origin of the issue. Possible values include: 'Local', 'Inbound', 'Outbound'.
+     *
+     * @return the origin value
+     */
+    public Origin origin() {
+        return this.origin;
+    }
+
+    /**
+     * Get the severity of the issue. Possible values include: 'Error', 'Warning'.
+     *
+     * @return the severity value
+     */
+    public Severity severity() {
+        return this.severity;
+    }
+
+    /**
+     * Get the type of issue. Possible values include: 'Unknown', 'AgentStopped', 'GuestFirewall', 'DnsResolution', 'SocketBind', 'NetworkSecurityRule', 'UserDefinedRoute', 'PortThrottled', 'Platform'.
+     *
+     * @return the type value
+     */
+    public IssueType type() {
+        return this.type;
+    }
+
+    /**
+     * Get provides additional context on the issue.
+     *
+     * @return the context value
+     */
+    public List<Map<String, String>> context() {
+        return this.context;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityParameters.java
new file mode 100644
index 000000000000..c99822d2eab8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivityParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that determine how the connectivity check will be performed.
+ */
+public class ConnectivityParameters {
+    /**
+     * The source of the connection.
+     */
+    @JsonProperty(value = "source", required = true)
+    private ConnectivitySource source;
+
+    /**
+     * The destination of connection.
+     */
+    @JsonProperty(value = "destination", required = true)
+    private ConnectivityDestination destination;
+
+    /**
+     * Network protocol. Possible values include: 'Tcp', 'Http', 'Https',
+     * 'Icmp'.
+     */
+    @JsonProperty(value = "protocol")
+    private Protocol protocol;
+
+    /**
+     * Configuration of the protocol.
+     */
+    @JsonProperty(value = "protocolConfiguration")
+    private ProtocolConfiguration protocolConfiguration;
+
+    /**
+     * Preferred IP version of the connection. Possible values include: 'IPv4',
+     * 'IPv6'.
+     */
+    @JsonProperty(value = "preferredIPVersion")
+    private IPVersion preferredIPVersion;
+
+    /**
+     * Get the source of the connection.
+     *
+     * @return the source value
+     */
+    public ConnectivitySource source() {
+        return this.source;
+    }
+
+    /**
+     * Set the source of the connection.
+     *
+     * @param source the source value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withSource(ConnectivitySource source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get the destination of connection.
+     *
+     * @return the destination value
+     */
+    public ConnectivityDestination destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set the destination of connection.
+     *
+     * @param destination the destination value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withDestination(ConnectivityDestination destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get network protocol. Possible values include: 'Tcp', 'Http', 'Https', 'Icmp'.
+     *
+     * @return the protocol value
+     */
+    public Protocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set network protocol. Possible values include: 'Tcp', 'Http', 'Https', 'Icmp'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withProtocol(Protocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get configuration of the protocol.
+     *
+     * @return the protocolConfiguration value
+     */
+    public ProtocolConfiguration protocolConfiguration() {
+        return this.protocolConfiguration;
+    }
+
+    /**
+     * Set configuration of the protocol.
+     *
+     * @param protocolConfiguration the protocolConfiguration value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withProtocolConfiguration(ProtocolConfiguration protocolConfiguration) {
+        this.protocolConfiguration = protocolConfiguration;
+        return this;
+    }
+
+    /**
+     * Get preferred IP version of the connection. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the preferredIPVersion value
+     */
+    public IPVersion preferredIPVersion() {
+        return this.preferredIPVersion;
+    }
+
+    /**
+     * Set preferred IP version of the connection. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param preferredIPVersion the preferredIPVersion value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withPreferredIPVersion(IPVersion preferredIPVersion) {
+        this.preferredIPVersion = preferredIPVersion;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivitySource.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivitySource.java
new file mode 100644
index 000000000000..cdd41658f549
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ConnectivitySource.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the source of the connection.
+ */
+public class ConnectivitySource {
+    /**
+     * The ID of the resource from which a connectivity check will be
+     * initiated.
+     */
+    @JsonProperty(value = "resourceId", required = true)
+    private String resourceId;
+
+    /**
+     * The source port from which a connectivity check will be performed.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get the ID of the resource from which a connectivity check will be initiated.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the ID of the resource from which a connectivity check will be initiated.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the ConnectivitySource object itself.
+     */
+    public ConnectivitySource withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get the source port from which a connectivity check will be performed.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set the source port from which a connectivity check will be performed.
+     *
+     * @param port the port value to set
+     * @return the ConnectivitySource object itself.
+     */
+    public ConnectivitySource withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Container.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Container.java
new file mode 100644
index 000000000000..7f91cfbb0360
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Container.java
@@ -0,0 +1,17 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+
+/**
+ * Reference to container resource in remote resource provider.
+ */
+public class Container extends SubResource {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterface.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterface.java
new file mode 100644
index 000000000000..309af5b3fd62
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterface.java
@@ -0,0 +1,151 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Container network interface child resource.
+ */
+@JsonFlatten
+public class ContainerNetworkInterface extends SubResource {
+    /**
+     * Container network interface configuration from which this container
+     * network interface is created.
+     */
+    @JsonProperty(value = "properties.containerNetworkInterfaceConfiguration", access = JsonProperty.Access.WRITE_ONLY)
+    private ContainerNetworkInterfaceConfiguration containerNetworkInterfaceConfiguration;
+
+    /**
+     * Reference to the container to which this container network interface is
+     * attached.
+     */
+    @JsonProperty(value = "properties.container")
+    private Container container;
+
+    /**
+     * Reference to the ip configuration on this container nic.
+     */
+    @JsonProperty(value = "properties.ipConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ContainerNetworkInterfaceIpConfiguration> ipConfigurations;
+
+    /**
+     * The provisioning state of the container network interface resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Sub Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get container network interface configuration from which this container network interface is created.
+     *
+     * @return the containerNetworkInterfaceConfiguration value
+     */
+    public ContainerNetworkInterfaceConfiguration containerNetworkInterfaceConfiguration() {
+        return this.containerNetworkInterfaceConfiguration;
+    }
+
+    /**
+     * Get reference to the container to which this container network interface is attached.
+     *
+     * @return the container value
+     */
+    public Container container() {
+        return this.container;
+    }
+
+    /**
+     * Set reference to the container to which this container network interface is attached.
+     *
+     * @param container the container value to set
+     * @return the ContainerNetworkInterface object itself.
+     */
+    public ContainerNetworkInterface withContainer(Container container) {
+        this.container = container;
+        return this;
+    }
+
+    /**
+     * Get reference to the ip configuration on this container nic.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<ContainerNetworkInterfaceIpConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Get the provisioning state of the container network interface resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ContainerNetworkInterface object itself.
+     */
+    public ContainerNetworkInterface withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get sub Resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceConfiguration.java
new file mode 100644
index 000000000000..75985a0ce1c9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceConfiguration.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Container network interface configuration child resource.
+ */
+@JsonFlatten
+public class ContainerNetworkInterfaceConfiguration extends SubResource {
+    /**
+     * A list of ip configurations of the container network interface
+     * configuration.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<IPConfigurationProfile> ipConfigurations;
+
+    /**
+     * A list of container network interfaces created from this container
+     * network interface configuration.
+     */
+    @JsonProperty(value = "properties.containerNetworkInterfaces")
+    private List<SubResource> containerNetworkInterfaces;
+
+    /**
+     * The provisioning state of the container network interface configuration
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Sub Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get a list of ip configurations of the container network interface configuration.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<IPConfigurationProfile> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set a list of ip configurations of the container network interface configuration.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the ContainerNetworkInterfaceConfiguration object itself.
+     */
+    public ContainerNetworkInterfaceConfiguration withIpConfigurations(List<IPConfigurationProfile> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get a list of container network interfaces created from this container network interface configuration.
+     *
+     * @return the containerNetworkInterfaces value
+     */
+    public List<SubResource> containerNetworkInterfaces() {
+        return this.containerNetworkInterfaces;
+    }
+
+    /**
+     * Set a list of container network interfaces created from this container network interface configuration.
+     *
+     * @param containerNetworkInterfaces the containerNetworkInterfaces value to set
+     * @return the ContainerNetworkInterfaceConfiguration object itself.
+     */
+    public ContainerNetworkInterfaceConfiguration withContainerNetworkInterfaces(List<SubResource> containerNetworkInterfaces) {
+        this.containerNetworkInterfaces = containerNetworkInterfaces;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the container network interface configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ContainerNetworkInterfaceConfiguration object itself.
+     */
+    public ContainerNetworkInterfaceConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get sub Resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceIpConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceIpConfiguration.java
new file mode 100644
index 000000000000..f51ff165afa4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ContainerNetworkInterfaceIpConfiguration.java
@@ -0,0 +1,92 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The ip configuration for a container network interface.
+ */
+@JsonFlatten
+public class ContainerNetworkInterfaceIpConfiguration {
+    /**
+     * The provisioning state of the container network interface IP
+     * configuration resource. Possible values include: 'Succeeded',
+     * 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Sub Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the provisioning state of the container network interface IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ContainerNetworkInterfaceIpConfiguration object itself.
+     */
+    public ContainerNetworkInterfaceIpConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get sub Resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CustomDnsConfigPropertiesFormat.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CustomDnsConfigPropertiesFormat.java
new file mode 100644
index 000000000000..65392a881a0c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/CustomDnsConfigPropertiesFormat.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains custom Dns resolution configuration from customer.
+ */
+public class CustomDnsConfigPropertiesFormat {
+    /**
+     * Fqdn that resolves to private endpoint ip address.
+     */
+    @JsonProperty(value = "fqdn")
+    private String fqdn;
+
+    /**
+     * A list of private ip addresses of the private endpoint.
+     */
+    @JsonProperty(value = "ipAddresses")
+    private List<String> ipAddresses;
+
+    /**
+     * Get fqdn that resolves to private endpoint ip address.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set fqdn that resolves to private endpoint ip address.
+     *
+     * @param fqdn the fqdn value to set
+     * @return the CustomDnsConfigPropertiesFormat object itself.
+     */
+    public CustomDnsConfigPropertiesFormat withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get a list of private ip addresses of the private endpoint.
+     *
+     * @return the ipAddresses value
+     */
+    public List<String> ipAddresses() {
+        return this.ipAddresses;
+    }
+
+    /**
+     * Set a list of private ip addresses of the private endpoint.
+     *
+     * @param ipAddresses the ipAddresses value to set
+     * @return the CustomDnsConfigPropertiesFormat object itself.
+     */
+    public CustomDnsConfigPropertiesFormat withIpAddresses(List<String> ipAddresses) {
+        this.ipAddresses = ipAddresses;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicies.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicies.java
new file mode 100644
index 000000000000..2d6853055221
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicies.java
@@ -0,0 +1,23 @@
+/**
+ * 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.network.v2020_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.management.network.v2020_04_01.implementation.DdosCustomPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing DdosCustomPolicies.
+ */
+public interface DdosCustomPolicies extends SupportsCreating<DdosCustomPolicy.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<DdosCustomPolicy>, HasInner<DdosCustomPoliciesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicy.java
new file mode 100644
index 000000000000..64e52d5d5419
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicy.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.DdosCustomPolicyInner;
+
+/**
+ * Type representing DdosCustomPolicy.
+ */
+public interface DdosCustomPolicy extends HasInner<DdosCustomPolicyInner>, Resource, GroupableResourceCore<NetworkManager, DdosCustomPolicyInner>, HasResourceGroup, Refreshable<DdosCustomPolicy>, Updatable<DdosCustomPolicy.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the protocolCustomSettings value.
+     */
+    List<ProtocolCustomSettingsFormat> protocolCustomSettings();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddresses value.
+     */
+    List<SubResource> publicIPAddresses();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the DdosCustomPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of DdosCustomPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a DdosCustomPolicy definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the DdosCustomPolicy definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the ddoscustompolicy definition allowing to specify ProtocolCustomSettings.
+         */
+        interface WithProtocolCustomSettings {
+            /**
+             * Specifies protocolCustomSettings.
+             * @param protocolCustomSettings The protocol-specific DDoS policy customization parameters
+             * @return the next definition stage
+             */
+            WithCreate withProtocolCustomSettings(List<ProtocolCustomSettingsFormat> protocolCustomSettings);
+        }
+
+        /**
+         * 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<DdosCustomPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithProtocolCustomSettings {
+        }
+    }
+    /**
+     * The template for a DdosCustomPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<DdosCustomPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithProtocolCustomSettings {
+    }
+
+    /**
+     * Grouping of DdosCustomPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ddoscustompolicy update allowing to specify ProtocolCustomSettings.
+         */
+        interface WithProtocolCustomSettings {
+            /**
+             * Specifies protocolCustomSettings.
+             * @param protocolCustomSettings The protocol-specific DDoS policy customization parameters
+             * @return the next update stage
+             */
+            Update withProtocolCustomSettings(List<ProtocolCustomSettingsFormat> protocolCustomSettings);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyProtocol.java
new file mode 100644
index 000000000000..443150adb71a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DdosCustomPolicyProtocol.
+ */
+public final class DdosCustomPolicyProtocol extends ExpandableStringEnum<DdosCustomPolicyProtocol> {
+    /** Static value Tcp for DdosCustomPolicyProtocol. */
+    public static final DdosCustomPolicyProtocol TCP = fromString("Tcp");
+
+    /** Static value Udp for DdosCustomPolicyProtocol. */
+    public static final DdosCustomPolicyProtocol UDP = fromString("Udp");
+
+    /** Static value Syn for DdosCustomPolicyProtocol. */
+    public static final DdosCustomPolicyProtocol SYN = fromString("Syn");
+
+    /**
+     * Creates or finds a DdosCustomPolicyProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DdosCustomPolicyProtocol
+     */
+    @JsonCreator
+    public static DdosCustomPolicyProtocol fromString(String name) {
+        return fromString(name, DdosCustomPolicyProtocol.class);
+    }
+
+    /**
+     * @return known DdosCustomPolicyProtocol values
+     */
+    public static Collection<DdosCustomPolicyProtocol> values() {
+        return values(DdosCustomPolicyProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyTriggerSensitivityOverride.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyTriggerSensitivityOverride.java
new file mode 100644
index 000000000000..0447adac5c50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosCustomPolicyTriggerSensitivityOverride.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DdosCustomPolicyTriggerSensitivityOverride.
+ */
+public final class DdosCustomPolicyTriggerSensitivityOverride extends ExpandableStringEnum<DdosCustomPolicyTriggerSensitivityOverride> {
+    /** Static value Relaxed for DdosCustomPolicyTriggerSensitivityOverride. */
+    public static final DdosCustomPolicyTriggerSensitivityOverride RELAXED = fromString("Relaxed");
+
+    /** Static value Low for DdosCustomPolicyTriggerSensitivityOverride. */
+    public static final DdosCustomPolicyTriggerSensitivityOverride LOW = fromString("Low");
+
+    /** Static value Default for DdosCustomPolicyTriggerSensitivityOverride. */
+    public static final DdosCustomPolicyTriggerSensitivityOverride DEFAULT = fromString("Default");
+
+    /** Static value High for DdosCustomPolicyTriggerSensitivityOverride. */
+    public static final DdosCustomPolicyTriggerSensitivityOverride HIGH = fromString("High");
+
+    /**
+     * Creates or finds a DdosCustomPolicyTriggerSensitivityOverride from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DdosCustomPolicyTriggerSensitivityOverride
+     */
+    @JsonCreator
+    public static DdosCustomPolicyTriggerSensitivityOverride fromString(String name) {
+        return fromString(name, DdosCustomPolicyTriggerSensitivityOverride.class);
+    }
+
+    /**
+     * @return known DdosCustomPolicyTriggerSensitivityOverride values
+     */
+    public static Collection<DdosCustomPolicyTriggerSensitivityOverride> values() {
+        return values(DdosCustomPolicyTriggerSensitivityOverride.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlan.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlan.java
new file mode 100644
index 000000000000..293621291d71
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlan.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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.DdosProtectionPlanInner;
+
+/**
+ * Type representing DdosProtectionPlan.
+ */
+public interface DdosProtectionPlan extends HasInner<DdosProtectionPlanInner>, Resource, GroupableResourceCore<NetworkManager, DdosProtectionPlanInner>, HasResourceGroup, Refreshable<DdosProtectionPlan>, Updatable<DdosProtectionPlan.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the virtualNetworks value.
+     */
+    List<SubResource> virtualNetworks();
+
+    /**
+     * The entirety of the DdosProtectionPlan definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of DdosProtectionPlan definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a DdosProtectionPlan definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the DdosProtectionPlan definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * 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<DdosProtectionPlan>, Resource.DefinitionWithTags<WithCreate> {
+        }
+    }
+    /**
+     * The template for a DdosProtectionPlan update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<DdosProtectionPlan>, Resource.UpdateWithTags<Update> {
+    }
+
+    /**
+     * Grouping of DdosProtectionPlan update stages.
+     */
+    interface UpdateStages {
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlans.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlans.java
new file mode 100644
index 000000000000..8284b841c180
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosProtectionPlans.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.DdosProtectionPlansInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing DdosProtectionPlans.
+ */
+public interface DdosProtectionPlans extends SupportsCreating<DdosProtectionPlan.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<DdosProtectionPlan>, SupportsListingByResourceGroup<DdosProtectionPlan>, SupportsListing<DdosProtectionPlan>, HasInner<DdosProtectionPlansInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettings.java
new file mode 100644
index 000000000000..23b20c5ac1f6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettings.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains the DDoS protection settings of the public IP.
+ */
+public class DdosSettings {
+    /**
+     * The DDoS custom policy associated with the public IP.
+     */
+    @JsonProperty(value = "ddosCustomPolicy")
+    private SubResource ddosCustomPolicy;
+
+    /**
+     * The DDoS protection policy customizability of the public IP. Only
+     * standard coverage will have the ability to be customized. Possible
+     * values include: 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "protectionCoverage")
+    private DdosSettingsProtectionCoverage protectionCoverage;
+
+    /**
+     * Enables DDoS protection on the public IP.
+     */
+    @JsonProperty(value = "protectedIP")
+    private Boolean protectedIP;
+
+    /**
+     * Get the DDoS custom policy associated with the public IP.
+     *
+     * @return the ddosCustomPolicy value
+     */
+    public SubResource ddosCustomPolicy() {
+        return this.ddosCustomPolicy;
+    }
+
+    /**
+     * Set the DDoS custom policy associated with the public IP.
+     *
+     * @param ddosCustomPolicy the ddosCustomPolicy value to set
+     * @return the DdosSettings object itself.
+     */
+    public DdosSettings withDdosCustomPolicy(SubResource ddosCustomPolicy) {
+        this.ddosCustomPolicy = ddosCustomPolicy;
+        return this;
+    }
+
+    /**
+     * Get the DDoS protection policy customizability of the public IP. Only standard coverage will have the ability to be customized. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the protectionCoverage value
+     */
+    public DdosSettingsProtectionCoverage protectionCoverage() {
+        return this.protectionCoverage;
+    }
+
+    /**
+     * Set the DDoS protection policy customizability of the public IP. Only standard coverage will have the ability to be customized. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param protectionCoverage the protectionCoverage value to set
+     * @return the DdosSettings object itself.
+     */
+    public DdosSettings withProtectionCoverage(DdosSettingsProtectionCoverage protectionCoverage) {
+        this.protectionCoverage = protectionCoverage;
+        return this;
+    }
+
+    /**
+     * Get enables DDoS protection on the public IP.
+     *
+     * @return the protectedIP value
+     */
+    public Boolean protectedIP() {
+        return this.protectedIP;
+    }
+
+    /**
+     * Set enables DDoS protection on the public IP.
+     *
+     * @param protectedIP the protectedIP value to set
+     * @return the DdosSettings object itself.
+     */
+    public DdosSettings withProtectedIP(Boolean protectedIP) {
+        this.protectedIP = protectedIP;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettingsProtectionCoverage.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettingsProtectionCoverage.java
new file mode 100644
index 000000000000..61f5ab3c0475
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DdosSettingsProtectionCoverage.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DdosSettingsProtectionCoverage.
+ */
+public final class DdosSettingsProtectionCoverage extends ExpandableStringEnum<DdosSettingsProtectionCoverage> {
+    /** Static value Basic for DdosSettingsProtectionCoverage. */
+    public static final DdosSettingsProtectionCoverage BASIC = fromString("Basic");
+
+    /** Static value Standard for DdosSettingsProtectionCoverage. */
+    public static final DdosSettingsProtectionCoverage STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a DdosSettingsProtectionCoverage from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DdosSettingsProtectionCoverage
+     */
+    @JsonCreator
+    public static DdosSettingsProtectionCoverage fromString(String name) {
+        return fromString(name, DdosSettingsProtectionCoverage.class);
+    }
+
+    /**
+     * @return known DdosSettingsProtectionCoverage values
+     */
+    public static Collection<DdosSettingsProtectionCoverage> values() {
+        return values(DdosSettingsProtectionCoverage.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DefaultSecurityRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DefaultSecurityRules.java
new file mode 100644
index 000000000000..3b5705616225
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DefaultSecurityRules.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.DefaultSecurityRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing DefaultSecurityRules.
+ */
+public interface DefaultSecurityRules extends HasInner<DefaultSecurityRulesInner> {
+    /**
+     * Get the specified default network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param defaultSecurityRuleName The name of the default security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkSecurityGroupSecurityRuleModel> getAsync(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName);
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkSecurityGroupSecurityRuleModel> listAsync(final String resourceGroupName, final String networkSecurityGroupName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Delegation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Delegation.java
new file mode 100644
index 000000000000..9773317e8755
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Delegation.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Details the service to which the subnet is delegated.
+ */
+@JsonFlatten
+public class Delegation extends SubResource {
+    /**
+     * The name of the service to whom the subnet should be delegated (e.g.
+     * Microsoft.Sql/servers).
+     */
+    @JsonProperty(value = "properties.serviceName")
+    private String serviceName;
+
+    /**
+     * The actions permitted to the service upon delegation.
+     */
+    @JsonProperty(value = "properties.actions", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> actions;
+
+    /**
+     * The provisioning state of the service delegation resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a subnet. This name can
+     * be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the name of the service to whom the subnet should be delegated (e.g. Microsoft.Sql/servers).
+     *
+     * @return the serviceName value
+     */
+    public String serviceName() {
+        return this.serviceName;
+    }
+
+    /**
+     * Set the name of the service to whom the subnet should be delegated (e.g. Microsoft.Sql/servers).
+     *
+     * @param serviceName the serviceName value to set
+     * @return the Delegation object itself.
+     */
+    public Delegation withServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        return this;
+    }
+
+    /**
+     * Get the actions permitted to the service upon delegation.
+     *
+     * @return the actions value
+     */
+    public List<String> actions() {
+        return this.actions;
+    }
+
+    /**
+     * Get the provisioning state of the service delegation resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a subnet. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a subnet. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the Delegation object itself.
+     */
+    public Delegation withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DeviceProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DeviceProperties.java
new file mode 100644
index 000000000000..943666f9d5b3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DeviceProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of properties of the device.
+ */
+public class DeviceProperties {
+    /**
+     * Name of the device Vendor.
+     */
+    @JsonProperty(value = "deviceVendor")
+    private String deviceVendor;
+
+    /**
+     * Model of the device.
+     */
+    @JsonProperty(value = "deviceModel")
+    private String deviceModel;
+
+    /**
+     * Link speed.
+     */
+    @JsonProperty(value = "linkSpeedInMbps")
+    private Integer linkSpeedInMbps;
+
+    /**
+     * Get name of the device Vendor.
+     *
+     * @return the deviceVendor value
+     */
+    public String deviceVendor() {
+        return this.deviceVendor;
+    }
+
+    /**
+     * Set name of the device Vendor.
+     *
+     * @param deviceVendor the deviceVendor value to set
+     * @return the DeviceProperties object itself.
+     */
+    public DeviceProperties withDeviceVendor(String deviceVendor) {
+        this.deviceVendor = deviceVendor;
+        return this;
+    }
+
+    /**
+     * Get model of the device.
+     *
+     * @return the deviceModel value
+     */
+    public String deviceModel() {
+        return this.deviceModel;
+    }
+
+    /**
+     * Set model of the device.
+     *
+     * @param deviceModel the deviceModel value to set
+     * @return the DeviceProperties object itself.
+     */
+    public DeviceProperties withDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
+        return this;
+    }
+
+    /**
+     * Get link speed.
+     *
+     * @return the linkSpeedInMbps value
+     */
+    public Integer linkSpeedInMbps() {
+        return this.linkSpeedInMbps;
+    }
+
+    /**
+     * Set link speed.
+     *
+     * @param linkSpeedInMbps the linkSpeedInMbps value to set
+     * @return the DeviceProperties object itself.
+     */
+    public DeviceProperties withLinkSpeedInMbps(Integer linkSpeedInMbps) {
+        this.linkSpeedInMbps = linkSpeedInMbps;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhGroup.java
new file mode 100644
index 000000000000..0aae4b656760
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhGroup.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DhGroup.
+ */
+public final class DhGroup extends ExpandableStringEnum<DhGroup> {
+    /** Static value None for DhGroup. */
+    public static final DhGroup NONE = fromString("None");
+
+    /** Static value DHGroup1 for DhGroup. */
+    public static final DhGroup DHGROUP1 = fromString("DHGroup1");
+
+    /** Static value DHGroup2 for DhGroup. */
+    public static final DhGroup DHGROUP2 = fromString("DHGroup2");
+
+    /** Static value DHGroup14 for DhGroup. */
+    public static final DhGroup DHGROUP14 = fromString("DHGroup14");
+
+    /** Static value DHGroup2048 for DhGroup. */
+    public static final DhGroup DHGROUP2048 = fromString("DHGroup2048");
+
+    /** Static value ECP256 for DhGroup. */
+    public static final DhGroup ECP256 = fromString("ECP256");
+
+    /** Static value ECP384 for DhGroup. */
+    public static final DhGroup ECP384 = fromString("ECP384");
+
+    /** Static value DHGroup24 for DhGroup. */
+    public static final DhGroup DHGROUP24 = fromString("DHGroup24");
+
+    /**
+     * Creates or finds a DhGroup from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DhGroup
+     */
+    @JsonCreator
+    public static DhGroup fromString(String name) {
+        return fromString(name, DhGroup.class);
+    }
+
+    /**
+     * @return known DhGroup values
+     */
+    public static Collection<DhGroup> values() {
+        return values(DhGroup.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhcpOptions.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhcpOptions.java
new file mode 100644
index 000000000000..6a9a781ecebd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/DhcpOptions.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DhcpOptions contains an array of DNS servers available to VMs deployed in
+ * the virtual network. Standard DHCP option for a subnet overrides VNET DHCP
+ * options.
+ */
+public class DhcpOptions {
+    /**
+     * The list of DNS servers IP addresses.
+     */
+    @JsonProperty(value = "dnsServers")
+    private List<String> dnsServers;
+
+    /**
+     * Get the list of DNS servers IP addresses.
+     *
+     * @return the dnsServers value
+     */
+    public List<String> dnsServers() {
+        return this.dnsServers;
+    }
+
+    /**
+     * Set the list of DNS servers IP addresses.
+     *
+     * @param dnsServers the dnsServers value to set
+     * @return the DhcpOptions object itself.
+     */
+    public DhcpOptions withDnsServers(List<String> dnsServers) {
+        this.dnsServers = dnsServers;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Dimension.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Dimension.java
new file mode 100644
index 000000000000..061a584b47f0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Dimension.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Dimension of the metric.
+ */
+public class Dimension {
+    /**
+     * The name of the dimension.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The display name of the dimension.
+     */
+    @JsonProperty(value = "displayName")
+    private String displayName;
+
+    /**
+     * The internal name of the dimension.
+     */
+    @JsonProperty(value = "internalName")
+    private String internalName;
+
+    /**
+     * Get the name of the dimension.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the dimension.
+     *
+     * @param name the name value to set
+     * @return the Dimension object itself.
+     */
+    public Dimension withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the display name of the dimension.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the dimension.
+     *
+     * @param displayName the displayName value to set
+     * @return the Dimension object itself.
+     */
+    public Dimension withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the internal name of the dimension.
+     *
+     * @return the internalName value
+     */
+    public String internalName() {
+        return this.internalName;
+    }
+
+    /**
+     * Set the internal name of the dimension.
+     *
+     * @param internalName the internalName value to set
+     * @return the Dimension object itself.
+     */
+    public Dimension withInternalName(String internalName) {
+        this.internalName = internalName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Direction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Direction.java
new file mode 100644
index 000000000000..35a122d07f46
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Direction.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Direction.
+ */
+public final class Direction extends ExpandableStringEnum<Direction> {
+    /** Static value Inbound for Direction. */
+    public static final Direction INBOUND = fromString("Inbound");
+
+    /** Static value Outbound for Direction. */
+    public static final Direction OUTBOUND = fromString("Outbound");
+
+    /**
+     * Creates or finds a Direction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Direction
+     */
+    @JsonCreator
+    public static Direction fromString(String name) {
+        return fromString(name, Direction.class);
+    }
+
+    /**
+     * @return known Direction values
+     */
+    public static Collection<Direction> values() {
+        return values(Direction.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroup.java
new file mode 100644
index 000000000000..56fc9a1e59c6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroup.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Effective network security group.
+ */
+public class EffectiveNetworkSecurityGroup {
+    /**
+     * The ID of network security group that is applied.
+     */
+    @JsonProperty(value = "networkSecurityGroup")
+    private SubResource networkSecurityGroup;
+
+    /**
+     * Associated resources.
+     */
+    @JsonProperty(value = "association")
+    private EffectiveNetworkSecurityGroupAssociation association;
+
+    /**
+     * A collection of effective security rules.
+     */
+    @JsonProperty(value = "effectiveSecurityRules")
+    private List<EffectiveNetworkSecurityRule> effectiveSecurityRules;
+
+    /**
+     * Mapping of tags to list of IP Addresses included within the tag.
+     */
+    @JsonProperty(value = "tagMap")
+    private Map<String, List<String>> tagMap;
+
+    /**
+     * Get the ID of network security group that is applied.
+     *
+     * @return the networkSecurityGroup value
+     */
+    public SubResource networkSecurityGroup() {
+        return this.networkSecurityGroup;
+    }
+
+    /**
+     * Set the ID of network security group that is applied.
+     *
+     * @param networkSecurityGroup the networkSecurityGroup value to set
+     * @return the EffectiveNetworkSecurityGroup object itself.
+     */
+    public EffectiveNetworkSecurityGroup withNetworkSecurityGroup(SubResource networkSecurityGroup) {
+        this.networkSecurityGroup = networkSecurityGroup;
+        return this;
+    }
+
+    /**
+     * Get associated resources.
+     *
+     * @return the association value
+     */
+    public EffectiveNetworkSecurityGroupAssociation association() {
+        return this.association;
+    }
+
+    /**
+     * Set associated resources.
+     *
+     * @param association the association value to set
+     * @return the EffectiveNetworkSecurityGroup object itself.
+     */
+    public EffectiveNetworkSecurityGroup withAssociation(EffectiveNetworkSecurityGroupAssociation association) {
+        this.association = association;
+        return this;
+    }
+
+    /**
+     * Get a collection of effective security rules.
+     *
+     * @return the effectiveSecurityRules value
+     */
+    public List<EffectiveNetworkSecurityRule> effectiveSecurityRules() {
+        return this.effectiveSecurityRules;
+    }
+
+    /**
+     * Set a collection of effective security rules.
+     *
+     * @param effectiveSecurityRules the effectiveSecurityRules value to set
+     * @return the EffectiveNetworkSecurityGroup object itself.
+     */
+    public EffectiveNetworkSecurityGroup withEffectiveSecurityRules(List<EffectiveNetworkSecurityRule> effectiveSecurityRules) {
+        this.effectiveSecurityRules = effectiveSecurityRules;
+        return this;
+    }
+
+    /**
+     * Get mapping of tags to list of IP Addresses included within the tag.
+     *
+     * @return the tagMap value
+     */
+    public Map<String, List<String>> tagMap() {
+        return this.tagMap;
+    }
+
+    /**
+     * Set mapping of tags to list of IP Addresses included within the tag.
+     *
+     * @param tagMap the tagMap value to set
+     * @return the EffectiveNetworkSecurityGroup object itself.
+     */
+    public EffectiveNetworkSecurityGroup withTagMap(Map<String, List<String>> tagMap) {
+        this.tagMap = tagMap;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupAssociation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupAssociation.java
new file mode 100644
index 000000000000..15ebfcb10908
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupAssociation.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The effective network security group association.
+ */
+public class EffectiveNetworkSecurityGroupAssociation {
+    /**
+     * The ID of the subnet if assigned.
+     */
+    @JsonProperty(value = "subnet")
+    private SubResource subnet;
+
+    /**
+     * The ID of the network interface if assigned.
+     */
+    @JsonProperty(value = "networkInterface")
+    private SubResource networkInterface;
+
+    /**
+     * Get the ID of the subnet if assigned.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the ID of the subnet if assigned.
+     *
+     * @param subnet the subnet value to set
+     * @return the EffectiveNetworkSecurityGroupAssociation object itself.
+     */
+    public EffectiveNetworkSecurityGroupAssociation withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the ID of the network interface if assigned.
+     *
+     * @return the networkInterface value
+     */
+    public SubResource networkInterface() {
+        return this.networkInterface;
+    }
+
+    /**
+     * Set the ID of the network interface if assigned.
+     *
+     * @param networkInterface the networkInterface value to set
+     * @return the EffectiveNetworkSecurityGroupAssociation object itself.
+     */
+    public EffectiveNetworkSecurityGroupAssociation withNetworkInterface(SubResource networkInterface) {
+        this.networkInterface = networkInterface;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupListResult.java
new file mode 100644
index 000000000000..265f22cc045c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityGroupListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.EffectiveNetworkSecurityGroupListResultInner;
+import java.util.List;
+
+/**
+ * Type representing EffectiveNetworkSecurityGroupListResult.
+ */
+public interface EffectiveNetworkSecurityGroupListResult extends HasInner<EffectiveNetworkSecurityGroupListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<EffectiveNetworkSecurityGroup> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityRule.java
new file mode 100644
index 000000000000..5465c6370797
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveNetworkSecurityRule.java
@@ -0,0 +1,420 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Effective network security rules.
+ */
+public class EffectiveNetworkSecurityRule {
+    /**
+     * The name of the security rule specified by the user (if created by the
+     * user).
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The network protocol this rule applies to. Possible values include:
+     * 'Tcp', 'Udp', 'All'.
+     */
+    @JsonProperty(value = "protocol")
+    private EffectiveSecurityRuleProtocol protocol;
+
+    /**
+     * The source port or range.
+     */
+    @JsonProperty(value = "sourcePortRange")
+    private String sourcePortRange;
+
+    /**
+     * The destination port or range.
+     */
+    @JsonProperty(value = "destinationPortRange")
+    private String destinationPortRange;
+
+    /**
+     * The source port ranges. Expected values include a single integer between
+     * 0 and 65535, a range using '-' as separator (e.g. 100-400), or an
+     * asterisk (*).
+     */
+    @JsonProperty(value = "sourcePortRanges")
+    private List<String> sourcePortRanges;
+
+    /**
+     * The destination port ranges. Expected values include a single integer
+     * between 0 and 65535, a range using '-' as separator (e.g. 100-400), or
+     * an asterisk (*).
+     */
+    @JsonProperty(value = "destinationPortRanges")
+    private List<String> destinationPortRanges;
+
+    /**
+     * The source address prefix.
+     */
+    @JsonProperty(value = "sourceAddressPrefix")
+    private String sourceAddressPrefix;
+
+    /**
+     * The destination address prefix.
+     */
+    @JsonProperty(value = "destinationAddressPrefix")
+    private String destinationAddressPrefix;
+
+    /**
+     * The source address prefixes. Expected values include CIDR IP ranges,
+     * Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags,
+     * and the asterisk (*).
+     */
+    @JsonProperty(value = "sourceAddressPrefixes")
+    private List<String> sourceAddressPrefixes;
+
+    /**
+     * The destination address prefixes. Expected values include CIDR IP
+     * ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet),
+     * System Tags, and the asterisk (*).
+     */
+    @JsonProperty(value = "destinationAddressPrefixes")
+    private List<String> destinationAddressPrefixes;
+
+    /**
+     * The expanded source address prefix.
+     */
+    @JsonProperty(value = "expandedSourceAddressPrefix")
+    private List<String> expandedSourceAddressPrefix;
+
+    /**
+     * Expanded destination address prefix.
+     */
+    @JsonProperty(value = "expandedDestinationAddressPrefix")
+    private List<String> expandedDestinationAddressPrefix;
+
+    /**
+     * Whether network traffic is allowed or denied. Possible values include:
+     * 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "access")
+    private SecurityRuleAccess access;
+
+    /**
+     * The priority of the rule.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * The direction of the rule. Possible values include: 'Inbound',
+     * 'Outbound'.
+     */
+    @JsonProperty(value = "direction")
+    private SecurityRuleDirection direction;
+
+    /**
+     * Get the name of the security rule specified by the user (if created by the user).
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the security rule specified by the user (if created by the user).
+     *
+     * @param name the name value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the network protocol this rule applies to. Possible values include: 'Tcp', 'Udp', 'All'.
+     *
+     * @return the protocol value
+     */
+    public EffectiveSecurityRuleProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the network protocol this rule applies to. Possible values include: 'Tcp', 'Udp', 'All'.
+     *
+     * @param protocol the protocol value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withProtocol(EffectiveSecurityRuleProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the source port or range.
+     *
+     * @return the sourcePortRange value
+     */
+    public String sourcePortRange() {
+        return this.sourcePortRange;
+    }
+
+    /**
+     * Set the source port or range.
+     *
+     * @param sourcePortRange the sourcePortRange value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withSourcePortRange(String sourcePortRange) {
+        this.sourcePortRange = sourcePortRange;
+        return this;
+    }
+
+    /**
+     * Get the destination port or range.
+     *
+     * @return the destinationPortRange value
+     */
+    public String destinationPortRange() {
+        return this.destinationPortRange;
+    }
+
+    /**
+     * Set the destination port or range.
+     *
+     * @param destinationPortRange the destinationPortRange value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withDestinationPortRange(String destinationPortRange) {
+        this.destinationPortRange = destinationPortRange;
+        return this;
+    }
+
+    /**
+     * Get the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*).
+     *
+     * @return the sourcePortRanges value
+     */
+    public List<String> sourcePortRanges() {
+        return this.sourcePortRanges;
+    }
+
+    /**
+     * Set the source port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*).
+     *
+     * @param sourcePortRanges the sourcePortRanges value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withSourcePortRanges(List<String> sourcePortRanges) {
+        this.sourcePortRanges = sourcePortRanges;
+        return this;
+    }
+
+    /**
+     * Get the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*).
+     *
+     * @return the destinationPortRanges value
+     */
+    public List<String> destinationPortRanges() {
+        return this.destinationPortRanges;
+    }
+
+    /**
+     * Set the destination port ranges. Expected values include a single integer between 0 and 65535, a range using '-' as separator (e.g. 100-400), or an asterisk (*).
+     *
+     * @param destinationPortRanges the destinationPortRanges value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withDestinationPortRanges(List<String> destinationPortRanges) {
+        this.destinationPortRanges = destinationPortRanges;
+        return this;
+    }
+
+    /**
+     * Get the source address prefix.
+     *
+     * @return the sourceAddressPrefix value
+     */
+    public String sourceAddressPrefix() {
+        return this.sourceAddressPrefix;
+    }
+
+    /**
+     * Set the source address prefix.
+     *
+     * @param sourceAddressPrefix the sourceAddressPrefix value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withSourceAddressPrefix(String sourceAddressPrefix) {
+        this.sourceAddressPrefix = sourceAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the destination address prefix.
+     *
+     * @return the destinationAddressPrefix value
+     */
+    public String destinationAddressPrefix() {
+        return this.destinationAddressPrefix;
+    }
+
+    /**
+     * Set the destination address prefix.
+     *
+     * @param destinationAddressPrefix the destinationAddressPrefix value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withDestinationAddressPrefix(String destinationAddressPrefix) {
+        this.destinationAddressPrefix = destinationAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*).
+     *
+     * @return the sourceAddressPrefixes value
+     */
+    public List<String> sourceAddressPrefixes() {
+        return this.sourceAddressPrefixes;
+    }
+
+    /**
+     * Set the source address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*).
+     *
+     * @param sourceAddressPrefixes the sourceAddressPrefixes value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withSourceAddressPrefixes(List<String> sourceAddressPrefixes) {
+        this.sourceAddressPrefixes = sourceAddressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*).
+     *
+     * @return the destinationAddressPrefixes value
+     */
+    public List<String> destinationAddressPrefixes() {
+        return this.destinationAddressPrefixes;
+    }
+
+    /**
+     * Set the destination address prefixes. Expected values include CIDR IP ranges, Default Tags (VirtualNetwork, AzureLoadBalancer, Internet), System Tags, and the asterisk (*).
+     *
+     * @param destinationAddressPrefixes the destinationAddressPrefixes value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withDestinationAddressPrefixes(List<String> destinationAddressPrefixes) {
+        this.destinationAddressPrefixes = destinationAddressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the expanded source address prefix.
+     *
+     * @return the expandedSourceAddressPrefix value
+     */
+    public List<String> expandedSourceAddressPrefix() {
+        return this.expandedSourceAddressPrefix;
+    }
+
+    /**
+     * Set the expanded source address prefix.
+     *
+     * @param expandedSourceAddressPrefix the expandedSourceAddressPrefix value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withExpandedSourceAddressPrefix(List<String> expandedSourceAddressPrefix) {
+        this.expandedSourceAddressPrefix = expandedSourceAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get expanded destination address prefix.
+     *
+     * @return the expandedDestinationAddressPrefix value
+     */
+    public List<String> expandedDestinationAddressPrefix() {
+        return this.expandedDestinationAddressPrefix;
+    }
+
+    /**
+     * Set expanded destination address prefix.
+     *
+     * @param expandedDestinationAddressPrefix the expandedDestinationAddressPrefix value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withExpandedDestinationAddressPrefix(List<String> expandedDestinationAddressPrefix) {
+        this.expandedDestinationAddressPrefix = expandedDestinationAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get whether network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the access value
+     */
+    public SecurityRuleAccess access() {
+        return this.access;
+    }
+
+    /**
+     * Set whether network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param access the access value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withAccess(SecurityRuleAccess access) {
+        this.access = access;
+        return this;
+    }
+
+    /**
+     * Get the priority of the rule.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set the priority of the rule.
+     *
+     * @param priority the priority value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the direction of the rule. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @return the direction value
+     */
+    public SecurityRuleDirection direction() {
+        return this.direction;
+    }
+
+    /**
+     * Set the direction of the rule. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @param direction the direction value to set
+     * @return the EffectiveNetworkSecurityRule object itself.
+     */
+    public EffectiveNetworkSecurityRule withDirection(SecurityRuleDirection direction) {
+        this.direction = direction;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRoute.java
new file mode 100644
index 000000000000..9abeff382116
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRoute.java
@@ -0,0 +1,205 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Effective Route.
+ */
+public class EffectiveRoute {
+    /**
+     * The name of the user defined route. This is optional.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * If true, on-premises routes are not propagated to the network interfaces
+     * in the subnet.
+     */
+    @JsonProperty(value = "disableBgpRoutePropagation")
+    private Boolean disableBgpRoutePropagation;
+
+    /**
+     * Who created the route. Possible values include: 'Unknown', 'User',
+     * 'VirtualNetworkGateway', 'Default'.
+     */
+    @JsonProperty(value = "source")
+    private EffectiveRouteSource source;
+
+    /**
+     * The value of effective route. Possible values include: 'Active',
+     * 'Invalid'.
+     */
+    @JsonProperty(value = "state")
+    private EffectiveRouteState state;
+
+    /**
+     * The address prefixes of the effective routes in CIDR notation.
+     */
+    @JsonProperty(value = "addressPrefix")
+    private List<String> addressPrefix;
+
+    /**
+     * The IP address of the next hop of the effective route.
+     */
+    @JsonProperty(value = "nextHopIpAddress")
+    private List<String> nextHopIpAddress;
+
+    /**
+     * The type of Azure hop the packet should be sent to. Possible values
+     * include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet',
+     * 'VirtualAppliance', 'None'.
+     */
+    @JsonProperty(value = "nextHopType")
+    private RouteNextHopType nextHopType;
+
+    /**
+     * Get the name of the user defined route. This is optional.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the user defined route. This is optional.
+     *
+     * @param name the name value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get if true, on-premises routes are not propagated to the network interfaces in the subnet.
+     *
+     * @return the disableBgpRoutePropagation value
+     */
+    public Boolean disableBgpRoutePropagation() {
+        return this.disableBgpRoutePropagation;
+    }
+
+    /**
+     * Set if true, on-premises routes are not propagated to the network interfaces in the subnet.
+     *
+     * @param disableBgpRoutePropagation the disableBgpRoutePropagation value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation) {
+        this.disableBgpRoutePropagation = disableBgpRoutePropagation;
+        return this;
+    }
+
+    /**
+     * Get who created the route. Possible values include: 'Unknown', 'User', 'VirtualNetworkGateway', 'Default'.
+     *
+     * @return the source value
+     */
+    public EffectiveRouteSource source() {
+        return this.source;
+    }
+
+    /**
+     * Set who created the route. Possible values include: 'Unknown', 'User', 'VirtualNetworkGateway', 'Default'.
+     *
+     * @param source the source value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withSource(EffectiveRouteSource source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get the value of effective route. Possible values include: 'Active', 'Invalid'.
+     *
+     * @return the state value
+     */
+    public EffectiveRouteState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the value of effective route. Possible values include: 'Active', 'Invalid'.
+     *
+     * @param state the state value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withState(EffectiveRouteState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the address prefixes of the effective routes in CIDR notation.
+     *
+     * @return the addressPrefix value
+     */
+    public List<String> addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set the address prefixes of the effective routes in CIDR notation.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withAddressPrefix(List<String> addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the IP address of the next hop of the effective route.
+     *
+     * @return the nextHopIpAddress value
+     */
+    public List<String> nextHopIpAddress() {
+        return this.nextHopIpAddress;
+    }
+
+    /**
+     * Set the IP address of the next hop of the effective route.
+     *
+     * @param nextHopIpAddress the nextHopIpAddress value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withNextHopIpAddress(List<String> nextHopIpAddress) {
+        this.nextHopIpAddress = nextHopIpAddress;
+        return this;
+    }
+
+    /**
+     * Get the type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'.
+     *
+     * @return the nextHopType value
+     */
+    public RouteNextHopType nextHopType() {
+        return this.nextHopType;
+    }
+
+    /**
+     * Set the type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'.
+     *
+     * @param nextHopType the nextHopType value to set
+     * @return the EffectiveRoute object itself.
+     */
+    public EffectiveRoute withNextHopType(RouteNextHopType nextHopType) {
+        this.nextHopType = nextHopType;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteListResult.java
new file mode 100644
index 000000000000..e9e29c5d68ab
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.EffectiveRouteListResultInner;
+import java.util.List;
+
+/**
+ * Type representing EffectiveRouteListResult.
+ */
+public interface EffectiveRouteListResult extends HasInner<EffectiveRouteListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<EffectiveRoute> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteSource.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteSource.java
new file mode 100644
index 000000000000..1c7172e2e11c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteSource.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for EffectiveRouteSource.
+ */
+public final class EffectiveRouteSource extends ExpandableStringEnum<EffectiveRouteSource> {
+    /** Static value Unknown for EffectiveRouteSource. */
+    public static final EffectiveRouteSource UNKNOWN = fromString("Unknown");
+
+    /** Static value User for EffectiveRouteSource. */
+    public static final EffectiveRouteSource USER = fromString("User");
+
+    /** Static value VirtualNetworkGateway for EffectiveRouteSource. */
+    public static final EffectiveRouteSource VIRTUAL_NETWORK_GATEWAY = fromString("VirtualNetworkGateway");
+
+    /** Static value Default for EffectiveRouteSource. */
+    public static final EffectiveRouteSource DEFAULT = fromString("Default");
+
+    /**
+     * Creates or finds a EffectiveRouteSource from its string representation.
+     * @param name a name to look for
+     * @return the corresponding EffectiveRouteSource
+     */
+    @JsonCreator
+    public static EffectiveRouteSource fromString(String name) {
+        return fromString(name, EffectiveRouteSource.class);
+    }
+
+    /**
+     * @return known EffectiveRouteSource values
+     */
+    public static Collection<EffectiveRouteSource> values() {
+        return values(EffectiveRouteSource.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteState.java
new file mode 100644
index 000000000000..73e25e274177
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveRouteState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for EffectiveRouteState.
+ */
+public final class EffectiveRouteState extends ExpandableStringEnum<EffectiveRouteState> {
+    /** Static value Active for EffectiveRouteState. */
+    public static final EffectiveRouteState ACTIVE = fromString("Active");
+
+    /** Static value Invalid for EffectiveRouteState. */
+    public static final EffectiveRouteState INVALID = fromString("Invalid");
+
+    /**
+     * Creates or finds a EffectiveRouteState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding EffectiveRouteState
+     */
+    @JsonCreator
+    public static EffectiveRouteState fromString(String name) {
+        return fromString(name, EffectiveRouteState.class);
+    }
+
+    /**
+     * @return known EffectiveRouteState values
+     */
+    public static Collection<EffectiveRouteState> values() {
+        return values(EffectiveRouteState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveSecurityRuleProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveSecurityRuleProtocol.java
new file mode 100644
index 000000000000..dad415dde859
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EffectiveSecurityRuleProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for EffectiveSecurityRuleProtocol.
+ */
+public final class EffectiveSecurityRuleProtocol extends ExpandableStringEnum<EffectiveSecurityRuleProtocol> {
+    /** Static value Tcp for EffectiveSecurityRuleProtocol. */
+    public static final EffectiveSecurityRuleProtocol TCP = fromString("Tcp");
+
+    /** Static value Udp for EffectiveSecurityRuleProtocol. */
+    public static final EffectiveSecurityRuleProtocol UDP = fromString("Udp");
+
+    /** Static value All for EffectiveSecurityRuleProtocol. */
+    public static final EffectiveSecurityRuleProtocol ALL = fromString("All");
+
+    /**
+     * Creates or finds a EffectiveSecurityRuleProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding EffectiveSecurityRuleProtocol
+     */
+    @JsonCreator
+    public static EffectiveSecurityRuleProtocol fromString(String name) {
+        return fromString(name, EffectiveSecurityRuleProtocol.class);
+    }
+
+    /**
+     * @return known EffectiveSecurityRuleProtocol values
+     */
+    public static Collection<EffectiveSecurityRuleProtocol> values() {
+        return values(EffectiveSecurityRuleProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EndpointServiceResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EndpointServiceResult.java
new file mode 100644
index 000000000000..d21212270736
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EndpointServiceResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.EndpointServiceResultInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing EndpointServiceResult.
+ */
+public interface EndpointServiceResult extends HasInner<EndpointServiceResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Error.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Error.java
new file mode 100644
index 000000000000..38e12ac8c74f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Error.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Common error representation.
+ */
+public class Error {
+    /**
+     * Error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error message.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Error target.
+     */
+    @JsonProperty(value = "target")
+    private String target;
+
+    /**
+     * Error details.
+     */
+    @JsonProperty(value = "details")
+    private List<ErrorDetails> details;
+
+    /**
+     * Inner error message.
+     */
+    @JsonProperty(value = "innerError")
+    private String innerError;
+
+    /**
+     * 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 Error object itself.
+     */
+    public Error withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message.
+     *
+     * @param message the message value to set
+     * @return the Error object itself.
+     */
+    public Error withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Get error target.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set error target.
+     *
+     * @param target the target value to set
+     * @return the Error object itself.
+     */
+    public Error withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get error details.
+     *
+     * @return the details value
+     */
+    public List<ErrorDetails> details() {
+        return this.details;
+    }
+
+    /**
+     * Set error details.
+     *
+     * @param details the details value to set
+     * @return the Error object itself.
+     */
+    public Error withDetails(List<ErrorDetails> details) {
+        this.details = details;
+        return this;
+    }
+
+    /**
+     * Get inner error message.
+     *
+     * @return the innerError value
+     */
+    public String innerError() {
+        return this.innerError;
+    }
+
+    /**
+     * Set inner error message.
+     *
+     * @param innerError the innerError value to set
+     * @return the Error object itself.
+     */
+    public Error withInnerError(String innerError) {
+        this.innerError = innerError;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorDetails.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorDetails.java
new file mode 100644
index 000000000000..1103e41c5f85
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorDetails.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Common error details representation.
+ */
+public class ErrorDetails {
+    /**
+     * Error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error target.
+     */
+    @JsonProperty(value = "target")
+    private String target;
+
+    /**
+     * Error message.
+     */
+    @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 ErrorDetails object itself.
+     */
+    public ErrorDetails withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error target.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set error target.
+     *
+     * @param target the target value to set
+     * @return the ErrorDetails object itself.
+     */
+    public ErrorDetails withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get error message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message.
+     *
+     * @param message the message value to set
+     * @return the ErrorDetails object itself.
+     */
+    public ErrorDetails withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorException.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorException.java
new file mode 100644
index 000000000000..299bdce8a729
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorException.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.network.v2020_04_01;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with Error information.
+ */
+public class ErrorException extends RestException {
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public ErrorException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the ErrorException 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 ErrorException(final String message, final Response<ResponseBody> response, final Error body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public Error body() {
+        return (Error) super.body();
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponse.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponse.java
new file mode 100644
index 000000000000..f21e88f75a4e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponse.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The error object.
+ */
+public class ErrorResponse {
+    /**
+     * Error.
+     * The error details object.
+     */
+    @JsonProperty(value = "error")
+    private ErrorDetails error;
+
+    /**
+     * Get the error details object.
+     *
+     * @return the error value
+     */
+    public ErrorDetails error() {
+        return this.error;
+    }
+
+    /**
+     * Set the error details object.
+     *
+     * @param error the error value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withError(ErrorDetails error) {
+        this.error = error;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponseException.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ErrorResponseException.java
new file mode 100644
index 000000000000..123b93be8c05
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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.network.v2020_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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluatedNetworkSecurityGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluatedNetworkSecurityGroup.java
new file mode 100644
index 000000000000..77bc38b9e81d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluatedNetworkSecurityGroup.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Results of network security group evaluation.
+ */
+public class EvaluatedNetworkSecurityGroup {
+    /**
+     * Network security group ID.
+     */
+    @JsonProperty(value = "networkSecurityGroupId")
+    private String networkSecurityGroupId;
+
+    /**
+     * Resource ID of nic or subnet to which network security group is applied.
+     */
+    @JsonProperty(value = "appliedTo")
+    private String appliedTo;
+
+    /**
+     * Matched network security rule.
+     */
+    @JsonProperty(value = "matchedRule")
+    private MatchedRule matchedRule;
+
+    /**
+     * List of network security rules evaluation results.
+     */
+    @JsonProperty(value = "rulesEvaluationResult", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkSecurityRulesEvaluationResult> rulesEvaluationResult;
+
+    /**
+     * Get network security group ID.
+     *
+     * @return the networkSecurityGroupId value
+     */
+    public String networkSecurityGroupId() {
+        return this.networkSecurityGroupId;
+    }
+
+    /**
+     * Set network security group ID.
+     *
+     * @param networkSecurityGroupId the networkSecurityGroupId value to set
+     * @return the EvaluatedNetworkSecurityGroup object itself.
+     */
+    public EvaluatedNetworkSecurityGroup withNetworkSecurityGroupId(String networkSecurityGroupId) {
+        this.networkSecurityGroupId = networkSecurityGroupId;
+        return this;
+    }
+
+    /**
+     * Get resource ID of nic or subnet to which network security group is applied.
+     *
+     * @return the appliedTo value
+     */
+    public String appliedTo() {
+        return this.appliedTo;
+    }
+
+    /**
+     * Set resource ID of nic or subnet to which network security group is applied.
+     *
+     * @param appliedTo the appliedTo value to set
+     * @return the EvaluatedNetworkSecurityGroup object itself.
+     */
+    public EvaluatedNetworkSecurityGroup withAppliedTo(String appliedTo) {
+        this.appliedTo = appliedTo;
+        return this;
+    }
+
+    /**
+     * Get matched network security rule.
+     *
+     * @return the matchedRule value
+     */
+    public MatchedRule matchedRule() {
+        return this.matchedRule;
+    }
+
+    /**
+     * Set matched network security rule.
+     *
+     * @param matchedRule the matchedRule value to set
+     * @return the EvaluatedNetworkSecurityGroup object itself.
+     */
+    public EvaluatedNetworkSecurityGroup withMatchedRule(MatchedRule matchedRule) {
+        this.matchedRule = matchedRule;
+        return this;
+    }
+
+    /**
+     * Get list of network security rules evaluation results.
+     *
+     * @return the rulesEvaluationResult value
+     */
+    public List<NetworkSecurityRulesEvaluationResult> rulesEvaluationResult() {
+        return this.rulesEvaluationResult;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluationState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluationState.java
new file mode 100644
index 000000000000..e9a33a9fde48
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/EvaluationState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for EvaluationState.
+ */
+public final class EvaluationState extends ExpandableStringEnum<EvaluationState> {
+    /** Static value NotStarted for EvaluationState. */
+    public static final EvaluationState NOT_STARTED = fromString("NotStarted");
+
+    /** Static value InProgress for EvaluationState. */
+    public static final EvaluationState IN_PROGRESS = fromString("InProgress");
+
+    /** Static value Completed for EvaluationState. */
+    public static final EvaluationState COMPLETED = fromString("Completed");
+
+    /**
+     * Creates or finds a EvaluationState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding EvaluationState
+     */
+    @JsonCreator
+    public static EvaluationState fromString(String name) {
+        return fromString(name, EvaluationState.class);
+    }
+
+    /**
+     * @return known EvaluationState values
+     */
+    public static Collection<EvaluationState> values() {
+        return values(EvaluationState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuit.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuit.java
new file mode 100644
index 000000000000..4c566afc950a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuit.java
@@ -0,0 +1,464 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitAuthorizationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitPeeringInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitInner;
+
+/**
+ * Type representing ExpressRouteCircuit.
+ */
+public interface ExpressRouteCircuit extends HasInner<ExpressRouteCircuitInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRouteCircuitInner>, HasResourceGroup, Refreshable<ExpressRouteCircuit>, Updatable<ExpressRouteCircuit.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the allowClassicOperations value.
+     */
+    Boolean allowClassicOperations();
+
+    /**
+     * @return the authorizations value.
+     */
+    List<ExpressRouteCircuitAuthorization> authorizations();
+
+    /**
+     * @return the bandwidthInGbps value.
+     */
+    Double bandwidthInGbps();
+
+    /**
+     * @return the circuitProvisioningState value.
+     */
+    String circuitProvisioningState();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRoutePort value.
+     */
+    SubResource expressRoutePort();
+
+    /**
+     * @return the gatewayManagerEtag value.
+     */
+    String gatewayManagerEtag();
+
+    /**
+     * @return the globalReachEnabled value.
+     */
+    Boolean globalReachEnabled();
+
+    /**
+     * @return the peerings value.
+     */
+    List<ExpressRouteCircuitPeering> peerings();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the serviceKey value.
+     */
+    String serviceKey();
+
+    /**
+     * @return the serviceProviderNotes value.
+     */
+    String serviceProviderNotes();
+
+    /**
+     * @return the serviceProviderProperties value.
+     */
+    ExpressRouteCircuitServiceProviderProperties serviceProviderProperties();
+
+    /**
+     * @return the serviceProviderProvisioningState value.
+     */
+    ServiceProviderProvisioningState serviceProviderProvisioningState();
+
+    /**
+     * @return the sku value.
+     */
+    ExpressRouteCircuitSku sku();
+
+    /**
+     * @return the stag value.
+     */
+    Integer stag();
+
+    /**
+     * The entirety of the ExpressRouteCircuit definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuit definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCircuit definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ExpressRouteCircuit definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify AllowClassicOperations.
+         */
+        interface WithAllowClassicOperations {
+            /**
+             * Specifies allowClassicOperations.
+             * @param allowClassicOperations Allow classic operations
+             * @return the next definition stage
+             */
+            WithCreate withAllowClassicOperations(Boolean allowClassicOperations);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify Authorizations.
+         */
+        interface WithAuthorizations {
+            /**
+             * Specifies authorizations.
+             * @param authorizations The list of authorizations
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify BandwidthInGbps.
+         */
+        interface WithBandwidthInGbps {
+            /**
+             * Specifies bandwidthInGbps.
+             * @param bandwidthInGbps The bandwidth of the circuit when the circuit is provisioned on an ExpressRoutePort resource
+             * @return the next definition stage
+             */
+            WithCreate withBandwidthInGbps(Double bandwidthInGbps);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify CircuitProvisioningState.
+         */
+        interface WithCircuitProvisioningState {
+            /**
+             * Specifies circuitProvisioningState.
+             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
+             * @return the next definition stage
+             */
+            WithCreate withCircuitProvisioningState(String circuitProvisioningState);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ExpressRoutePort.
+         */
+        interface WithExpressRoutePort {
+            /**
+             * Specifies expressRoutePort.
+             * @param expressRoutePort The reference to the ExpressRoutePort resource when the circuit is provisioned on an ExpressRoutePort resource
+             * @return the next definition stage
+             */
+            WithCreate withExpressRoutePort(SubResource expressRoutePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next definition stage
+             */
+            WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify GlobalReachEnabled.
+         */
+        interface WithGlobalReachEnabled {
+            /**
+             * Specifies globalReachEnabled.
+             * @param globalReachEnabled Flag denoting global reach status
+             * @return the next definition stage
+             */
+            WithCreate withGlobalReachEnabled(Boolean globalReachEnabled);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify Peerings.
+         */
+        interface WithPeerings {
+            /**
+             * Specifies peerings.
+             * @param peerings The list of peerings
+             * @return the next definition stage
+             */
+            WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceKey.
+         */
+        interface WithServiceKey {
+            /**
+             * Specifies serviceKey.
+             * @param serviceKey The ServiceKey
+             * @return the next definition stage
+             */
+            WithCreate withServiceKey(String serviceKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderNotes.
+         */
+        interface WithServiceProviderNotes {
+            /**
+             * Specifies serviceProviderNotes.
+             * @param serviceProviderNotes The ServiceProviderNotes
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderNotes(String serviceProviderNotes);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProperties.
+         */
+        interface WithServiceProviderProperties {
+            /**
+             * Specifies serviceProviderProperties.
+             * @param serviceProviderProperties The ServiceProviderProperties
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(ExpressRouteCircuitSku 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<ExpressRouteCircuit>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAllowClassicOperations, DefinitionStages.WithAuthorizations, DefinitionStages.WithBandwidthInGbps, DefinitionStages.WithCircuitProvisioningState, DefinitionStages.WithExpressRoutePort, DefinitionStages.WithGatewayManagerEtag, DefinitionStages.WithGlobalReachEnabled, DefinitionStages.WithPeerings, DefinitionStages.WithServiceKey, DefinitionStages.WithServiceProviderNotes, DefinitionStages.WithServiceProviderProperties, DefinitionStages.WithServiceProviderProvisioningState, DefinitionStages.WithSku {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCircuit update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags<Update>, UpdateStages.WithAllowClassicOperations, UpdateStages.WithAuthorizations, UpdateStages.WithBandwidthInGbps, UpdateStages.WithCircuitProvisioningState, UpdateStages.WithExpressRoutePort, UpdateStages.WithGatewayManagerEtag, UpdateStages.WithGlobalReachEnabled, UpdateStages.WithPeerings, UpdateStages.WithServiceKey, UpdateStages.WithServiceProviderNotes, UpdateStages.WithServiceProviderProperties, UpdateStages.WithServiceProviderProvisioningState, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuit update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
+         */
+        interface WithAllowClassicOperations {
+            /**
+             * Specifies allowClassicOperations.
+             * @param allowClassicOperations Allow classic operations
+             * @return the next update stage
+             */
+            Update withAllowClassicOperations(Boolean allowClassicOperations);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify Authorizations.
+         */
+        interface WithAuthorizations {
+            /**
+             * Specifies authorizations.
+             * @param authorizations The list of authorizations
+             * @return the next update stage
+             */
+            Update withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify BandwidthInGbps.
+         */
+        interface WithBandwidthInGbps {
+            /**
+             * Specifies bandwidthInGbps.
+             * @param bandwidthInGbps The bandwidth of the circuit when the circuit is provisioned on an ExpressRoutePort resource
+             * @return the next update stage
+             */
+            Update withBandwidthInGbps(Double bandwidthInGbps);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
+         */
+        interface WithCircuitProvisioningState {
+            /**
+             * Specifies circuitProvisioningState.
+             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
+             * @return the next update stage
+             */
+            Update withCircuitProvisioningState(String circuitProvisioningState);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ExpressRoutePort.
+         */
+        interface WithExpressRoutePort {
+            /**
+             * Specifies expressRoutePort.
+             * @param expressRoutePort The reference to the ExpressRoutePort resource when the circuit is provisioned on an ExpressRoutePort resource
+             * @return the next update stage
+             */
+            Update withExpressRoutePort(SubResource expressRoutePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next update stage
+             */
+            Update withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify GlobalReachEnabled.
+         */
+        interface WithGlobalReachEnabled {
+            /**
+             * Specifies globalReachEnabled.
+             * @param globalReachEnabled Flag denoting global reach status
+             * @return the next update stage
+             */
+            Update withGlobalReachEnabled(Boolean globalReachEnabled);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify Peerings.
+         */
+        interface WithPeerings {
+            /**
+             * Specifies peerings.
+             * @param peerings The list of peerings
+             * @return the next update stage
+             */
+            Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
+         */
+        interface WithServiceKey {
+            /**
+             * Specifies serviceKey.
+             * @param serviceKey The ServiceKey
+             * @return the next update stage
+             */
+            Update withServiceKey(String serviceKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
+         */
+        interface WithServiceProviderNotes {
+            /**
+             * Specifies serviceProviderNotes.
+             * @param serviceProviderNotes The ServiceProviderNotes
+             * @return the next update stage
+             */
+            Update withServiceProviderNotes(String serviceProviderNotes);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
+         */
+        interface WithServiceProviderProperties {
+            /**
+             * Specifies serviceProviderProperties.
+             * @param serviceProviderProperties The ServiceProviderProperties
+             * @return the next update stage
+             */
+            Update withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next update stage
+             */
+            Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
+        /**
+         * The stage of the expressroutecircuit update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The SKU
+             * @return the next update stage
+             */
+            Update withSku(ExpressRouteCircuitSku sku);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitArpTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitArpTable.java
new file mode 100644
index 000000000000..8d550e8e514d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitArpTable.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ARP table associated with the ExpressRouteCircuit.
+ */
+public class ExpressRouteCircuitArpTable {
+    /**
+     * Entry age in minutes.
+     */
+    @JsonProperty(value = "age")
+    private Integer age;
+
+    /**
+     * Interface address.
+     */
+    @JsonProperty(value = "interface")
+    private String interfaceProperty;
+
+    /**
+     * The IP address.
+     */
+    @JsonProperty(value = "ipAddress")
+    private String ipAddress;
+
+    /**
+     * The MAC address.
+     */
+    @JsonProperty(value = "macAddress")
+    private String macAddress;
+
+    /**
+     * Get entry age in minutes.
+     *
+     * @return the age value
+     */
+    public Integer age() {
+        return this.age;
+    }
+
+    /**
+     * Set entry age in minutes.
+     *
+     * @param age the age value to set
+     * @return the ExpressRouteCircuitArpTable object itself.
+     */
+    public ExpressRouteCircuitArpTable withAge(Integer age) {
+        this.age = age;
+        return this;
+    }
+
+    /**
+     * Get interface address.
+     *
+     * @return the interfaceProperty value
+     */
+    public String interfaceProperty() {
+        return this.interfaceProperty;
+    }
+
+    /**
+     * Set interface address.
+     *
+     * @param interfaceProperty the interfaceProperty value to set
+     * @return the ExpressRouteCircuitArpTable object itself.
+     */
+    public ExpressRouteCircuitArpTable withInterfaceProperty(String interfaceProperty) {
+        this.interfaceProperty = interfaceProperty;
+        return this;
+    }
+
+    /**
+     * Get the IP address.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set the IP address.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the ExpressRouteCircuitArpTable object itself.
+     */
+    public ExpressRouteCircuitArpTable withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * Get the MAC address.
+     *
+     * @return the macAddress value
+     */
+    public String macAddress() {
+        return this.macAddress;
+    }
+
+    /**
+     * Set the MAC address.
+     *
+     * @param macAddress the macAddress value to set
+     * @return the ExpressRouteCircuitArpTable object itself.
+     */
+    public ExpressRouteCircuitArpTable withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorization.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorization.java
new file mode 100644
index 000000000000..13a46588783c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorization.java
@@ -0,0 +1,204 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitAuthorizationInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing ExpressRouteCircuitAuthorization.
+ */
+public interface ExpressRouteCircuitAuthorization extends HasInner<ExpressRouteCircuitAuthorizationInner>, Indexable, Refreshable<ExpressRouteCircuitAuthorization>, Updatable<ExpressRouteCircuitAuthorization.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the authorizationKey value.
+     */
+    String authorizationKey();
+
+    /**
+     * @return the authorizationUseStatus value.
+     */
+    AuthorizationUseStatus authorizationUseStatus();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ExpressRouteCircuitAuthorization definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithExpressRouteCircuit, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitAuthorization definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCircuitAuthorization definition.
+         */
+        interface Blank extends WithExpressRouteCircuit {
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify ExpressRouteCircuit.
+         */
+        interface WithExpressRouteCircuit {
+           /**
+            * Specifies resourceGroupName, circuitName.
+            * @param resourceGroupName The name of the resource group
+            * @param circuitName The name of the express route circuit
+            * @return the next definition stage
+            */
+            WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify AuthorizationUseStatus.
+         */
+        interface WithAuthorizationUseStatus {
+            /**
+             * Specifies authorizationUseStatus.
+             * @param authorizationUseStatus The authorization use status. Possible values include: 'Available', 'InUse'
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            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<ExpressRouteCircuitAuthorization>, DefinitionStages.WithAuthorizationKey, DefinitionStages.WithAuthorizationUseStatus, DefinitionStages.WithId, DefinitionStages.WithName {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCircuitAuthorization update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCircuitAuthorization>, UpdateStages.WithAuthorizationKey, UpdateStages.WithAuthorizationUseStatus, UpdateStages.WithId, UpdateStages.WithName {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitAuthorization update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next update stage
+             */
+            Update withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify AuthorizationUseStatus.
+         */
+        interface WithAuthorizationUseStatus {
+            /**
+             * Specifies authorizationUseStatus.
+             * @param authorizationUseStatus The authorization use status. Possible values include: 'Available', 'InUse'
+             * @return the next update stage
+             */
+            Update withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorizations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorizations.java
new file mode 100644
index 000000000000..d95bbf3caa38
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitAuthorizations.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitAuthorizationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCircuitAuthorizations.
+ */
+public interface ExpressRouteCircuitAuthorizations extends SupportsCreating<ExpressRouteCircuitAuthorization.DefinitionStages.Blank>, HasInner<ExpressRouteCircuitAuthorizationsInner> {
+    /**
+     * Gets the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitAuthorization> getAsync(String resourceGroupName, String circuitName, String authorizationName);
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitAuthorization> listAsync(final String resourceGroupName, final String circuitName);
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String circuitName, String authorizationName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnection.java
new file mode 100644
index 000000000000..1968ca62a5f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnection.java
@@ -0,0 +1,322 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing ExpressRouteCircuitConnection.
+ */
+public interface ExpressRouteCircuitConnection extends HasInner<ExpressRouteCircuitConnectionInner>, Indexable, Refreshable<ExpressRouteCircuitConnection>, Updatable<ExpressRouteCircuitConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressPrefix value.
+     */
+    String addressPrefix();
+
+    /**
+     * @return the authorizationKey value.
+     */
+    String authorizationKey();
+
+    /**
+     * @return the circuitConnectionStatus value.
+     */
+    CircuitConnectionStatus circuitConnectionStatus();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteCircuitPeering value.
+     */
+    SubResource expressRouteCircuitPeering();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipv6CircuitConnectionConfig value.
+     */
+    Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peerExpressRouteCircuitPeering value.
+     */
+    SubResource peerExpressRouteCircuitPeering();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ExpressRouteCircuitConnection definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPeering, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitConnection definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCircuitConnection definition.
+         */
+        interface Blank extends WithPeering {
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify Peering.
+         */
+        interface WithPeering {
+           /**
+            * Specifies resourceGroupName, circuitName, peeringName.
+            * @param resourceGroupName The name of the resource group
+            * @param circuitName The name of the express route circuit
+            * @param peeringName The name of the peering
+            * @return the next definition stage
+            */
+            WithCreate withExistingPeering(String resourceGroupName, String circuitName, String peeringName);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
+             * @return the next definition stage
+             */
+            WithCreate withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify CircuitConnectionStatus.
+         */
+        interface WithCircuitConnectionStatus {
+            /**
+             * Specifies circuitConnectionStatus.
+             * @param circuitConnectionStatus Express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'
+             * @return the next definition stage
+             */
+            WithCreate withCircuitConnectionStatus(CircuitConnectionStatus circuitConnectionStatus);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify ExpressRouteCircuitPeering.
+         */
+        interface WithExpressRouteCircuitPeering {
+            /**
+             * Specifies expressRouteCircuitPeering.
+             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
+             * @return the next definition stage
+             */
+            WithCreate withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify Ipv6CircuitConnectionConfig.
+         */
+        interface WithIpv6CircuitConnectionConfig {
+            /**
+             * Specifies ipv6CircuitConnectionConfig.
+             * @param ipv6CircuitConnectionConfig IPv6 Address PrefixProperties of the express route circuit connection
+             * @return the next definition stage
+             */
+            WithCreate withIpv6CircuitConnectionConfig(Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection definition allowing to specify PeerExpressRouteCircuitPeering.
+         */
+        interface WithPeerExpressRouteCircuitPeering {
+            /**
+             * Specifies peerExpressRouteCircuitPeering.
+             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
+             * @return the next definition stage
+             */
+            WithCreate withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
+        }
+
+        /**
+         * 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<ExpressRouteCircuitConnection>, DefinitionStages.WithAddressPrefix, DefinitionStages.WithAuthorizationKey, DefinitionStages.WithCircuitConnectionStatus, DefinitionStages.WithExpressRouteCircuitPeering, DefinitionStages.WithId, DefinitionStages.WithIpv6CircuitConnectionConfig, DefinitionStages.WithName, DefinitionStages.WithPeerExpressRouteCircuitPeering {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCircuitConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCircuitConnection>, UpdateStages.WithAddressPrefix, UpdateStages.WithAuthorizationKey, UpdateStages.WithCircuitConnectionStatus, UpdateStages.WithExpressRouteCircuitPeering, UpdateStages.WithId, UpdateStages.WithIpv6CircuitConnectionConfig, UpdateStages.WithName, UpdateStages.WithPeerExpressRouteCircuitPeering {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
+             * @return the next update stage
+             */
+            Update withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next update stage
+             */
+            Update withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify CircuitConnectionStatus.
+         */
+        interface WithCircuitConnectionStatus {
+            /**
+             * Specifies circuitConnectionStatus.
+             * @param circuitConnectionStatus Express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'
+             * @return the next update stage
+             */
+            Update withCircuitConnectionStatus(CircuitConnectionStatus circuitConnectionStatus);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify ExpressRouteCircuitPeering.
+         */
+        interface WithExpressRouteCircuitPeering {
+            /**
+             * Specifies expressRouteCircuitPeering.
+             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
+             * @return the next update stage
+             */
+            Update withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify Ipv6CircuitConnectionConfig.
+         */
+        interface WithIpv6CircuitConnectionConfig {
+            /**
+             * Specifies ipv6CircuitConnectionConfig.
+             * @param ipv6CircuitConnectionConfig IPv6 Address PrefixProperties of the express route circuit connection
+             * @return the next update stage
+             */
+            Update withIpv6CircuitConnectionConfig(Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecircuitconnection update allowing to specify PeerExpressRouteCircuitPeering.
+         */
+        interface WithPeerExpressRouteCircuitPeering {
+            /**
+             * Specifies peerExpressRouteCircuitPeering.
+             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
+             * @return the next update stage
+             */
+            Update withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnections.java
new file mode 100644
index 000000000000..ac749bf6f594
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitConnections.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCircuitConnections.
+ */
+public interface ExpressRouteCircuitConnections extends SupportsCreating<ExpressRouteCircuitConnection.DefinitionStages.Blank>, HasInner<ExpressRouteCircuitConnectionsInner> {
+    /**
+     * Gets the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitConnection> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName);
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitConnection> listAsync(final String resourceGroupName, final String circuitName, final String peeringName);
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeering.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeering.java
new file mode 100644
index 000000000000..d6fe0464d5e3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeering.java
@@ -0,0 +1,653 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitPeeringInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitConnectionInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitStatsInner;
+
+/**
+ * Type representing ExpressRouteCircuitPeering.
+ */
+public interface ExpressRouteCircuitPeering extends HasInner<ExpressRouteCircuitPeeringInner>, Indexable, Refreshable<ExpressRouteCircuitPeering>, Updatable<ExpressRouteCircuitPeering.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the azureASN value.
+     */
+    Integer azureASN();
+
+    /**
+     * @return the connections value.
+     */
+    List<ExpressRouteCircuitConnection> connections();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteConnection value.
+     */
+    ExpressRouteConnectionId expressRouteConnection();
+
+    /**
+     * @return the gatewayManagerEtag value.
+     */
+    String gatewayManagerEtag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipv6PeeringConfig value.
+     */
+    Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig();
+
+    /**
+     * @return the lastModifiedBy value.
+     */
+    String lastModifiedBy();
+
+    /**
+     * @return the microsoftPeeringConfig value.
+     */
+    ExpressRouteCircuitPeeringConfig microsoftPeeringConfig();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peerASN value.
+     */
+    Long peerASN();
+
+    /**
+     * @return the peeredConnections value.
+     */
+    List<PeerExpressRouteCircuitConnection> peeredConnections();
+
+    /**
+     * @return the peeringType value.
+     */
+    ExpressRoutePeeringType peeringType();
+
+    /**
+     * @return the primaryAzurePort value.
+     */
+    String primaryAzurePort();
+
+    /**
+     * @return the primaryPeerAddressPrefix value.
+     */
+    String primaryPeerAddressPrefix();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routeFilter value.
+     */
+    SubResource routeFilter();
+
+    /**
+     * @return the secondaryAzurePort value.
+     */
+    String secondaryAzurePort();
+
+    /**
+     * @return the secondaryPeerAddressPrefix value.
+     */
+    String secondaryPeerAddressPrefix();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the state value.
+     */
+    ExpressRoutePeeringState state();
+
+    /**
+     * @return the stats value.
+     */
+    ExpressRouteCircuitStats stats();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the vlanId value.
+     */
+    Integer vlanId();
+
+    /**
+     * The entirety of the ExpressRouteCircuitPeering definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithExpressRouteCircuit, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitPeering definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCircuitPeering definition.
+         */
+        interface Blank extends WithExpressRouteCircuit {
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify ExpressRouteCircuit.
+         */
+        interface WithExpressRouteCircuit {
+           /**
+            * Specifies resourceGroupName, circuitName.
+            * @param resourceGroupName The name of the resource group
+            * @param circuitName The name of the express route circuit
+            * @return the next definition stage
+            */
+            WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify AzureASN.
+         */
+        interface WithAzureASN {
+            /**
+             * Specifies azureASN.
+             * @param azureASN The Azure ASN
+             * @return the next definition stage
+             */
+            WithCreate withAzureASN(Integer azureASN);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify Connections.
+         */
+        interface WithConnections {
+            /**
+             * Specifies connections.
+             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
+             * @return the next definition stage
+             */
+            WithCreate withConnections(List<ExpressRouteCircuitConnectionInner> connections);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify ExpressRouteConnection.
+         */
+        interface WithExpressRouteConnection {
+            /**
+             * Specifies expressRouteConnection.
+             * @param expressRouteConnection The ExpressRoute connection
+             * @return the next definition stage
+             */
+            WithCreate withExpressRouteConnection(ExpressRouteConnectionId expressRouteConnection);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next definition stage
+             */
+            WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify Ipv6PeeringConfig.
+         */
+        interface WithIpv6PeeringConfig {
+            /**
+             * Specifies ipv6PeeringConfig.
+             * @param ipv6PeeringConfig The IPv6 peering configuration
+             * @return the next definition stage
+             */
+            WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify MicrosoftPeeringConfig.
+         */
+        interface WithMicrosoftPeeringConfig {
+            /**
+             * Specifies microsoftPeeringConfig.
+             * @param microsoftPeeringConfig The Microsoft peering configuration
+             * @return the next definition stage
+             */
+            WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify PeerASN.
+         */
+        interface WithPeerASN {
+            /**
+             * Specifies peerASN.
+             * @param peerASN The peer ASN
+             * @return the next definition stage
+             */
+            WithCreate withPeerASN(Long peerASN);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify PeeringType.
+         */
+        interface WithPeeringType {
+            /**
+             * Specifies peeringType.
+             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
+             * @return the next definition stage
+             */
+            WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify PrimaryAzurePort.
+         */
+        interface WithPrimaryAzurePort {
+            /**
+             * Specifies primaryAzurePort.
+             * @param primaryAzurePort The primary port
+             * @return the next definition stage
+             */
+            WithCreate withPrimaryAzurePort(String primaryAzurePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify PrimaryPeerAddressPrefix.
+         */
+        interface WithPrimaryPeerAddressPrefix {
+            /**
+             * Specifies primaryPeerAddressPrefix.
+             * @param primaryPeerAddressPrefix The primary address prefix
+             * @return the next definition stage
+             */
+            WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify RouteFilter.
+         */
+        interface WithRouteFilter {
+            /**
+             * Specifies routeFilter.
+             * @param routeFilter The reference to the RouteFilter resource
+             * @return the next definition stage
+             */
+            WithCreate withRouteFilter(SubResource routeFilter);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify SecondaryAzurePort.
+         */
+        interface WithSecondaryAzurePort {
+            /**
+             * Specifies secondaryAzurePort.
+             * @param secondaryAzurePort The secondary port
+             * @return the next definition stage
+             */
+            WithCreate withSecondaryAzurePort(String secondaryAzurePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify SecondaryPeerAddressPrefix.
+         */
+        interface WithSecondaryPeerAddressPrefix {
+            /**
+             * Specifies secondaryPeerAddressPrefix.
+             * @param secondaryPeerAddressPrefix The secondary address prefix
+             * @return the next definition stage
+             */
+            WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The shared key
+             * @return the next definition stage
+             */
+            WithCreate withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
+             * @return the next definition stage
+             */
+            WithCreate withState(ExpressRoutePeeringState state);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify Stats.
+         */
+        interface WithStats {
+            /**
+             * Specifies stats.
+             * @param stats The peering stats of express route circuit
+             * @return the next definition stage
+             */
+            WithCreate withStats(ExpressRouteCircuitStatsInner stats);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering definition allowing to specify VlanId.
+         */
+        interface WithVlanId {
+            /**
+             * Specifies vlanId.
+             * @param vlanId The VLAN ID
+             * @return the next definition stage
+             */
+            WithCreate withVlanId(Integer vlanId);
+        }
+
+        /**
+         * 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<ExpressRouteCircuitPeering>, DefinitionStages.WithAzureASN, DefinitionStages.WithConnections, DefinitionStages.WithExpressRouteConnection, DefinitionStages.WithGatewayManagerEtag, DefinitionStages.WithId, DefinitionStages.WithIpv6PeeringConfig, DefinitionStages.WithMicrosoftPeeringConfig, DefinitionStages.WithName, DefinitionStages.WithPeerASN, DefinitionStages.WithPeeringType, DefinitionStages.WithPrimaryAzurePort, DefinitionStages.WithPrimaryPeerAddressPrefix, DefinitionStages.WithRouteFilter, DefinitionStages.WithSecondaryAzurePort, DefinitionStages.WithSecondaryPeerAddressPrefix, DefinitionStages.WithSharedKey, DefinitionStages.WithState, DefinitionStages.WithStats, DefinitionStages.WithVlanId {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCircuitPeering update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCircuitPeering>, UpdateStages.WithAzureASN, UpdateStages.WithConnections, UpdateStages.WithExpressRouteConnection, UpdateStages.WithGatewayManagerEtag, UpdateStages.WithId, UpdateStages.WithIpv6PeeringConfig, UpdateStages.WithMicrosoftPeeringConfig, UpdateStages.WithName, UpdateStages.WithPeerASN, UpdateStages.WithPeeringType, UpdateStages.WithPrimaryAzurePort, UpdateStages.WithPrimaryPeerAddressPrefix, UpdateStages.WithRouteFilter, UpdateStages.WithSecondaryAzurePort, UpdateStages.WithSecondaryPeerAddressPrefix, UpdateStages.WithSharedKey, UpdateStages.WithState, UpdateStages.WithStats, UpdateStages.WithVlanId {
+    }
+
+    /**
+     * Grouping of ExpressRouteCircuitPeering update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify AzureASN.
+         */
+        interface WithAzureASN {
+            /**
+             * Specifies azureASN.
+             * @param azureASN The Azure ASN
+             * @return the next update stage
+             */
+            Update withAzureASN(Integer azureASN);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify Connections.
+         */
+        interface WithConnections {
+            /**
+             * Specifies connections.
+             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
+             * @return the next update stage
+             */
+            Update withConnections(List<ExpressRouteCircuitConnectionInner> connections);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify ExpressRouteConnection.
+         */
+        interface WithExpressRouteConnection {
+            /**
+             * Specifies expressRouteConnection.
+             * @param expressRouteConnection The ExpressRoute connection
+             * @return the next update stage
+             */
+            Update withExpressRouteConnection(ExpressRouteConnectionId expressRouteConnection);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next update stage
+             */
+            Update withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify Ipv6PeeringConfig.
+         */
+        interface WithIpv6PeeringConfig {
+            /**
+             * Specifies ipv6PeeringConfig.
+             * @param ipv6PeeringConfig The IPv6 peering configuration
+             * @return the next update stage
+             */
+            Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify MicrosoftPeeringConfig.
+         */
+        interface WithMicrosoftPeeringConfig {
+            /**
+             * Specifies microsoftPeeringConfig.
+             * @param microsoftPeeringConfig The Microsoft peering configuration
+             * @return the next update stage
+             */
+            Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify PeerASN.
+         */
+        interface WithPeerASN {
+            /**
+             * Specifies peerASN.
+             * @param peerASN The peer ASN
+             * @return the next update stage
+             */
+            Update withPeerASN(Long peerASN);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify PeeringType.
+         */
+        interface WithPeeringType {
+            /**
+             * Specifies peeringType.
+             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
+             * @return the next update stage
+             */
+            Update withPeeringType(ExpressRoutePeeringType peeringType);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify PrimaryAzurePort.
+         */
+        interface WithPrimaryAzurePort {
+            /**
+             * Specifies primaryAzurePort.
+             * @param primaryAzurePort The primary port
+             * @return the next update stage
+             */
+            Update withPrimaryAzurePort(String primaryAzurePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify PrimaryPeerAddressPrefix.
+         */
+        interface WithPrimaryPeerAddressPrefix {
+            /**
+             * Specifies primaryPeerAddressPrefix.
+             * @param primaryPeerAddressPrefix The primary address prefix
+             * @return the next update stage
+             */
+            Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify RouteFilter.
+         */
+        interface WithRouteFilter {
+            /**
+             * Specifies routeFilter.
+             * @param routeFilter The reference to the RouteFilter resource
+             * @return the next update stage
+             */
+            Update withRouteFilter(SubResource routeFilter);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify SecondaryAzurePort.
+         */
+        interface WithSecondaryAzurePort {
+            /**
+             * Specifies secondaryAzurePort.
+             * @param secondaryAzurePort The secondary port
+             * @return the next update stage
+             */
+            Update withSecondaryAzurePort(String secondaryAzurePort);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify SecondaryPeerAddressPrefix.
+         */
+        interface WithSecondaryPeerAddressPrefix {
+            /**
+             * Specifies secondaryPeerAddressPrefix.
+             * @param secondaryPeerAddressPrefix The secondary address prefix
+             * @return the next update stage
+             */
+            Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The shared key
+             * @return the next update stage
+             */
+            Update withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
+             * @return the next update stage
+             */
+            Update withState(ExpressRoutePeeringState state);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify Stats.
+         */
+        interface WithStats {
+            /**
+             * Specifies stats.
+             * @param stats The peering stats of express route circuit
+             * @return the next update stage
+             */
+            Update withStats(ExpressRouteCircuitStatsInner stats);
+        }
+
+        /**
+         * The stage of the expressroutecircuitpeering update allowing to specify VlanId.
+         */
+        interface WithVlanId {
+            /**
+             * Specifies vlanId.
+             * @param vlanId The VLAN ID
+             * @return the next update stage
+             */
+            Update withVlanId(Integer vlanId);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java
new file mode 100644
index 000000000000..6f0a7d2d176c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.
+ */
+public final class ExpressRouteCircuitPeeringAdvertisedPublicPrefixState extends ExpandableStringEnum<ExpressRouteCircuitPeeringAdvertisedPublicPrefixState> {
+    /** Static value NotConfigured for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState. */
+    public static final ExpressRouteCircuitPeeringAdvertisedPublicPrefixState NOT_CONFIGURED = fromString("NotConfigured");
+
+    /** Static value Configuring for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState. */
+    public static final ExpressRouteCircuitPeeringAdvertisedPublicPrefixState CONFIGURING = fromString("Configuring");
+
+    /** Static value Configured for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState. */
+    public static final ExpressRouteCircuitPeeringAdvertisedPublicPrefixState CONFIGURED = fromString("Configured");
+
+    /** Static value ValidationNeeded for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState. */
+    public static final ExpressRouteCircuitPeeringAdvertisedPublicPrefixState VALIDATION_NEEDED = fromString("ValidationNeeded");
+
+    /**
+     * Creates or finds a ExpressRouteCircuitPeeringAdvertisedPublicPrefixState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteCircuitPeeringAdvertisedPublicPrefixState
+     */
+    @JsonCreator
+    public static ExpressRouteCircuitPeeringAdvertisedPublicPrefixState fromString(String name) {
+        return fromString(name, ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.class);
+    }
+
+    /**
+     * @return known ExpressRouteCircuitPeeringAdvertisedPublicPrefixState values
+     */
+    public static Collection<ExpressRouteCircuitPeeringAdvertisedPublicPrefixState> values() {
+        return values(ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringConfig.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringConfig.java
new file mode 100644
index 000000000000..6cf5074a49f2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringConfig.java
@@ -0,0 +1,165 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Specifies the peering configuration.
+ */
+public class ExpressRouteCircuitPeeringConfig {
+    /**
+     * The reference to AdvertisedPublicPrefixes.
+     */
+    @JsonProperty(value = "advertisedPublicPrefixes")
+    private List<String> advertisedPublicPrefixes;
+
+    /**
+     * The communities of bgp peering. Specified for microsoft peering.
+     */
+    @JsonProperty(value = "advertisedCommunities")
+    private List<String> advertisedCommunities;
+
+    /**
+     * The advertised public prefix state of the Peering resource. Possible
+     * values include: 'NotConfigured', 'Configuring', 'Configured',
+     * 'ValidationNeeded'.
+     */
+    @JsonProperty(value = "advertisedPublicPrefixesState", access = JsonProperty.Access.WRITE_ONLY)
+    private ExpressRouteCircuitPeeringAdvertisedPublicPrefixState advertisedPublicPrefixesState;
+
+    /**
+     * The legacy mode of the peering.
+     */
+    @JsonProperty(value = "legacyMode")
+    private Integer legacyMode;
+
+    /**
+     * The CustomerASN of the peering.
+     */
+    @JsonProperty(value = "customerASN")
+    private Integer customerASN;
+
+    /**
+     * The RoutingRegistryName of the configuration.
+     */
+    @JsonProperty(value = "routingRegistryName")
+    private String routingRegistryName;
+
+    /**
+     * Get the reference to AdvertisedPublicPrefixes.
+     *
+     * @return the advertisedPublicPrefixes value
+     */
+    public List<String> advertisedPublicPrefixes() {
+        return this.advertisedPublicPrefixes;
+    }
+
+    /**
+     * Set the reference to AdvertisedPublicPrefixes.
+     *
+     * @param advertisedPublicPrefixes the advertisedPublicPrefixes value to set
+     * @return the ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public ExpressRouteCircuitPeeringConfig withAdvertisedPublicPrefixes(List<String> advertisedPublicPrefixes) {
+        this.advertisedPublicPrefixes = advertisedPublicPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the communities of bgp peering. Specified for microsoft peering.
+     *
+     * @return the advertisedCommunities value
+     */
+    public List<String> advertisedCommunities() {
+        return this.advertisedCommunities;
+    }
+
+    /**
+     * Set the communities of bgp peering. Specified for microsoft peering.
+     *
+     * @param advertisedCommunities the advertisedCommunities value to set
+     * @return the ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public ExpressRouteCircuitPeeringConfig withAdvertisedCommunities(List<String> advertisedCommunities) {
+        this.advertisedCommunities = advertisedCommunities;
+        return this;
+    }
+
+    /**
+     * Get the advertised public prefix state of the Peering resource. Possible values include: 'NotConfigured', 'Configuring', 'Configured', 'ValidationNeeded'.
+     *
+     * @return the advertisedPublicPrefixesState value
+     */
+    public ExpressRouteCircuitPeeringAdvertisedPublicPrefixState advertisedPublicPrefixesState() {
+        return this.advertisedPublicPrefixesState;
+    }
+
+    /**
+     * Get the legacy mode of the peering.
+     *
+     * @return the legacyMode value
+     */
+    public Integer legacyMode() {
+        return this.legacyMode;
+    }
+
+    /**
+     * Set the legacy mode of the peering.
+     *
+     * @param legacyMode the legacyMode value to set
+     * @return the ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public ExpressRouteCircuitPeeringConfig withLegacyMode(Integer legacyMode) {
+        this.legacyMode = legacyMode;
+        return this;
+    }
+
+    /**
+     * Get the CustomerASN of the peering.
+     *
+     * @return the customerASN value
+     */
+    public Integer customerASN() {
+        return this.customerASN;
+    }
+
+    /**
+     * Set the CustomerASN of the peering.
+     *
+     * @param customerASN the customerASN value to set
+     * @return the ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public ExpressRouteCircuitPeeringConfig withCustomerASN(Integer customerASN) {
+        this.customerASN = customerASN;
+        return this;
+    }
+
+    /**
+     * Get the RoutingRegistryName of the configuration.
+     *
+     * @return the routingRegistryName value
+     */
+    public String routingRegistryName() {
+        return this.routingRegistryName;
+    }
+
+    /**
+     * Set the RoutingRegistryName of the configuration.
+     *
+     * @param routingRegistryName the routingRegistryName value to set
+     * @return the ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public ExpressRouteCircuitPeeringConfig withRoutingRegistryName(String routingRegistryName) {
+        this.routingRegistryName = routingRegistryName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringId.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringId.java
new file mode 100644
index 000000000000..ba027d745af5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringId.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ExpressRoute circuit peering identifier.
+ */
+public class ExpressRouteCircuitPeeringId {
+    /**
+     * The ID of the ExpressRoute circuit peering.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the ID of the ExpressRoute circuit peering.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the ID of the ExpressRoute circuit peering.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteCircuitPeeringId object itself.
+     */
+    public ExpressRouteCircuitPeeringId withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringState.java
new file mode 100644
index 000000000000..b0b56b8e3a07
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeeringState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteCircuitPeeringState.
+ */
+public final class ExpressRouteCircuitPeeringState extends ExpandableStringEnum<ExpressRouteCircuitPeeringState> {
+    /** Static value Disabled for ExpressRouteCircuitPeeringState. */
+    public static final ExpressRouteCircuitPeeringState DISABLED = fromString("Disabled");
+
+    /** Static value Enabled for ExpressRouteCircuitPeeringState. */
+    public static final ExpressRouteCircuitPeeringState ENABLED = fromString("Enabled");
+
+    /**
+     * Creates or finds a ExpressRouteCircuitPeeringState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteCircuitPeeringState
+     */
+    @JsonCreator
+    public static ExpressRouteCircuitPeeringState fromString(String name) {
+        return fromString(name, ExpressRouteCircuitPeeringState.class);
+    }
+
+    /**
+     * @return known ExpressRouteCircuitPeeringState values
+     */
+    public static Collection<ExpressRouteCircuitPeeringState> values() {
+        return values(ExpressRouteCircuitPeeringState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeerings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeerings.java
new file mode 100644
index 000000000000..a1a1af8426c4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitPeerings.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitPeeringsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCircuitPeerings.
+ */
+public interface ExpressRouteCircuitPeerings extends SupportsCreating<ExpressRouteCircuitPeering.DefinitionStages.Blank>, HasInner<ExpressRouteCircuitPeeringsInner> {
+    /**
+     * Gets the specified peering for the express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitPeering> getAsync(String resourceGroupName, String circuitName, String peeringName);
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitPeering> listAsync(final String resourceGroupName, final String circuitName);
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String circuitName, String peeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitReference.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitReference.java
new file mode 100644
index 000000000000..7b0bc94df460
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitReference.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Reference to an express route circuit.
+ */
+public class ExpressRouteCircuitReference {
+    /**
+     * Corresponding Express Route Circuit Id.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get corresponding Express Route Circuit Id.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set corresponding Express Route Circuit Id.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteCircuitReference object itself.
+     */
+    public ExpressRouteCircuitReference withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTable.java
new file mode 100644
index 000000000000..a676dc7ea50b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTable.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The routes table associated with the ExpressRouteCircuit.
+ */
+public class ExpressRouteCircuitRoutesTable {
+    /**
+     * IP address of a network entity.
+     */
+    @JsonProperty(value = "network")
+    private String network;
+
+    /**
+     * NextHop address.
+     */
+    @JsonProperty(value = "nextHop")
+    private String nextHop;
+
+    /**
+     * Local preference value as set with the set local-preference route-map
+     * configuration command.
+     */
+    @JsonProperty(value = "locPrf")
+    private String locPrf;
+
+    /**
+     * Route Weight.
+     */
+    @JsonProperty(value = "weight")
+    private Integer weight;
+
+    /**
+     * Autonomous system paths to the destination network.
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * Get iP address of a network entity.
+     *
+     * @return the network value
+     */
+    public String network() {
+        return this.network;
+    }
+
+    /**
+     * Set iP address of a network entity.
+     *
+     * @param network the network value to set
+     * @return the ExpressRouteCircuitRoutesTable object itself.
+     */
+    public ExpressRouteCircuitRoutesTable withNetwork(String network) {
+        this.network = network;
+        return this;
+    }
+
+    /**
+     * Get nextHop address.
+     *
+     * @return the nextHop value
+     */
+    public String nextHop() {
+        return this.nextHop;
+    }
+
+    /**
+     * Set nextHop address.
+     *
+     * @param nextHop the nextHop value to set
+     * @return the ExpressRouteCircuitRoutesTable object itself.
+     */
+    public ExpressRouteCircuitRoutesTable withNextHop(String nextHop) {
+        this.nextHop = nextHop;
+        return this;
+    }
+
+    /**
+     * Get local preference value as set with the set local-preference route-map configuration command.
+     *
+     * @return the locPrf value
+     */
+    public String locPrf() {
+        return this.locPrf;
+    }
+
+    /**
+     * Set local preference value as set with the set local-preference route-map configuration command.
+     *
+     * @param locPrf the locPrf value to set
+     * @return the ExpressRouteCircuitRoutesTable object itself.
+     */
+    public ExpressRouteCircuitRoutesTable withLocPrf(String locPrf) {
+        this.locPrf = locPrf;
+        return this;
+    }
+
+    /**
+     * Get route Weight.
+     *
+     * @return the weight value
+     */
+    public Integer weight() {
+        return this.weight;
+    }
+
+    /**
+     * Set route Weight.
+     *
+     * @param weight the weight value to set
+     * @return the ExpressRouteCircuitRoutesTable object itself.
+     */
+    public ExpressRouteCircuitRoutesTable withWeight(Integer weight) {
+        this.weight = weight;
+        return this;
+    }
+
+    /**
+     * Get autonomous system paths to the destination network.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set autonomous system paths to the destination network.
+     *
+     * @param path the path value to set
+     * @return the ExpressRouteCircuitRoutesTable object itself.
+     */
+    public ExpressRouteCircuitRoutesTable withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTableSummary.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTableSummary.java
new file mode 100644
index 000000000000..175e4ad72f64
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitRoutesTableSummary.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The routes table associated with the ExpressRouteCircuit.
+ */
+public class ExpressRouteCircuitRoutesTableSummary {
+    /**
+     * IP address of the neighbor.
+     */
+    @JsonProperty(value = "neighbor")
+    private String neighbor;
+
+    /**
+     * BGP version number spoken to the neighbor.
+     */
+    @JsonProperty(value = "v")
+    private Integer v;
+
+    /**
+     * Autonomous system number.
+     */
+    @JsonProperty(value = "as")
+    private Integer as;
+
+    /**
+     * The length of time that the BGP session has been in the Established
+     * state, or the current status if not in the Established state.
+     */
+    @JsonProperty(value = "upDown")
+    private String upDown;
+
+    /**
+     * Current state of the BGP session, and the number of prefixes that have
+     * been received from a neighbor or peer group.
+     */
+    @JsonProperty(value = "statePfxRcd")
+    private String statePfxRcd;
+
+    /**
+     * Get iP address of the neighbor.
+     *
+     * @return the neighbor value
+     */
+    public String neighbor() {
+        return this.neighbor;
+    }
+
+    /**
+     * Set iP address of the neighbor.
+     *
+     * @param neighbor the neighbor value to set
+     * @return the ExpressRouteCircuitRoutesTableSummary object itself.
+     */
+    public ExpressRouteCircuitRoutesTableSummary withNeighbor(String neighbor) {
+        this.neighbor = neighbor;
+        return this;
+    }
+
+    /**
+     * Get bGP version number spoken to the neighbor.
+     *
+     * @return the v value
+     */
+    public Integer v() {
+        return this.v;
+    }
+
+    /**
+     * Set bGP version number spoken to the neighbor.
+     *
+     * @param v the v value to set
+     * @return the ExpressRouteCircuitRoutesTableSummary object itself.
+     */
+    public ExpressRouteCircuitRoutesTableSummary withV(Integer v) {
+        this.v = v;
+        return this;
+    }
+
+    /**
+     * Get autonomous system number.
+     *
+     * @return the as value
+     */
+    public Integer as() {
+        return this.as;
+    }
+
+    /**
+     * Set autonomous system number.
+     *
+     * @param as the as value to set
+     * @return the ExpressRouteCircuitRoutesTableSummary object itself.
+     */
+    public ExpressRouteCircuitRoutesTableSummary withAs(Integer as) {
+        this.as = as;
+        return this;
+    }
+
+    /**
+     * Get the length of time that the BGP session has been in the Established state, or the current status if not in the Established state.
+     *
+     * @return the upDown value
+     */
+    public String upDown() {
+        return this.upDown;
+    }
+
+    /**
+     * Set the length of time that the BGP session has been in the Established state, or the current status if not in the Established state.
+     *
+     * @param upDown the upDown value to set
+     * @return the ExpressRouteCircuitRoutesTableSummary object itself.
+     */
+    public ExpressRouteCircuitRoutesTableSummary withUpDown(String upDown) {
+        this.upDown = upDown;
+        return this;
+    }
+
+    /**
+     * Get current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group.
+     *
+     * @return the statePfxRcd value
+     */
+    public String statePfxRcd() {
+        return this.statePfxRcd;
+    }
+
+    /**
+     * Set current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group.
+     *
+     * @param statePfxRcd the statePfxRcd value to set
+     * @return the ExpressRouteCircuitRoutesTableSummary object itself.
+     */
+    public ExpressRouteCircuitRoutesTableSummary withStatePfxRcd(String statePfxRcd) {
+        this.statePfxRcd = statePfxRcd;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitServiceProviderProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitServiceProviderProperties.java
new file mode 100644
index 000000000000..09533563565f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitServiceProviderProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains ServiceProviderProperties in an ExpressRouteCircuit.
+ */
+public class ExpressRouteCircuitServiceProviderProperties {
+    /**
+     * The serviceProviderName.
+     */
+    @JsonProperty(value = "serviceProviderName")
+    private String serviceProviderName;
+
+    /**
+     * The peering location.
+     */
+    @JsonProperty(value = "peeringLocation")
+    private String peeringLocation;
+
+    /**
+     * The BandwidthInMbps.
+     */
+    @JsonProperty(value = "bandwidthInMbps")
+    private Integer bandwidthInMbps;
+
+    /**
+     * Get the serviceProviderName.
+     *
+     * @return the serviceProviderName value
+     */
+    public String serviceProviderName() {
+        return this.serviceProviderName;
+    }
+
+    /**
+     * Set the serviceProviderName.
+     *
+     * @param serviceProviderName the serviceProviderName value to set
+     * @return the ExpressRouteCircuitServiceProviderProperties object itself.
+     */
+    public ExpressRouteCircuitServiceProviderProperties withServiceProviderName(String serviceProviderName) {
+        this.serviceProviderName = serviceProviderName;
+        return this;
+    }
+
+    /**
+     * Get the peering location.
+     *
+     * @return the peeringLocation value
+     */
+    public String peeringLocation() {
+        return this.peeringLocation;
+    }
+
+    /**
+     * Set the peering location.
+     *
+     * @param peeringLocation the peeringLocation value to set
+     * @return the ExpressRouteCircuitServiceProviderProperties object itself.
+     */
+    public ExpressRouteCircuitServiceProviderProperties withPeeringLocation(String peeringLocation) {
+        this.peeringLocation = peeringLocation;
+        return this;
+    }
+
+    /**
+     * Get the BandwidthInMbps.
+     *
+     * @return the bandwidthInMbps value
+     */
+    public Integer bandwidthInMbps() {
+        return this.bandwidthInMbps;
+    }
+
+    /**
+     * Set the BandwidthInMbps.
+     *
+     * @param bandwidthInMbps the bandwidthInMbps value to set
+     * @return the ExpressRouteCircuitServiceProviderProperties object itself.
+     */
+    public ExpressRouteCircuitServiceProviderProperties withBandwidthInMbps(Integer bandwidthInMbps) {
+        this.bandwidthInMbps = bandwidthInMbps;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSku.java
new file mode 100644
index 000000000000..1c984e09e7be
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains SKU in an ExpressRouteCircuit.
+ */
+public class ExpressRouteCircuitSku {
+    /**
+     * The name of the SKU.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The tier of the SKU. Possible values include: 'Standard', 'Premium',
+     * 'Basic', 'Local'.
+     */
+    @JsonProperty(value = "tier")
+    private ExpressRouteCircuitSkuTier tier;
+
+    /**
+     * The family of the SKU. Possible values include: 'UnlimitedData',
+     * 'MeteredData'.
+     */
+    @JsonProperty(value = "family")
+    private ExpressRouteCircuitSkuFamily family;
+
+    /**
+     * Get the name of the SKU.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the SKU.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteCircuitSku object itself.
+     */
+    public ExpressRouteCircuitSku withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the tier of the SKU. Possible values include: 'Standard', 'Premium', 'Basic', 'Local'.
+     *
+     * @return the tier value
+     */
+    public ExpressRouteCircuitSkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set the tier of the SKU. Possible values include: 'Standard', 'Premium', 'Basic', 'Local'.
+     *
+     * @param tier the tier value to set
+     * @return the ExpressRouteCircuitSku object itself.
+     */
+    public ExpressRouteCircuitSku withTier(ExpressRouteCircuitSkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get the family of the SKU. Possible values include: 'UnlimitedData', 'MeteredData'.
+     *
+     * @return the family value
+     */
+    public ExpressRouteCircuitSkuFamily family() {
+        return this.family;
+    }
+
+    /**
+     * Set the family of the SKU. Possible values include: 'UnlimitedData', 'MeteredData'.
+     *
+     * @param family the family value to set
+     * @return the ExpressRouteCircuitSku object itself.
+     */
+    public ExpressRouteCircuitSku withFamily(ExpressRouteCircuitSkuFamily family) {
+        this.family = family;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuFamily.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuFamily.java
new file mode 100644
index 000000000000..76db19b06cc5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuFamily.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteCircuitSkuFamily.
+ */
+public final class ExpressRouteCircuitSkuFamily extends ExpandableStringEnum<ExpressRouteCircuitSkuFamily> {
+    /** Static value UnlimitedData for ExpressRouteCircuitSkuFamily. */
+    public static final ExpressRouteCircuitSkuFamily UNLIMITED_DATA = fromString("UnlimitedData");
+
+    /** Static value MeteredData for ExpressRouteCircuitSkuFamily. */
+    public static final ExpressRouteCircuitSkuFamily METERED_DATA = fromString("MeteredData");
+
+    /**
+     * Creates or finds a ExpressRouteCircuitSkuFamily from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteCircuitSkuFamily
+     */
+    @JsonCreator
+    public static ExpressRouteCircuitSkuFamily fromString(String name) {
+        return fromString(name, ExpressRouteCircuitSkuFamily.class);
+    }
+
+    /**
+     * @return known ExpressRouteCircuitSkuFamily values
+     */
+    public static Collection<ExpressRouteCircuitSkuFamily> values() {
+        return values(ExpressRouteCircuitSkuFamily.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuTier.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuTier.java
new file mode 100644
index 000000000000..75fd1b3e4f6f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitSkuTier.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteCircuitSkuTier.
+ */
+public final class ExpressRouteCircuitSkuTier extends ExpandableStringEnum<ExpressRouteCircuitSkuTier> {
+    /** Static value Standard for ExpressRouteCircuitSkuTier. */
+    public static final ExpressRouteCircuitSkuTier STANDARD = fromString("Standard");
+
+    /** Static value Premium for ExpressRouteCircuitSkuTier. */
+    public static final ExpressRouteCircuitSkuTier PREMIUM = fromString("Premium");
+
+    /** Static value Basic for ExpressRouteCircuitSkuTier. */
+    public static final ExpressRouteCircuitSkuTier BASIC = fromString("Basic");
+
+    /** Static value Local for ExpressRouteCircuitSkuTier. */
+    public static final ExpressRouteCircuitSkuTier LOCAL = fromString("Local");
+
+    /**
+     * Creates or finds a ExpressRouteCircuitSkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteCircuitSkuTier
+     */
+    @JsonCreator
+    public static ExpressRouteCircuitSkuTier fromString(String name) {
+        return fromString(name, ExpressRouteCircuitSkuTier.class);
+    }
+
+    /**
+     * @return known ExpressRouteCircuitSkuTier values
+     */
+    public static Collection<ExpressRouteCircuitSkuTier> values() {
+        return values(ExpressRouteCircuitSkuTier.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitStats.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitStats.java
new file mode 100644
index 000000000000..93d775215ef9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitStats.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitStatsInner;
+
+/**
+ * Type representing ExpressRouteCircuitStats.
+ */
+public interface ExpressRouteCircuitStats extends HasInner<ExpressRouteCircuitStatsInner>, HasManager<NetworkManager> {
+    /**
+     * @return the primarybytesIn value.
+     */
+    Long primarybytesIn();
+
+    /**
+     * @return the primarybytesOut value.
+     */
+    Long primarybytesOut();
+
+    /**
+     * @return the secondarybytesIn value.
+     */
+    Long secondarybytesIn();
+
+    /**
+     * @return the secondarybytesOut value.
+     */
+    Long secondarybytesOut();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuits.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuits.java
new file mode 100644
index 000000000000..1fc7bdbdde0e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuits.java
@@ -0,0 +1,82 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.ExpressRouteCircuitsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCircuits.
+ */
+public interface ExpressRouteCircuits extends SupportsCreating<ExpressRouteCircuit.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ExpressRouteCircuit>, SupportsListingByResourceGroup<ExpressRouteCircuit>, SupportsListing<ExpressRouteCircuit>, HasInner<ExpressRouteCircuitsInner> {
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitsArpTableListResult> listArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath);
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitsRoutesTableListResult> listRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath);
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitsRoutesTableSummaryListResult> listRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath);
+
+    /**
+     * Gets all the stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitStats> getStatsAsync(String resourceGroupName, String circuitName);
+
+    /**
+     * Gets all stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitStats> getPeeringStatsAsync(String resourceGroupName, String circuitName, String peeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsArpTableListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsArpTableListResult.java
new file mode 100644
index 000000000000..a4abca27149d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsArpTableListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitsArpTableListResultInner;
+import java.util.List;
+
+/**
+ * Type representing ExpressRouteCircuitsArpTableListResult.
+ */
+public interface ExpressRouteCircuitsArpTableListResult extends HasInner<ExpressRouteCircuitsArpTableListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ExpressRouteCircuitArpTable> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableListResult.java
new file mode 100644
index 000000000000..1aa8618ff8db
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitsRoutesTableListResultInner;
+import java.util.List;
+
+/**
+ * Type representing ExpressRouteCircuitsRoutesTableListResult.
+ */
+public interface ExpressRouteCircuitsRoutesTableListResult extends HasInner<ExpressRouteCircuitsRoutesTableListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ExpressRouteCircuitRoutesTable> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableSummaryListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableSummaryListResult.java
new file mode 100644
index 000000000000..c003435e96ac
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCircuitsRoutesTableSummaryListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitsRoutesTableSummaryListResultInner;
+import java.util.List;
+
+/**
+ * Type representing ExpressRouteCircuitsRoutesTableSummaryListResult.
+ */
+public interface ExpressRouteCircuitsRoutesTableSummaryListResult extends HasInner<ExpressRouteCircuitsRoutesTableSummaryListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ExpressRouteCircuitRoutesTableSummary> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnection.java
new file mode 100644
index 000000000000..e1f1b59e340a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnection.java
@@ -0,0 +1,257 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing ExpressRouteConnection.
+ */
+public interface ExpressRouteConnection extends HasInner<ExpressRouteConnectionInner>, Indexable, Refreshable<ExpressRouteConnection>, Updatable<ExpressRouteConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the authorizationKey value.
+     */
+    String authorizationKey();
+
+    /**
+     * @return the enableInternetSecurity value.
+     */
+    Boolean enableInternetSecurity();
+
+    /**
+     * @return the expressRouteCircuitPeering value.
+     */
+    ExpressRouteCircuitPeeringId expressRouteCircuitPeering();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routingConfiguration value.
+     */
+    RoutingConfiguration routingConfiguration();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * The entirety of the ExpressRouteConnection definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithExpressRouteGateway, DefinitionStages.WithExpressRouteCircuitPeering, DefinitionStages.WithName, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteConnection definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteConnection definition.
+         */
+        interface Blank extends WithExpressRouteGateway {
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify ExpressRouteGateway.
+         */
+        interface WithExpressRouteGateway {
+           /**
+            * Specifies resourceGroupName, expressRouteGatewayName.
+            * @param resourceGroupName The name of the resource group
+            * @param expressRouteGatewayName The name of the ExpressRoute gateway
+            * @return the next definition stage
+            */
+            WithExpressRouteCircuitPeering withExistingExpressRouteGateway(String resourceGroupName, String expressRouteGatewayName);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify ExpressRouteCircuitPeering.
+         */
+        interface WithExpressRouteCircuitPeering {
+           /**
+            * Specifies expressRouteCircuitPeering.
+            * @param expressRouteCircuitPeering The ExpressRoute circuit peering
+            * @return the next definition stage
+            */
+            WithName withExpressRouteCircuitPeering(ExpressRouteCircuitPeeringId expressRouteCircuitPeering);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify Name.
+         */
+        interface WithName {
+           /**
+            * Specifies name.
+            * @param name The name of the resource
+            * @return the next definition stage
+            */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey Authorization key to establish the connection
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify EnableInternetSecurity.
+         */
+        interface WithEnableInternetSecurity {
+            /**
+             * Specifies enableInternetSecurity.
+             * @param enableInternetSecurity Enable internet security
+             * @return the next definition stage
+             */
+            WithCreate withEnableInternetSecurity(Boolean enableInternetSecurity);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify RoutingConfiguration.
+         */
+        interface WithRoutingConfiguration {
+            /**
+             * Specifies routingConfiguration.
+             * @param routingConfiguration The Routing Configuration indicating the associated and propagated route tables on this connection
+             * @return the next definition stage
+             */
+            WithCreate withRoutingConfiguration(RoutingConfiguration routingConfiguration);
+        }
+
+        /**
+         * The stage of the expressrouteconnection definition allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight The routing weight associated to the connection
+             * @return the next definition stage
+             */
+            WithCreate withRoutingWeight(Integer routingWeight);
+        }
+
+        /**
+         * 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<ExpressRouteConnection>, DefinitionStages.WithAuthorizationKey, DefinitionStages.WithEnableInternetSecurity, DefinitionStages.WithId, DefinitionStages.WithRoutingConfiguration, DefinitionStages.WithRoutingWeight {
+        }
+    }
+    /**
+     * The template for a ExpressRouteConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteConnection>, UpdateStages.WithAuthorizationKey, UpdateStages.WithEnableInternetSecurity, UpdateStages.WithId, UpdateStages.WithRoutingConfiguration, UpdateStages.WithRoutingWeight {
+    }
+
+    /**
+     * Grouping of ExpressRouteConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressrouteconnection update allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey Authorization key to establish the connection
+             * @return the next update stage
+             */
+            Update withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressrouteconnection update allowing to specify EnableInternetSecurity.
+         */
+        interface WithEnableInternetSecurity {
+            /**
+             * Specifies enableInternetSecurity.
+             * @param enableInternetSecurity Enable internet security
+             * @return the next update stage
+             */
+            Update withEnableInternetSecurity(Boolean enableInternetSecurity);
+        }
+
+        /**
+         * The stage of the expressrouteconnection update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the expressrouteconnection update allowing to specify RoutingConfiguration.
+         */
+        interface WithRoutingConfiguration {
+            /**
+             * Specifies routingConfiguration.
+             * @param routingConfiguration The Routing Configuration indicating the associated and propagated route tables on this connection
+             * @return the next update stage
+             */
+            Update withRoutingConfiguration(RoutingConfiguration routingConfiguration);
+        }
+
+        /**
+         * The stage of the expressrouteconnection update allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight The routing weight associated to the connection
+             * @return the next update stage
+             */
+            Update withRoutingWeight(Integer routingWeight);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionId.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionId.java
new file mode 100644
index 000000000000..58f4ef55701b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionId.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ID of the ExpressRouteConnection.
+ */
+public class ExpressRouteConnectionId {
+    /**
+     * The ID of the ExpressRouteConnection.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Get the ID of the ExpressRouteConnection.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionList.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionList.java
new file mode 100644
index 000000000000..95970ab55eed
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnectionList.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteConnectionListInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteConnectionInner;
+import java.util.List;
+
+/**
+ * Type representing ExpressRouteConnectionList.
+ */
+public interface ExpressRouteConnectionList extends HasInner<ExpressRouteConnectionListInner>, HasManager<NetworkManager> {
+    /**
+     * @return the value value.
+     */
+    List<ExpressRouteConnectionInner> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnections.java
new file mode 100644
index 000000000000..39a864b48047
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteConnections.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteConnections.
+ */
+public interface ExpressRouteConnections extends SupportsCreating<ExpressRouteConnection.DefinitionStages.Blank>, HasInner<ExpressRouteConnectionsInner> {
+    /**
+     * Lists ExpressRouteConnections.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteConnectionList> listAsync(String resourceGroupName, String expressRouteGatewayName);
+
+    /**
+     * Gets the specified ExpressRouteConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the ExpressRoute connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteConnection> getAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName);
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnection.java
new file mode 100644
index 000000000000..e5752ae6a722
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnection.java
@@ -0,0 +1,269 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCrossConnectionPeeringInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCrossConnectionInner;
+
+/**
+ * Type representing ExpressRouteCrossConnection.
+ */
+public interface ExpressRouteCrossConnection extends HasInner<ExpressRouteCrossConnectionInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRouteCrossConnectionInner>, HasResourceGroup, Refreshable<ExpressRouteCrossConnection>, Updatable<ExpressRouteCrossConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the bandwidthInMbps value.
+     */
+    Integer bandwidthInMbps();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteCircuit value.
+     */
+    ExpressRouteCircuitReference expressRouteCircuit();
+
+    /**
+     * @return the peeringLocation value.
+     */
+    String peeringLocation();
+
+    /**
+     * @return the peerings value.
+     */
+    List<ExpressRouteCrossConnectionPeering> peerings();
+
+    /**
+     * @return the primaryAzurePort value.
+     */
+    String primaryAzurePort();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the secondaryAzurePort value.
+     */
+    String secondaryAzurePort();
+
+    /**
+     * @return the serviceProviderNotes value.
+     */
+    String serviceProviderNotes();
+
+    /**
+     * @return the serviceProviderProvisioningState value.
+     */
+    ServiceProviderProvisioningState serviceProviderProvisioningState();
+
+    /**
+     * @return the sTag value.
+     */
+    Integer sTag();
+
+    /**
+     * The entirety of the ExpressRouteCrossConnection definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCrossConnection definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCrossConnection definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ExpressRouteCrossConnection definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify BandwidthInMbps.
+         */
+        interface WithBandwidthInMbps {
+            /**
+             * Specifies bandwidthInMbps.
+             * @param bandwidthInMbps The circuit bandwidth In Mbps
+             * @return the next definition stage
+             */
+            WithCreate withBandwidthInMbps(Integer bandwidthInMbps);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify ExpressRouteCircuit.
+         */
+        interface WithExpressRouteCircuit {
+            /**
+             * Specifies expressRouteCircuit.
+             * @param expressRouteCircuit The ExpressRouteCircuit
+             * @return the next definition stage
+             */
+            WithCreate withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify PeeringLocation.
+         */
+        interface WithPeeringLocation {
+            /**
+             * Specifies peeringLocation.
+             * @param peeringLocation The peering location of the ExpressRoute circuit
+             * @return the next definition stage
+             */
+            WithCreate withPeeringLocation(String peeringLocation);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify Peerings.
+         */
+        interface WithPeerings {
+            /**
+             * Specifies peerings.
+             * @param peerings The list of peerings
+             * @return the next definition stage
+             */
+            WithCreate withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderNotes.
+         */
+        interface WithServiceProviderNotes {
+            /**
+             * Specifies serviceProviderNotes.
+             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderNotes(String serviceProviderNotes);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
+        /**
+         * 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<ExpressRouteCrossConnection>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBandwidthInMbps, DefinitionStages.WithExpressRouteCircuit, DefinitionStages.WithPeeringLocation, DefinitionStages.WithPeerings, DefinitionStages.WithServiceProviderNotes, DefinitionStages.WithServiceProviderProvisioningState {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCrossConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCrossConnection>, Resource.UpdateWithTags<Update>, UpdateStages.WithBandwidthInMbps, UpdateStages.WithExpressRouteCircuit, UpdateStages.WithPeeringLocation, UpdateStages.WithPeerings, UpdateStages.WithServiceProviderNotes, UpdateStages.WithServiceProviderProvisioningState {
+    }
+
+    /**
+     * Grouping of ExpressRouteCrossConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify BandwidthInMbps.
+         */
+        interface WithBandwidthInMbps {
+            /**
+             * Specifies bandwidthInMbps.
+             * @param bandwidthInMbps The circuit bandwidth In Mbps
+             * @return the next update stage
+             */
+            Update withBandwidthInMbps(Integer bandwidthInMbps);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify ExpressRouteCircuit.
+         */
+        interface WithExpressRouteCircuit {
+            /**
+             * Specifies expressRouteCircuit.
+             * @param expressRouteCircuit The ExpressRouteCircuit
+             * @return the next update stage
+             */
+            Update withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify PeeringLocation.
+         */
+        interface WithPeeringLocation {
+            /**
+             * Specifies peeringLocation.
+             * @param peeringLocation The peering location of the ExpressRoute circuit
+             * @return the next update stage
+             */
+            Update withPeeringLocation(String peeringLocation);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify Peerings.
+         */
+        interface WithPeerings {
+            /**
+             * Specifies peerings.
+             * @param peerings The list of peerings
+             * @return the next update stage
+             */
+            Update withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderNotes.
+         */
+        interface WithServiceProviderNotes {
+            /**
+             * Specifies serviceProviderNotes.
+             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
+             * @return the next update stage
+             */
+            Update withServiceProviderNotes(String serviceProviderNotes);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next update stage
+             */
+            Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeering.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeering.java
new file mode 100644
index 000000000000..e30d66295214
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeering.java
@@ -0,0 +1,451 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCrossConnectionPeeringInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing ExpressRouteCrossConnectionPeering.
+ */
+public interface ExpressRouteCrossConnectionPeering extends HasInner<ExpressRouteCrossConnectionPeeringInner>, Indexable, Refreshable<ExpressRouteCrossConnectionPeering>, Updatable<ExpressRouteCrossConnectionPeering.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the azureASN value.
+     */
+    Integer azureASN();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the gatewayManagerEtag value.
+     */
+    String gatewayManagerEtag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipv6PeeringConfig value.
+     */
+    Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig();
+
+    /**
+     * @return the lastModifiedBy value.
+     */
+    String lastModifiedBy();
+
+    /**
+     * @return the microsoftPeeringConfig value.
+     */
+    ExpressRouteCircuitPeeringConfig microsoftPeeringConfig();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peerASN value.
+     */
+    Long peerASN();
+
+    /**
+     * @return the peeringType value.
+     */
+    ExpressRoutePeeringType peeringType();
+
+    /**
+     * @return the primaryAzurePort value.
+     */
+    String primaryAzurePort();
+
+    /**
+     * @return the primaryPeerAddressPrefix value.
+     */
+    String primaryPeerAddressPrefix();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the secondaryAzurePort value.
+     */
+    String secondaryAzurePort();
+
+    /**
+     * @return the secondaryPeerAddressPrefix value.
+     */
+    String secondaryPeerAddressPrefix();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the state value.
+     */
+    ExpressRoutePeeringState state();
+
+    /**
+     * @return the vlanId value.
+     */
+    Integer vlanId();
+
+    /**
+     * The entirety of the ExpressRouteCrossConnectionPeering definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithExpressRouteCrossConnection, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteCrossConnectionPeering definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteCrossConnectionPeering definition.
+         */
+        interface Blank extends WithExpressRouteCrossConnection {
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify ExpressRouteCrossConnection.
+         */
+        interface WithExpressRouteCrossConnection {
+           /**
+            * Specifies resourceGroupName, crossConnectionName.
+            * @param resourceGroupName The name of the resource group
+            * @param crossConnectionName The name of the ExpressRouteCrossConnection
+            * @return the next definition stage
+            */
+            WithCreate withExistingExpressRouteCrossConnection(String resourceGroupName, String crossConnectionName);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next definition stage
+             */
+            WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify Ipv6PeeringConfig.
+         */
+        interface WithIpv6PeeringConfig {
+            /**
+             * Specifies ipv6PeeringConfig.
+             * @param ipv6PeeringConfig The IPv6 peering configuration
+             * @return the next definition stage
+             */
+            WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify MicrosoftPeeringConfig.
+         */
+        interface WithMicrosoftPeeringConfig {
+            /**
+             * Specifies microsoftPeeringConfig.
+             * @param microsoftPeeringConfig The Microsoft peering configuration
+             * @return the next definition stage
+             */
+            WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify PeerASN.
+         */
+        interface WithPeerASN {
+            /**
+             * Specifies peerASN.
+             * @param peerASN The peer ASN
+             * @return the next definition stage
+             */
+            WithCreate withPeerASN(Long peerASN);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify PeeringType.
+         */
+        interface WithPeeringType {
+            /**
+             * Specifies peeringType.
+             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
+             * @return the next definition stage
+             */
+            WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify PrimaryPeerAddressPrefix.
+         */
+        interface WithPrimaryPeerAddressPrefix {
+            /**
+             * Specifies primaryPeerAddressPrefix.
+             * @param primaryPeerAddressPrefix The primary address prefix
+             * @return the next definition stage
+             */
+            WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify SecondaryPeerAddressPrefix.
+         */
+        interface WithSecondaryPeerAddressPrefix {
+            /**
+             * Specifies secondaryPeerAddressPrefix.
+             * @param secondaryPeerAddressPrefix The secondary address prefix
+             * @return the next definition stage
+             */
+            WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The shared key
+             * @return the next definition stage
+             */
+            WithCreate withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
+             * @return the next definition stage
+             */
+            WithCreate withState(ExpressRoutePeeringState state);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering definition allowing to specify VlanId.
+         */
+        interface WithVlanId {
+            /**
+             * Specifies vlanId.
+             * @param vlanId The VLAN ID
+             * @return the next definition stage
+             */
+            WithCreate withVlanId(Integer vlanId);
+        }
+
+        /**
+         * 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<ExpressRouteCrossConnectionPeering>, DefinitionStages.WithGatewayManagerEtag, DefinitionStages.WithId, DefinitionStages.WithIpv6PeeringConfig, DefinitionStages.WithMicrosoftPeeringConfig, DefinitionStages.WithName, DefinitionStages.WithPeerASN, DefinitionStages.WithPeeringType, DefinitionStages.WithPrimaryPeerAddressPrefix, DefinitionStages.WithSecondaryPeerAddressPrefix, DefinitionStages.WithSharedKey, DefinitionStages.WithState, DefinitionStages.WithVlanId {
+        }
+    }
+    /**
+     * The template for a ExpressRouteCrossConnectionPeering update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteCrossConnectionPeering>, UpdateStages.WithGatewayManagerEtag, UpdateStages.WithId, UpdateStages.WithIpv6PeeringConfig, UpdateStages.WithMicrosoftPeeringConfig, UpdateStages.WithName, UpdateStages.WithPeerASN, UpdateStages.WithPeeringType, UpdateStages.WithPrimaryPeerAddressPrefix, UpdateStages.WithSecondaryPeerAddressPrefix, UpdateStages.WithSharedKey, UpdateStages.WithState, UpdateStages.WithVlanId {
+    }
+
+    /**
+     * Grouping of ExpressRouteCrossConnectionPeering update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify GatewayManagerEtag.
+         */
+        interface WithGatewayManagerEtag {
+            /**
+             * Specifies gatewayManagerEtag.
+             * @param gatewayManagerEtag The GatewayManager Etag
+             * @return the next update stage
+             */
+            Update withGatewayManagerEtag(String gatewayManagerEtag);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify Ipv6PeeringConfig.
+         */
+        interface WithIpv6PeeringConfig {
+            /**
+             * Specifies ipv6PeeringConfig.
+             * @param ipv6PeeringConfig The IPv6 peering configuration
+             * @return the next update stage
+             */
+            Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify MicrosoftPeeringConfig.
+         */
+        interface WithMicrosoftPeeringConfig {
+            /**
+             * Specifies microsoftPeeringConfig.
+             * @param microsoftPeeringConfig The Microsoft peering configuration
+             * @return the next update stage
+             */
+            Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify PeerASN.
+         */
+        interface WithPeerASN {
+            /**
+             * Specifies peerASN.
+             * @param peerASN The peer ASN
+             * @return the next update stage
+             */
+            Update withPeerASN(Long peerASN);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify PeeringType.
+         */
+        interface WithPeeringType {
+            /**
+             * Specifies peeringType.
+             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
+             * @return the next update stage
+             */
+            Update withPeeringType(ExpressRoutePeeringType peeringType);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify PrimaryPeerAddressPrefix.
+         */
+        interface WithPrimaryPeerAddressPrefix {
+            /**
+             * Specifies primaryPeerAddressPrefix.
+             * @param primaryPeerAddressPrefix The primary address prefix
+             * @return the next update stage
+             */
+            Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify SecondaryPeerAddressPrefix.
+         */
+        interface WithSecondaryPeerAddressPrefix {
+            /**
+             * Specifies secondaryPeerAddressPrefix.
+             * @param secondaryPeerAddressPrefix The secondary address prefix
+             * @return the next update stage
+             */
+            Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The shared key
+             * @return the next update stage
+             */
+            Update withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
+             * @return the next update stage
+             */
+            Update withState(ExpressRoutePeeringState state);
+        }
+
+        /**
+         * The stage of the expressroutecrossconnectionpeering update allowing to specify VlanId.
+         */
+        interface WithVlanId {
+            /**
+             * Specifies vlanId.
+             * @param vlanId The VLAN ID
+             * @return the next update stage
+             */
+            Update withVlanId(Integer vlanId);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeerings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeerings.java
new file mode 100644
index 000000000000..482bde3c2eaa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionPeerings.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCrossConnectionPeeringsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCrossConnectionPeerings.
+ */
+public interface ExpressRouteCrossConnectionPeerings extends SupportsCreating<ExpressRouteCrossConnectionPeering.DefinitionStages.Blank>, HasInner<ExpressRouteCrossConnectionPeeringsInner> {
+    /**
+     * Gets the specified peering for the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCrossConnectionPeering> getAsync(String resourceGroupName, String crossConnectionName, String peeringName);
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCrossConnectionPeering> listAsync(final String resourceGroupName, final String crossConnectionName);
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String crossConnectionName, String peeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionRoutesTableSummary.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionRoutesTableSummary.java
new file mode 100644
index 000000000000..f5e500e9c371
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionRoutesTableSummary.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The routes table associated with the ExpressRouteCircuit.
+ */
+public class ExpressRouteCrossConnectionRoutesTableSummary {
+    /**
+     * IP address of Neighbor router.
+     */
+    @JsonProperty(value = "neighbor")
+    private String neighbor;
+
+    /**
+     * Autonomous system number.
+     */
+    @JsonProperty(value = "asn")
+    private Integer asn;
+
+    /**
+     * The length of time that the BGP session has been in the Established
+     * state, or the current status if not in the Established state.
+     */
+    @JsonProperty(value = "upDown")
+    private String upDown;
+
+    /**
+     * Current state of the BGP session, and the number of prefixes that have
+     * been received from a neighbor or peer group.
+     */
+    @JsonProperty(value = "stateOrPrefixesReceived")
+    private String stateOrPrefixesReceived;
+
+    /**
+     * Get iP address of Neighbor router.
+     *
+     * @return the neighbor value
+     */
+    public String neighbor() {
+        return this.neighbor;
+    }
+
+    /**
+     * Set iP address of Neighbor router.
+     *
+     * @param neighbor the neighbor value to set
+     * @return the ExpressRouteCrossConnectionRoutesTableSummary object itself.
+     */
+    public ExpressRouteCrossConnectionRoutesTableSummary withNeighbor(String neighbor) {
+        this.neighbor = neighbor;
+        return this;
+    }
+
+    /**
+     * Get autonomous system number.
+     *
+     * @return the asn value
+     */
+    public Integer asn() {
+        return this.asn;
+    }
+
+    /**
+     * Set autonomous system number.
+     *
+     * @param asn the asn value to set
+     * @return the ExpressRouteCrossConnectionRoutesTableSummary object itself.
+     */
+    public ExpressRouteCrossConnectionRoutesTableSummary withAsn(Integer asn) {
+        this.asn = asn;
+        return this;
+    }
+
+    /**
+     * Get the length of time that the BGP session has been in the Established state, or the current status if not in the Established state.
+     *
+     * @return the upDown value
+     */
+    public String upDown() {
+        return this.upDown;
+    }
+
+    /**
+     * Set the length of time that the BGP session has been in the Established state, or the current status if not in the Established state.
+     *
+     * @param upDown the upDown value to set
+     * @return the ExpressRouteCrossConnectionRoutesTableSummary object itself.
+     */
+    public ExpressRouteCrossConnectionRoutesTableSummary withUpDown(String upDown) {
+        this.upDown = upDown;
+        return this;
+    }
+
+    /**
+     * Get current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group.
+     *
+     * @return the stateOrPrefixesReceived value
+     */
+    public String stateOrPrefixesReceived() {
+        return this.stateOrPrefixesReceived;
+    }
+
+    /**
+     * Set current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group.
+     *
+     * @param stateOrPrefixesReceived the stateOrPrefixesReceived value to set
+     * @return the ExpressRouteCrossConnectionRoutesTableSummary object itself.
+     */
+    public ExpressRouteCrossConnectionRoutesTableSummary withStateOrPrefixesReceived(String stateOrPrefixesReceived) {
+        this.stateOrPrefixesReceived = stateOrPrefixesReceived;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnections.java
new file mode 100644
index 000000000000..d9e2b05e1e5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnections.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+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.network.v2020_04_01.implementation.ExpressRouteCrossConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteCrossConnections.
+ */
+public interface ExpressRouteCrossConnections extends SupportsCreating<ExpressRouteCrossConnection.DefinitionStages.Blank>, SupportsGettingByResourceGroup<ExpressRouteCrossConnection>, SupportsListingByResourceGroup<ExpressRouteCrossConnection>, SupportsListing<ExpressRouteCrossConnection>, HasInner<ExpressRouteCrossConnectionsInner> {
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitsArpTableListResult> listArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath);
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCrossConnectionsRoutesTableSummaryListResult> listRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath);
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteCircuitsRoutesTableListResult> listRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionsRoutesTableSummaryListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionsRoutesTableSummaryListResult.java
new file mode 100644
index 000000000000..637e2ec7c945
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteCrossConnectionsRoutesTableSummaryListResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner;
+import java.util.List;
+
+/**
+ * Type representing ExpressRouteCrossConnectionsRoutesTableSummaryListResult.
+ */
+public interface ExpressRouteCrossConnectionsRoutesTableSummaryListResult extends HasInner<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ExpressRouteCrossConnectionRoutesTableSummary> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateway.java
new file mode 100644
index 000000000000..4fc9c80593fb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateway.java
@@ -0,0 +1,130 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteGatewayInner;
+
+/**
+ * Type representing ExpressRouteGateway.
+ */
+public interface ExpressRouteGateway extends HasInner<ExpressRouteGatewayInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRouteGatewayInner>, HasResourceGroup, Refreshable<ExpressRouteGateway>, Updatable<ExpressRouteGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the autoScaleConfiguration value.
+     */
+    ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteConnections value.
+     */
+    List<ExpressRouteConnection> expressRouteConnections();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the virtualHub value.
+     */
+    VirtualHubId virtualHub();
+
+    /**
+     * The entirety of the ExpressRouteGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithVirtualHub, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRouteGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRouteGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ExpressRouteGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithVirtualHub> {
+        }
+
+        /**
+         * The stage of the expressroutegateway definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+           /**
+            * Specifies virtualHub.
+            * @param virtualHub The Virtual Hub where the ExpressRoute gateway is or will be deployed
+            * @return the next definition stage
+*/
+            WithCreate withVirtualHub(VirtualHubId virtualHub);
+        }
+
+        /**
+         * The stage of the expressroutegateway definition allowing to specify AutoScaleConfiguration.
+         */
+        interface WithAutoScaleConfiguration {
+            /**
+             * Specifies autoScaleConfiguration.
+             * @param autoScaleConfiguration Configuration for auto scaling
+             * @return the next definition stage
+             */
+            WithCreate withAutoScaleConfiguration(ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration);
+        }
+
+        /**
+         * 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<ExpressRouteGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAutoScaleConfiguration {
+        }
+    }
+    /**
+     * The template for a ExpressRouteGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRouteGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithAutoScaleConfiguration {
+    }
+
+    /**
+     * Grouping of ExpressRouteGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressroutegateway update allowing to specify AutoScaleConfiguration.
+         */
+        interface WithAutoScaleConfiguration {
+            /**
+             * Specifies autoScaleConfiguration.
+             * @param autoScaleConfiguration Configuration for auto scaling
+             * @return the next update stage
+             */
+            Update withAutoScaleConfiguration(ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfiguration.java
new file mode 100644
index 000000000000..9b1d5d1eb303
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Configuration for auto scaling.
+ */
+public class ExpressRouteGatewayPropertiesAutoScaleConfiguration {
+    /**
+     * Minimum and maximum number of scale units to deploy.
+     */
+    @JsonProperty(value = "bounds")
+    private ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds bounds;
+
+    /**
+     * Get minimum and maximum number of scale units to deploy.
+     *
+     * @return the bounds value
+     */
+    public ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds bounds() {
+        return this.bounds;
+    }
+
+    /**
+     * Set minimum and maximum number of scale units to deploy.
+     *
+     * @param bounds the bounds value to set
+     * @return the ExpressRouteGatewayPropertiesAutoScaleConfiguration object itself.
+     */
+    public ExpressRouteGatewayPropertiesAutoScaleConfiguration withBounds(ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds bounds) {
+        this.bounds = bounds;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds.java
new file mode 100644
index 000000000000..77fd72fe8e36
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Minimum and maximum number of scale units to deploy.
+ */
+public class ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds {
+    /**
+     * Minimum number of scale units deployed for ExpressRoute gateway.
+     */
+    @JsonProperty(value = "min")
+    private Integer min;
+
+    /**
+     * Maximum number of scale units deployed for ExpressRoute gateway.
+     */
+    @JsonProperty(value = "max")
+    private Integer max;
+
+    /**
+     * Get minimum number of scale units deployed for ExpressRoute gateway.
+     *
+     * @return the min value
+     */
+    public Integer min() {
+        return this.min;
+    }
+
+    /**
+     * Set minimum number of scale units deployed for ExpressRoute gateway.
+     *
+     * @param min the min value to set
+     * @return the ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds object itself.
+     */
+    public ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds withMin(Integer min) {
+        this.min = min;
+        return this;
+    }
+
+    /**
+     * Get maximum number of scale units deployed for ExpressRoute gateway.
+     *
+     * @return the max value
+     */
+    public Integer max() {
+        return this.max;
+    }
+
+    /**
+     * Set maximum number of scale units deployed for ExpressRoute gateway.
+     *
+     * @param max the max value to set
+     * @return the ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds object itself.
+     */
+    public ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds withMax(Integer max) {
+        this.max = max;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateways.java
new file mode 100644
index 000000000000..aa8f9d8a01ac
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteGateways.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.ExpressRouteGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteGateways.
+ */
+public interface ExpressRouteGateways extends SupportsCreating<ExpressRouteGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ExpressRouteGateway>, SupportsListingByResourceGroup<ExpressRouteGateway>, SupportsListing<ExpressRouteGateway>, HasInner<ExpressRouteGatewaysInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLink.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLink.java
new file mode 100644
index 000000000000..923e9084aabf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLink.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteLinkInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing ExpressRouteLink.
+ */
+public interface ExpressRouteLink extends HasInner<ExpressRouteLinkInner>, Indexable, Refreshable<ExpressRouteLink>, HasManager<NetworkManager> {
+    /**
+     * @return the adminState value.
+     */
+    ExpressRouteLinkAdminState adminState();
+
+    /**
+     * @return the connectorType value.
+     */
+    ExpressRouteLinkConnectorType connectorType();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the interfaceName value.
+     */
+    String interfaceName();
+
+    /**
+     * @return the macSecConfig value.
+     */
+    ExpressRouteLinkMacSecConfig macSecConfig();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the patchPanelId value.
+     */
+    String patchPanelId();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the rackId value.
+     */
+    String rackId();
+
+    /**
+     * @return the routerName value.
+     */
+    String routerName();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkAdminState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkAdminState.java
new file mode 100644
index 000000000000..38782a8fafcf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkAdminState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteLinkAdminState.
+ */
+public final class ExpressRouteLinkAdminState extends ExpandableStringEnum<ExpressRouteLinkAdminState> {
+    /** Static value Enabled for ExpressRouteLinkAdminState. */
+    public static final ExpressRouteLinkAdminState ENABLED = fromString("Enabled");
+
+    /** Static value Disabled for ExpressRouteLinkAdminState. */
+    public static final ExpressRouteLinkAdminState DISABLED = fromString("Disabled");
+
+    /**
+     * Creates or finds a ExpressRouteLinkAdminState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteLinkAdminState
+     */
+    @JsonCreator
+    public static ExpressRouteLinkAdminState fromString(String name) {
+        return fromString(name, ExpressRouteLinkAdminState.class);
+    }
+
+    /**
+     * @return known ExpressRouteLinkAdminState values
+     */
+    public static Collection<ExpressRouteLinkAdminState> values() {
+        return values(ExpressRouteLinkAdminState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkConnectorType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkConnectorType.java
new file mode 100644
index 000000000000..b10d9c825756
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkConnectorType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteLinkConnectorType.
+ */
+public final class ExpressRouteLinkConnectorType extends ExpandableStringEnum<ExpressRouteLinkConnectorType> {
+    /** Static value LC for ExpressRouteLinkConnectorType. */
+    public static final ExpressRouteLinkConnectorType LC = fromString("LC");
+
+    /** Static value SC for ExpressRouteLinkConnectorType. */
+    public static final ExpressRouteLinkConnectorType SC = fromString("SC");
+
+    /**
+     * Creates or finds a ExpressRouteLinkConnectorType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteLinkConnectorType
+     */
+    @JsonCreator
+    public static ExpressRouteLinkConnectorType fromString(String name) {
+        return fromString(name, ExpressRouteLinkConnectorType.class);
+    }
+
+    /**
+     * @return known ExpressRouteLinkConnectorType values
+     */
+    public static Collection<ExpressRouteLinkConnectorType> values() {
+        return values(ExpressRouteLinkConnectorType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecCipher.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecCipher.java
new file mode 100644
index 000000000000..9d665967b1d6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecCipher.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRouteLinkMacSecCipher.
+ */
+public final class ExpressRouteLinkMacSecCipher extends ExpandableStringEnum<ExpressRouteLinkMacSecCipher> {
+    /** Static value gcm-aes-128 for ExpressRouteLinkMacSecCipher. */
+    public static final ExpressRouteLinkMacSecCipher GCM_AES_128 = fromString("gcm-aes-128");
+
+    /** Static value gcm-aes-256 for ExpressRouteLinkMacSecCipher. */
+    public static final ExpressRouteLinkMacSecCipher GCM_AES_256 = fromString("gcm-aes-256");
+
+    /**
+     * Creates or finds a ExpressRouteLinkMacSecCipher from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRouteLinkMacSecCipher
+     */
+    @JsonCreator
+    public static ExpressRouteLinkMacSecCipher fromString(String name) {
+        return fromString(name, ExpressRouteLinkMacSecCipher.class);
+    }
+
+    /**
+     * @return known ExpressRouteLinkMacSecCipher values
+     */
+    public static Collection<ExpressRouteLinkMacSecCipher> values() {
+        return values(ExpressRouteLinkMacSecCipher.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecConfig.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecConfig.java
new file mode 100644
index 000000000000..b9eb3766928d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinkMacSecConfig.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Definition of ExpressRouteLink Mac Security configuration.
+ * ExpressRouteLink Mac Security Configuration.
+ */
+public class ExpressRouteLinkMacSecConfig {
+    /**
+     * Keyvault Secret Identifier URL containing Mac security CKN key.
+     */
+    @JsonProperty(value = "cknSecretIdentifier")
+    private String cknSecretIdentifier;
+
+    /**
+     * Keyvault Secret Identifier URL containing Mac security CAK key.
+     */
+    @JsonProperty(value = "cakSecretIdentifier")
+    private String cakSecretIdentifier;
+
+    /**
+     * Mac security cipher. Possible values include: 'gcm-aes-128',
+     * 'gcm-aes-256'.
+     */
+    @JsonProperty(value = "cipher")
+    private ExpressRouteLinkMacSecCipher cipher;
+
+    /**
+     * Get keyvault Secret Identifier URL containing Mac security CKN key.
+     *
+     * @return the cknSecretIdentifier value
+     */
+    public String cknSecretIdentifier() {
+        return this.cknSecretIdentifier;
+    }
+
+    /**
+     * Set keyvault Secret Identifier URL containing Mac security CKN key.
+     *
+     * @param cknSecretIdentifier the cknSecretIdentifier value to set
+     * @return the ExpressRouteLinkMacSecConfig object itself.
+     */
+    public ExpressRouteLinkMacSecConfig withCknSecretIdentifier(String cknSecretIdentifier) {
+        this.cknSecretIdentifier = cknSecretIdentifier;
+        return this;
+    }
+
+    /**
+     * Get keyvault Secret Identifier URL containing Mac security CAK key.
+     *
+     * @return the cakSecretIdentifier value
+     */
+    public String cakSecretIdentifier() {
+        return this.cakSecretIdentifier;
+    }
+
+    /**
+     * Set keyvault Secret Identifier URL containing Mac security CAK key.
+     *
+     * @param cakSecretIdentifier the cakSecretIdentifier value to set
+     * @return the ExpressRouteLinkMacSecConfig object itself.
+     */
+    public ExpressRouteLinkMacSecConfig withCakSecretIdentifier(String cakSecretIdentifier) {
+        this.cakSecretIdentifier = cakSecretIdentifier;
+        return this;
+    }
+
+    /**
+     * Get mac security cipher. Possible values include: 'gcm-aes-128', 'gcm-aes-256'.
+     *
+     * @return the cipher value
+     */
+    public ExpressRouteLinkMacSecCipher cipher() {
+        return this.cipher;
+    }
+
+    /**
+     * Set mac security cipher. Possible values include: 'gcm-aes-128', 'gcm-aes-256'.
+     *
+     * @param cipher the cipher value to set
+     * @return the ExpressRouteLinkMacSecConfig object itself.
+     */
+    public ExpressRouteLinkMacSecConfig withCipher(ExpressRouteLinkMacSecCipher cipher) {
+        this.cipher = cipher;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinks.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinks.java
new file mode 100644
index 000000000000..c5558973f450
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteLinks.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteLinksInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteLinks.
+ */
+public interface ExpressRouteLinks extends HasInner<ExpressRouteLinksInner> {
+    /**
+     * Retrieves the specified ExpressRouteLink resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param linkName The name of the ExpressRouteLink resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteLink> getAsync(String resourceGroupName, String expressRoutePortName, String linkName);
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRouteLink> listAsync(final String resourceGroupName, final String expressRoutePortName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringState.java
new file mode 100644
index 000000000000..6c5959a74504
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRoutePeeringState.
+ */
+public final class ExpressRoutePeeringState extends ExpandableStringEnum<ExpressRoutePeeringState> {
+    /** Static value Disabled for ExpressRoutePeeringState. */
+    public static final ExpressRoutePeeringState DISABLED = fromString("Disabled");
+
+    /** Static value Enabled for ExpressRoutePeeringState. */
+    public static final ExpressRoutePeeringState ENABLED = fromString("Enabled");
+
+    /**
+     * Creates or finds a ExpressRoutePeeringState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRoutePeeringState
+     */
+    @JsonCreator
+    public static ExpressRoutePeeringState fromString(String name) {
+        return fromString(name, ExpressRoutePeeringState.class);
+    }
+
+    /**
+     * @return known ExpressRoutePeeringState values
+     */
+    public static Collection<ExpressRoutePeeringState> values() {
+        return values(ExpressRoutePeeringState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringType.java
new file mode 100644
index 000000000000..26695d0c42cc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePeeringType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRoutePeeringType.
+ */
+public final class ExpressRoutePeeringType extends ExpandableStringEnum<ExpressRoutePeeringType> {
+    /** Static value AzurePublicPeering for ExpressRoutePeeringType. */
+    public static final ExpressRoutePeeringType AZURE_PUBLIC_PEERING = fromString("AzurePublicPeering");
+
+    /** Static value AzurePrivatePeering for ExpressRoutePeeringType. */
+    public static final ExpressRoutePeeringType AZURE_PRIVATE_PEERING = fromString("AzurePrivatePeering");
+
+    /** Static value MicrosoftPeering for ExpressRoutePeeringType. */
+    public static final ExpressRoutePeeringType MICROSOFT_PEERING = fromString("MicrosoftPeering");
+
+    /**
+     * Creates or finds a ExpressRoutePeeringType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRoutePeeringType
+     */
+    @JsonCreator
+    public static ExpressRoutePeeringType fromString(String name) {
+        return fromString(name, ExpressRoutePeeringType.class);
+    }
+
+    /**
+     * @return known ExpressRoutePeeringType values
+     */
+    public static Collection<ExpressRoutePeeringType> values() {
+        return values(ExpressRoutePeeringType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePort.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePort.java
new file mode 100644
index 000000000000..765bd1377666
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePort.java
@@ -0,0 +1,256 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteLinkInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRoutePortInner;
+
+/**
+ * Type representing ExpressRoutePort.
+ */
+public interface ExpressRoutePort extends HasInner<ExpressRoutePortInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRoutePortInner>, HasResourceGroup, Refreshable<ExpressRoutePort>, Updatable<ExpressRoutePort.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the allocationDate value.
+     */
+    String allocationDate();
+
+    /**
+     * @return the bandwidthInGbps value.
+     */
+    Integer bandwidthInGbps();
+
+    /**
+     * @return the circuits value.
+     */
+    List<SubResource> circuits();
+
+    /**
+     * @return the encapsulation value.
+     */
+    ExpressRoutePortsEncapsulation encapsulation();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the etherType value.
+     */
+    String etherType();
+
+    /**
+     * @return the identity value.
+     */
+    ManagedServiceIdentity identity();
+
+    /**
+     * @return the links value.
+     */
+    List<ExpressRouteLink> links();
+
+    /**
+     * @return the mtu value.
+     */
+    String mtu();
+
+    /**
+     * @return the peeringLocation value.
+     */
+    String peeringLocation();
+
+    /**
+     * @return the provisionedBandwidthInGbps value.
+     */
+    Double provisionedBandwidthInGbps();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the ExpressRoutePort definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ExpressRoutePort definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ExpressRoutePort definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ExpressRoutePort definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the expressrouteport definition allowing to specify BandwidthInGbps.
+         */
+        interface WithBandwidthInGbps {
+            /**
+             * Specifies bandwidthInGbps.
+             * @param bandwidthInGbps Bandwidth of procured ports in Gbps
+             * @return the next definition stage
+             */
+            WithCreate withBandwidthInGbps(Integer bandwidthInGbps);
+        }
+
+        /**
+         * The stage of the expressrouteport definition allowing to specify Encapsulation.
+         */
+        interface WithEncapsulation {
+            /**
+             * Specifies encapsulation.
+             * @param encapsulation Encapsulation method on physical ports. Possible values include: 'Dot1Q', 'QinQ'
+             * @return the next definition stage
+             */
+            WithCreate withEncapsulation(ExpressRoutePortsEncapsulation encapsulation);
+        }
+
+        /**
+         * The stage of the expressrouteport definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of ExpressRoutePort, if configured
+             * @return the next definition stage
+             */
+            WithCreate withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the expressrouteport definition allowing to specify Links.
+         */
+        interface WithLinks {
+            /**
+             * Specifies links.
+             * @param links The set of physical links of the ExpressRoutePort resource
+             * @return the next definition stage
+             */
+            WithCreate withLinks(List<ExpressRouteLinkInner> links);
+        }
+
+        /**
+         * The stage of the expressrouteport definition allowing to specify PeeringLocation.
+         */
+        interface WithPeeringLocation {
+            /**
+             * Specifies peeringLocation.
+             * @param peeringLocation The name of the peering location that the ExpressRoutePort is mapped to physically
+             * @return the next definition stage
+             */
+            WithCreate withPeeringLocation(String peeringLocation);
+        }
+
+        /**
+         * 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<ExpressRoutePort>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBandwidthInGbps, DefinitionStages.WithEncapsulation, DefinitionStages.WithIdentity, DefinitionStages.WithLinks, DefinitionStages.WithPeeringLocation {
+        }
+    }
+    /**
+     * The template for a ExpressRoutePort update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ExpressRoutePort>, Resource.UpdateWithTags<Update>, UpdateStages.WithBandwidthInGbps, UpdateStages.WithEncapsulation, UpdateStages.WithIdentity, UpdateStages.WithLinks, UpdateStages.WithPeeringLocation {
+    }
+
+    /**
+     * Grouping of ExpressRoutePort update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the expressrouteport update allowing to specify BandwidthInGbps.
+         */
+        interface WithBandwidthInGbps {
+            /**
+             * Specifies bandwidthInGbps.
+             * @param bandwidthInGbps Bandwidth of procured ports in Gbps
+             * @return the next update stage
+             */
+            Update withBandwidthInGbps(Integer bandwidthInGbps);
+        }
+
+        /**
+         * The stage of the expressrouteport update allowing to specify Encapsulation.
+         */
+        interface WithEncapsulation {
+            /**
+             * Specifies encapsulation.
+             * @param encapsulation Encapsulation method on physical ports. Possible values include: 'Dot1Q', 'QinQ'
+             * @return the next update stage
+             */
+            Update withEncapsulation(ExpressRoutePortsEncapsulation encapsulation);
+        }
+
+        /**
+         * The stage of the expressrouteport update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of ExpressRoutePort, if configured
+             * @return the next update stage
+             */
+            Update withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the expressrouteport update allowing to specify Links.
+         */
+        interface WithLinks {
+            /**
+             * Specifies links.
+             * @param links The set of physical links of the ExpressRoutePort resource
+             * @return the next update stage
+             */
+            Update withLinks(List<ExpressRouteLinkInner> links);
+        }
+
+        /**
+         * The stage of the expressrouteport update allowing to specify PeeringLocation.
+         */
+        interface WithPeeringLocation {
+            /**
+             * Specifies peeringLocation.
+             * @param peeringLocation The name of the peering location that the ExpressRoutePort is mapped to physically
+             * @return the next update stage
+             */
+            Update withPeeringLocation(String peeringLocation);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePorts.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePorts.java
new file mode 100644
index 000000000000..4ffdbd65e979
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePorts.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.ExpressRoutePortsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRoutePorts.
+ */
+public interface ExpressRoutePorts extends SupportsCreating<ExpressRoutePort.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ExpressRoutePort>, SupportsListingByResourceGroup<ExpressRoutePort>, SupportsListing<ExpressRoutePort>, HasInner<ExpressRoutePortsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsEncapsulation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsEncapsulation.java
new file mode 100644
index 000000000000..a8eab06c46e5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsEncapsulation.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressRoutePortsEncapsulation.
+ */
+public final class ExpressRoutePortsEncapsulation extends ExpandableStringEnum<ExpressRoutePortsEncapsulation> {
+    /** Static value Dot1Q for ExpressRoutePortsEncapsulation. */
+    public static final ExpressRoutePortsEncapsulation DOT1Q = fromString("Dot1Q");
+
+    /** Static value QinQ for ExpressRoutePortsEncapsulation. */
+    public static final ExpressRoutePortsEncapsulation QINQ = fromString("QinQ");
+
+    /**
+     * Creates or finds a ExpressRoutePortsEncapsulation from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ExpressRoutePortsEncapsulation
+     */
+    @JsonCreator
+    public static ExpressRoutePortsEncapsulation fromString(String name) {
+        return fromString(name, ExpressRoutePortsEncapsulation.class);
+    }
+
+    /**
+     * @return known ExpressRoutePortsEncapsulation values
+     */
+    public static Collection<ExpressRoutePortsEncapsulation> values() {
+        return values(ExpressRoutePortsEncapsulation.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocation.java
new file mode 100644
index 000000000000..22f7afe0b317
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocation.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.network.v2020_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.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRoutePortsLocationInner;
+
+/**
+ * Type representing ExpressRoutePortsLocation.
+ */
+public interface ExpressRoutePortsLocation extends HasInner<ExpressRoutePortsLocationInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRoutePortsLocationInner>, HasResourceGroup, HasManager<NetworkManager> {
+    /**
+     * @return the address value.
+     */
+    String address();
+
+    /**
+     * @return the availableBandwidths value.
+     */
+    List<ExpressRoutePortsLocationBandwidths> availableBandwidths();
+
+    /**
+     * @return the contact value.
+     */
+    String contact();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocationBandwidths.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocationBandwidths.java
new file mode 100644
index 000000000000..e8ca1845466e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocationBandwidths.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ExpressRoutePorts Location Bandwidths.
+ * Real-time inventory of available ExpressRoute port bandwidths.
+ */
+public class ExpressRoutePortsLocationBandwidths {
+    /**
+     * Bandwidth descriptive name.
+     */
+    @JsonProperty(value = "offerName", access = JsonProperty.Access.WRITE_ONLY)
+    private String offerName;
+
+    /**
+     * Bandwidth value in Gbps.
+     */
+    @JsonProperty(value = "valueInGbps", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer valueInGbps;
+
+    /**
+     * Get bandwidth descriptive name.
+     *
+     * @return the offerName value
+     */
+    public String offerName() {
+        return this.offerName;
+    }
+
+    /**
+     * Get bandwidth value in Gbps.
+     *
+     * @return the valueInGbps value
+     */
+    public Integer valueInGbps() {
+        return this.valueInGbps;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocations.java
new file mode 100644
index 000000000000..fc1151174f28
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRoutePortsLocations.java
@@ -0,0 +1,29 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsListing;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRoutePortsLocationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRoutePortsLocations.
+ */
+public interface ExpressRoutePortsLocations extends SupportsListing<ExpressRoutePortsLocation>, HasInner<ExpressRoutePortsLocationsInner> {
+    /**
+     * Retrieves a single ExpressRoutePort peering location, including the list of available bandwidths available at said peering location.
+     *
+     * @param locationName Name of the requested ExpressRoutePort peering location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExpressRoutePortsLocation> getAsync(String locationName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProvider.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProvider.java
new file mode 100644
index 000000000000..e6faf4f9ede4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProvider.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.network.v2020_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.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteServiceProviderInner;
+
+/**
+ * Type representing ExpressRouteServiceProvider.
+ */
+public interface ExpressRouteServiceProvider extends HasInner<ExpressRouteServiceProviderInner>, Resource, GroupableResourceCore<NetworkManager, ExpressRouteServiceProviderInner>, HasResourceGroup, HasManager<NetworkManager> {
+    /**
+     * @return the bandwidthsOffered value.
+     */
+    List<ExpressRouteServiceProviderBandwidthsOffered> bandwidthsOffered();
+
+    /**
+     * @return the peeringLocations value.
+     */
+    List<String> peeringLocations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviderBandwidthsOffered.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviderBandwidthsOffered.java
new file mode 100644
index 000000000000..43b99480d7a4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviderBandwidthsOffered.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains bandwidths offered in ExpressRouteServiceProvider resources.
+ */
+public class ExpressRouteServiceProviderBandwidthsOffered {
+    /**
+     * The OfferName.
+     */
+    @JsonProperty(value = "offerName")
+    private String offerName;
+
+    /**
+     * The ValueInMbps.
+     */
+    @JsonProperty(value = "valueInMbps")
+    private Integer valueInMbps;
+
+    /**
+     * Get the OfferName.
+     *
+     * @return the offerName value
+     */
+    public String offerName() {
+        return this.offerName;
+    }
+
+    /**
+     * Set the OfferName.
+     *
+     * @param offerName the offerName value to set
+     * @return the ExpressRouteServiceProviderBandwidthsOffered object itself.
+     */
+    public ExpressRouteServiceProviderBandwidthsOffered withOfferName(String offerName) {
+        this.offerName = offerName;
+        return this;
+    }
+
+    /**
+     * Get the ValueInMbps.
+     *
+     * @return the valueInMbps value
+     */
+    public Integer valueInMbps() {
+        return this.valueInMbps;
+    }
+
+    /**
+     * Set the ValueInMbps.
+     *
+     * @param valueInMbps the valueInMbps value to set
+     * @return the ExpressRouteServiceProviderBandwidthsOffered object itself.
+     */
+    public ExpressRouteServiceProviderBandwidthsOffered withValueInMbps(Integer valueInMbps) {
+        this.valueInMbps = valueInMbps;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviders.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviders.java
new file mode 100644
index 000000000000..38955daa67fe
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ExpressRouteServiceProviders.java
@@ -0,0 +1,19 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteServiceProvidersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ExpressRouteServiceProviders.
+ */
+public interface ExpressRouteServiceProviders extends SupportsListing<ExpressRouteServiceProvider>, HasInner<ExpressRouteServiceProvidersInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicies.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicies.java
new file mode 100644
index 000000000000..06a68b0d2010
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicies.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.FirewallPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing FirewallPolicies.
+ */
+public interface FirewallPolicies extends SupportsCreating<FirewallPolicy.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<FirewallPolicy>, SupportsListingByResourceGroup<FirewallPolicy>, SupportsListing<FirewallPolicy>, HasInner<FirewallPoliciesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
new file mode 100644
index 000000000000..8c9c70be4b66
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
@@ -0,0 +1,269 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FirewallPolicyInner;
+
+/**
+ * Type representing FirewallPolicy.
+ */
+public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource, GroupableResourceCore<NetworkManager, FirewallPolicyInner>, HasResourceGroup, Refreshable<FirewallPolicy>, Updatable<FirewallPolicy.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the basePolicy value.
+     */
+    SubResource basePolicy();
+
+    /**
+     * @return the childPolicies value.
+     */
+    List<SubResource> childPolicies();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the firewalls value.
+     */
+    List<SubResource> firewalls();
+
+    /**
+     * @return the identity value.
+     */
+    ManagedServiceIdentity identity();
+
+    /**
+     * @return the intrusionSystemMode value.
+     */
+    FirewallPolicyIntrusionSystemMode intrusionSystemMode();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the ruleGroups value.
+     */
+    List<SubResource> ruleGroups();
+
+    /**
+     * @return the threatIntelMode value.
+     */
+    AzureFirewallThreatIntelMode threatIntelMode();
+
+    /**
+     * @return the threatIntelWhitelist value.
+     */
+    FirewallPolicyThreatIntelWhitelist threatIntelWhitelist();
+
+    /**
+     * @return the transportSecurity value.
+     */
+    FirewallPolicyTransportSecurity transportSecurity();
+
+    /**
+     * The entirety of the FirewallPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of FirewallPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a FirewallPolicy definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the FirewallPolicy definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify BasePolicy.
+         */
+        interface WithBasePolicy {
+            /**
+             * Specifies basePolicy.
+             * @param basePolicy The parent firewall policy from which rules are inherited
+             * @return the next definition stage
+             */
+            WithCreate withBasePolicy(SubResource basePolicy);
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the firewall policy
+             * @return the next definition stage
+             */
+            WithCreate withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify IntrusionSystemMode.
+         */
+        interface WithIntrusionSystemMode {
+            /**
+             * Specifies intrusionSystemMode.
+             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
+             * @return the next definition stage
+             */
+            WithCreate withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify ThreatIntelMode.
+         */
+        interface WithThreatIntelMode {
+            /**
+             * Specifies threatIntelMode.
+             * @param threatIntelMode The operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'
+             * @return the next definition stage
+             */
+            WithCreate withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode);
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify ThreatIntelWhitelist.
+         */
+        interface WithThreatIntelWhitelist {
+            /**
+             * Specifies threatIntelWhitelist.
+             * @param threatIntelWhitelist ThreatIntel Whitelist for Firewall Policy
+             * @return the next definition stage
+             */
+            WithCreate withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
+        }
+
+        /**
+         * The stage of the firewallpolicy definition allowing to specify TransportSecurity.
+         */
+        interface WithTransportSecurity {
+            /**
+             * Specifies transportSecurity.
+             * @param transportSecurity TLS Configuration definition
+             * @return the next definition stage
+             */
+            WithCreate withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
+        }
+
+        /**
+         * 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<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithIdentity, DefinitionStages.WithIntrusionSystemMode, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist, DefinitionStages.WithTransportSecurity {
+        }
+    }
+    /**
+     * The template for a FirewallPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithIdentity, UpdateStages.WithIntrusionSystemMode, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist, UpdateStages.WithTransportSecurity {
+    }
+
+    /**
+     * Grouping of FirewallPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the firewallpolicy update allowing to specify BasePolicy.
+         */
+        interface WithBasePolicy {
+            /**
+             * Specifies basePolicy.
+             * @param basePolicy The parent firewall policy from which rules are inherited
+             * @return the next update stage
+             */
+            Update withBasePolicy(SubResource basePolicy);
+        }
+
+        /**
+         * The stage of the firewallpolicy update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the firewall policy
+             * @return the next update stage
+             */
+            Update withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the firewallpolicy update allowing to specify IntrusionSystemMode.
+         */
+        interface WithIntrusionSystemMode {
+            /**
+             * Specifies intrusionSystemMode.
+             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
+             * @return the next update stage
+             */
+            Update withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
+        }
+
+        /**
+         * The stage of the firewallpolicy update allowing to specify ThreatIntelMode.
+         */
+        interface WithThreatIntelMode {
+            /**
+             * Specifies threatIntelMode.
+             * @param threatIntelMode The operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'
+             * @return the next update stage
+             */
+            Update withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode);
+        }
+
+        /**
+         * The stage of the firewallpolicy update allowing to specify ThreatIntelWhitelist.
+         */
+        interface WithThreatIntelWhitelist {
+            /**
+             * Specifies threatIntelWhitelist.
+             * @param threatIntelWhitelist ThreatIntel Whitelist for Firewall Policy
+             * @return the next update stage
+             */
+            Update withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
+        }
+
+        /**
+         * The stage of the firewallpolicy update allowing to specify TransportSecurity.
+         */
+        interface WithTransportSecurity {
+            /**
+             * Specifies transportSecurity.
+             * @param transportSecurity TLS Configuration definition
+             * @return the next update stage
+             */
+            Update withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyCertificateAuthority.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyCertificateAuthority.java
new file mode 100644
index 000000000000..c81e53ca3650
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyCertificateAuthority.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Trusted Root certificates properties for tls.
+ */
+@JsonFlatten
+public class FirewallPolicyCertificateAuthority {
+    /**
+     * Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate'
+     * object stored in KeyVault.
+     */
+    @JsonProperty(value = "properties.keyVaultSecretId")
+    private String keyVaultSecretId;
+
+    /**
+     * Name of the CA certificate.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Get secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @return the keyVaultSecretId value
+     */
+    public String keyVaultSecretId() {
+        return this.keyVaultSecretId;
+    }
+
+    /**
+     * Set secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault.
+     *
+     * @param keyVaultSecretId the keyVaultSecretId value to set
+     * @return the FirewallPolicyCertificateAuthority object itself.
+     */
+    public FirewallPolicyCertificateAuthority withKeyVaultSecretId(String keyVaultSecretId) {
+        this.keyVaultSecretId = keyVaultSecretId;
+        return this;
+    }
+
+    /**
+     * Get name of the CA certificate.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the CA certificate.
+     *
+     * @param name the name value to set
+     * @return the FirewallPolicyCertificateAuthority object itself.
+     */
+    public FirewallPolicyCertificateAuthority withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRule.java
new file mode 100644
index 000000000000..b3ef008bbf18
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRule.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Firewall Policy Filter Rule.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleType", defaultImpl = FirewallPolicyFilterRule.class)
+@JsonTypeName("FirewallPolicyFilterRule")
+public class FirewallPolicyFilterRule extends FirewallPolicyRule {
+    /**
+     * The action type of a Filter rule.
+     */
+    @JsonProperty(value = "action")
+    private FirewallPolicyFilterRuleAction action;
+
+    /**
+     * Collection of rule conditions used by a rule.
+     */
+    @JsonProperty(value = "ruleConditions")
+    private List<FirewallPolicyRuleCondition> ruleConditions;
+
+    /**
+     * Get the action type of a Filter rule.
+     *
+     * @return the action value
+     */
+    public FirewallPolicyFilterRuleAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action type of a Filter rule.
+     *
+     * @param action the action value to set
+     * @return the FirewallPolicyFilterRule object itself.
+     */
+    public FirewallPolicyFilterRule withAction(FirewallPolicyFilterRuleAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get collection of rule conditions used by a rule.
+     *
+     * @return the ruleConditions value
+     */
+    public List<FirewallPolicyRuleCondition> ruleConditions() {
+        return this.ruleConditions;
+    }
+
+    /**
+     * Set collection of rule conditions used by a rule.
+     *
+     * @param ruleConditions the ruleConditions value to set
+     * @return the FirewallPolicyFilterRule object itself.
+     */
+    public FirewallPolicyFilterRule withRuleConditions(List<FirewallPolicyRuleCondition> ruleConditions) {
+        this.ruleConditions = ruleConditions;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleAction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleAction.java
new file mode 100644
index 000000000000..46ff2e619e50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleAction.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the FirewallPolicyFilterRuleAction.
+ */
+public class FirewallPolicyFilterRuleAction {
+    /**
+     * The type of action. Possible values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "type")
+    private FirewallPolicyFilterRuleActionType type;
+
+    /**
+     * Get the type of action. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the type value
+     */
+    public FirewallPolicyFilterRuleActionType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of action. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param type the type value to set
+     * @return the FirewallPolicyFilterRuleAction object itself.
+     */
+    public FirewallPolicyFilterRuleAction withType(FirewallPolicyFilterRuleActionType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleActionType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleActionType.java
new file mode 100644
index 000000000000..042092a5fb3a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyFilterRuleActionType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FirewallPolicyFilterRuleActionType.
+ */
+public final class FirewallPolicyFilterRuleActionType extends ExpandableStringEnum<FirewallPolicyFilterRuleActionType> {
+    /** Static value Allow for FirewallPolicyFilterRuleActionType. */
+    public static final FirewallPolicyFilterRuleActionType ALLOW = fromString("Allow");
+
+    /** Static value Deny for FirewallPolicyFilterRuleActionType. */
+    public static final FirewallPolicyFilterRuleActionType DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a FirewallPolicyFilterRuleActionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FirewallPolicyFilterRuleActionType
+     */
+    @JsonCreator
+    public static FirewallPolicyFilterRuleActionType fromString(String name) {
+        return fromString(name, FirewallPolicyFilterRuleActionType.class);
+    }
+
+    /**
+     * @return known FirewallPolicyFilterRuleActionType values
+     */
+    public static Collection<FirewallPolicyFilterRuleActionType> values() {
+        return values(FirewallPolicyFilterRuleActionType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyIntrusionSystemMode.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyIntrusionSystemMode.java
new file mode 100644
index 000000000000..afd47d2a0c5f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyIntrusionSystemMode.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FirewallPolicyIntrusionSystemMode.
+ */
+public final class FirewallPolicyIntrusionSystemMode extends ExpandableStringEnum<FirewallPolicyIntrusionSystemMode> {
+    /** Static value Enabled for FirewallPolicyIntrusionSystemMode. */
+    public static final FirewallPolicyIntrusionSystemMode ENABLED = fromString("Enabled");
+
+    /** Static value Disabled for FirewallPolicyIntrusionSystemMode. */
+    public static final FirewallPolicyIntrusionSystemMode DISABLED = fromString("Disabled");
+
+    /**
+     * Creates or finds a FirewallPolicyIntrusionSystemMode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FirewallPolicyIntrusionSystemMode
+     */
+    @JsonCreator
+    public static FirewallPolicyIntrusionSystemMode fromString(String name) {
+        return fromString(name, FirewallPolicyIntrusionSystemMode.class);
+    }
+
+    /**
+     * @return known FirewallPolicyIntrusionSystemMode values
+     */
+    public static Collection<FirewallPolicyIntrusionSystemMode> values() {
+        return values(FirewallPolicyIntrusionSystemMode.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRule.java
new file mode 100644
index 000000000000..8d94601505c5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRule.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Firewall Policy NAT Rule.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleType", defaultImpl = FirewallPolicyNatRule.class)
+@JsonTypeName("FirewallPolicyNatRule")
+public class FirewallPolicyNatRule extends FirewallPolicyRule {
+    /**
+     * The action type of a Nat rule.
+     */
+    @JsonProperty(value = "action")
+    private FirewallPolicyNatRuleAction action;
+
+    /**
+     * The translated address for this NAT rule.
+     */
+    @JsonProperty(value = "translatedAddress")
+    private String translatedAddress;
+
+    /**
+     * The translated port for this NAT rule.
+     */
+    @JsonProperty(value = "translatedPort")
+    private String translatedPort;
+
+    /**
+     * The match conditions for incoming traffic.
+     */
+    @JsonProperty(value = "ruleCondition")
+    private FirewallPolicyRuleCondition ruleCondition;
+
+    /**
+     * Get the action type of a Nat rule.
+     *
+     * @return the action value
+     */
+    public FirewallPolicyNatRuleAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action type of a Nat rule.
+     *
+     * @param action the action value to set
+     * @return the FirewallPolicyNatRule object itself.
+     */
+    public FirewallPolicyNatRule withAction(FirewallPolicyNatRuleAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get the translated address for this NAT rule.
+     *
+     * @return the translatedAddress value
+     */
+    public String translatedAddress() {
+        return this.translatedAddress;
+    }
+
+    /**
+     * Set the translated address for this NAT rule.
+     *
+     * @param translatedAddress the translatedAddress value to set
+     * @return the FirewallPolicyNatRule object itself.
+     */
+    public FirewallPolicyNatRule withTranslatedAddress(String translatedAddress) {
+        this.translatedAddress = translatedAddress;
+        return this;
+    }
+
+    /**
+     * Get the translated port for this NAT rule.
+     *
+     * @return the translatedPort value
+     */
+    public String translatedPort() {
+        return this.translatedPort;
+    }
+
+    /**
+     * Set the translated port for this NAT rule.
+     *
+     * @param translatedPort the translatedPort value to set
+     * @return the FirewallPolicyNatRule object itself.
+     */
+    public FirewallPolicyNatRule withTranslatedPort(String translatedPort) {
+        this.translatedPort = translatedPort;
+        return this;
+    }
+
+    /**
+     * Get the match conditions for incoming traffic.
+     *
+     * @return the ruleCondition value
+     */
+    public FirewallPolicyRuleCondition ruleCondition() {
+        return this.ruleCondition;
+    }
+
+    /**
+     * Set the match conditions for incoming traffic.
+     *
+     * @param ruleCondition the ruleCondition value to set
+     * @return the FirewallPolicyNatRule object itself.
+     */
+    public FirewallPolicyNatRule withRuleCondition(FirewallPolicyRuleCondition ruleCondition) {
+        this.ruleCondition = ruleCondition;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleAction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleAction.java
new file mode 100644
index 000000000000..ba3bf0983023
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleAction.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the FirewallPolicyNatRuleAction.
+ */
+public class FirewallPolicyNatRuleAction {
+    /**
+     * The type of action. Possible values include: 'DNAT'.
+     */
+    @JsonProperty(value = "type")
+    private FirewallPolicyNatRuleActionType type;
+
+    /**
+     * Get the type of action. Possible values include: 'DNAT'.
+     *
+     * @return the type value
+     */
+    public FirewallPolicyNatRuleActionType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of action. Possible values include: 'DNAT'.
+     *
+     * @param type the type value to set
+     * @return the FirewallPolicyNatRuleAction object itself.
+     */
+    public FirewallPolicyNatRuleAction withType(FirewallPolicyNatRuleActionType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleActionType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleActionType.java
new file mode 100644
index 000000000000..ed06e0a7b57e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyNatRuleActionType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FirewallPolicyNatRuleActionType.
+ */
+public final class FirewallPolicyNatRuleActionType extends ExpandableStringEnum<FirewallPolicyNatRuleActionType> {
+    /** Static value DNAT for FirewallPolicyNatRuleActionType. */
+    public static final FirewallPolicyNatRuleActionType DNAT = fromString("DNAT");
+
+    /**
+     * Creates or finds a FirewallPolicyNatRuleActionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FirewallPolicyNatRuleActionType
+     */
+    @JsonCreator
+    public static FirewallPolicyNatRuleActionType fromString(String name) {
+        return fromString(name, FirewallPolicyNatRuleActionType.class);
+    }
+
+    /**
+     * @return known FirewallPolicyNatRuleActionType values
+     */
+    public static Collection<FirewallPolicyNatRuleActionType> values() {
+        return values(FirewallPolicyNatRuleActionType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRule.java
new file mode 100644
index 000000000000..2c0feeb639a7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRule.java
@@ -0,0 +1,78 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Properties of the rule.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleType", defaultImpl = FirewallPolicyRule.class)
+@JsonTypeName("FirewallPolicyRule")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "FirewallPolicyNatRule", value = FirewallPolicyNatRule.class),
+    @JsonSubTypes.Type(name = "FirewallPolicyFilterRule", value = FirewallPolicyFilterRule.class)
+})
+public class FirewallPolicyRule {
+    /**
+     * The name of the rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Priority of the Firewall Policy Rule resource.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * Get the name of the rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the rule.
+     *
+     * @param name the name value to set
+     * @return the FirewallPolicyRule object itself.
+     */
+    public FirewallPolicyRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get priority of the Firewall Policy Rule resource.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the Firewall Policy Rule resource.
+     *
+     * @param priority the priority value to set
+     * @return the FirewallPolicyRule object itself.
+     */
+    public FirewallPolicyRule withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleCondition.java
new file mode 100644
index 000000000000..26992ec43f8c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleCondition.java
@@ -0,0 +1,79 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Properties of a rule.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleConditionType", defaultImpl = FirewallPolicyRuleCondition.class)
+@JsonTypeName("FirewallPolicyRuleCondition")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "ApplicationRuleCondition", value = ApplicationRuleCondition.class),
+    @JsonSubTypes.Type(name = "NatRuleCondition", value = NatRuleCondition.class),
+    @JsonSubTypes.Type(name = "NetworkRuleCondition", value = NetworkRuleCondition.class)
+})
+public class FirewallPolicyRuleCondition {
+    /**
+     * Name of the rule condition.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Description of the rule condition.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Get name of the rule condition.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the rule condition.
+     *
+     * @param name the name value to set
+     * @return the FirewallPolicyRuleCondition object itself.
+     */
+    public FirewallPolicyRuleCondition withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get description of the rule condition.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the rule condition.
+     *
+     * @param description the description value to set
+     * @return the FirewallPolicyRuleCondition object itself.
+     */
+    public FirewallPolicyRuleCondition withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocol.java
new file mode 100644
index 000000000000..2c23800cf1c1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocol.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the application rule protocol.
+ */
+public class FirewallPolicyRuleConditionApplicationProtocol {
+    /**
+     * Protocol type. Possible values include: 'Http', 'Https'.
+     */
+    @JsonProperty(value = "protocolType")
+    private FirewallPolicyRuleConditionApplicationProtocolType protocolType;
+
+    /**
+     * Port number for the protocol, cannot be greater than 64000.
+     */
+    @JsonProperty(value = "port")
+    private Integer port;
+
+    /**
+     * Get protocol type. Possible values include: 'Http', 'Https'.
+     *
+     * @return the protocolType value
+     */
+    public FirewallPolicyRuleConditionApplicationProtocolType protocolType() {
+        return this.protocolType;
+    }
+
+    /**
+     * Set protocol type. Possible values include: 'Http', 'Https'.
+     *
+     * @param protocolType the protocolType value to set
+     * @return the FirewallPolicyRuleConditionApplicationProtocol object itself.
+     */
+    public FirewallPolicyRuleConditionApplicationProtocol withProtocolType(FirewallPolicyRuleConditionApplicationProtocolType protocolType) {
+        this.protocolType = protocolType;
+        return this;
+    }
+
+    /**
+     * Get port number for the protocol, cannot be greater than 64000.
+     *
+     * @return the port value
+     */
+    public Integer port() {
+        return this.port;
+    }
+
+    /**
+     * Set port number for the protocol, cannot be greater than 64000.
+     *
+     * @param port the port value to set
+     * @return the FirewallPolicyRuleConditionApplicationProtocol object itself.
+     */
+    public FirewallPolicyRuleConditionApplicationProtocol withPort(Integer port) {
+        this.port = port;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocolType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocolType.java
new file mode 100644
index 000000000000..c0c944930d16
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionApplicationProtocolType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FirewallPolicyRuleConditionApplicationProtocolType.
+ */
+public final class FirewallPolicyRuleConditionApplicationProtocolType extends ExpandableStringEnum<FirewallPolicyRuleConditionApplicationProtocolType> {
+    /** Static value Http for FirewallPolicyRuleConditionApplicationProtocolType. */
+    public static final FirewallPolicyRuleConditionApplicationProtocolType HTTP = fromString("Http");
+
+    /** Static value Https for FirewallPolicyRuleConditionApplicationProtocolType. */
+    public static final FirewallPolicyRuleConditionApplicationProtocolType HTTPS = fromString("Https");
+
+    /**
+     * Creates or finds a FirewallPolicyRuleConditionApplicationProtocolType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FirewallPolicyRuleConditionApplicationProtocolType
+     */
+    @JsonCreator
+    public static FirewallPolicyRuleConditionApplicationProtocolType fromString(String name) {
+        return fromString(name, FirewallPolicyRuleConditionApplicationProtocolType.class);
+    }
+
+    /**
+     * @return known FirewallPolicyRuleConditionApplicationProtocolType values
+     */
+    public static Collection<FirewallPolicyRuleConditionApplicationProtocolType> values() {
+        return values(FirewallPolicyRuleConditionApplicationProtocolType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionNetworkProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionNetworkProtocol.java
new file mode 100644
index 000000000000..ae73b97c13e1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleConditionNetworkProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FirewallPolicyRuleConditionNetworkProtocol.
+ */
+public final class FirewallPolicyRuleConditionNetworkProtocol extends ExpandableStringEnum<FirewallPolicyRuleConditionNetworkProtocol> {
+    /** Static value TCP for FirewallPolicyRuleConditionNetworkProtocol. */
+    public static final FirewallPolicyRuleConditionNetworkProtocol TCP = fromString("TCP");
+
+    /** Static value UDP for FirewallPolicyRuleConditionNetworkProtocol. */
+    public static final FirewallPolicyRuleConditionNetworkProtocol UDP = fromString("UDP");
+
+    /** Static value Any for FirewallPolicyRuleConditionNetworkProtocol. */
+    public static final FirewallPolicyRuleConditionNetworkProtocol ANY = fromString("Any");
+
+    /** Static value ICMP for FirewallPolicyRuleConditionNetworkProtocol. */
+    public static final FirewallPolicyRuleConditionNetworkProtocol ICMP = fromString("ICMP");
+
+    /**
+     * Creates or finds a FirewallPolicyRuleConditionNetworkProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FirewallPolicyRuleConditionNetworkProtocol
+     */
+    @JsonCreator
+    public static FirewallPolicyRuleConditionNetworkProtocol fromString(String name) {
+        return fromString(name, FirewallPolicyRuleConditionNetworkProtocol.class);
+    }
+
+    /**
+     * @return known FirewallPolicyRuleConditionNetworkProtocol values
+     */
+    public static Collection<FirewallPolicyRuleConditionNetworkProtocol> values() {
+        return values(FirewallPolicyRuleConditionNetworkProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroup.java
new file mode 100644
index 000000000000..91ffc712813c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroup.java
@@ -0,0 +1,205 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FirewallPolicyRuleGroupInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing FirewallPolicyRuleGroup.
+ */
+public interface FirewallPolicyRuleGroup extends HasInner<FirewallPolicyRuleGroupInner>, Indexable, Refreshable<FirewallPolicyRuleGroup>, Updatable<FirewallPolicyRuleGroup.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the priority value.
+     */
+    Integer priority();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the rules value.
+     */
+    List<FirewallPolicyRule> rules();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the FirewallPolicyRuleGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithFirewallPolicy, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of FirewallPolicyRuleGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a FirewallPolicyRuleGroup definition.
+         */
+        interface Blank extends WithFirewallPolicy {
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup definition allowing to specify FirewallPolicy.
+         */
+        interface WithFirewallPolicy {
+           /**
+            * Specifies resourceGroupName, firewallPolicyName.
+            * @param resourceGroupName The name of the resource group
+            * @param firewallPolicyName The name of the Firewall Policy
+            * @return the next definition stage
+            */
+            WithCreate withExistingFirewallPolicy(String resourceGroupName, String firewallPolicyName);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup definition allowing to specify Priority.
+         */
+        interface WithPriority {
+            /**
+             * Specifies priority.
+             * @param priority Priority of the Firewall Policy Rule Group resource
+             * @return the next definition stage
+             */
+            WithCreate withPriority(Integer priority);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup definition allowing to specify Rules.
+         */
+        interface WithRules {
+            /**
+             * Specifies rules.
+             * @param rules Group of Firewall Policy rules
+             * @return the next definition stage
+             */
+            WithCreate withRules(List<FirewallPolicyRule> rules);
+        }
+
+        /**
+         * 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<FirewallPolicyRuleGroup>, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithPriority, DefinitionStages.WithRules {
+        }
+    }
+    /**
+     * The template for a FirewallPolicyRuleGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<FirewallPolicyRuleGroup>, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPriority, UpdateStages.WithRules {
+    }
+
+    /**
+     * Grouping of FirewallPolicyRuleGroup update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the firewallpolicyrulegroup update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup update allowing to specify Priority.
+         */
+        interface WithPriority {
+            /**
+             * Specifies priority.
+             * @param priority Priority of the Firewall Policy Rule Group resource
+             * @return the next update stage
+             */
+            Update withPriority(Integer priority);
+        }
+
+        /**
+         * The stage of the firewallpolicyrulegroup update allowing to specify Rules.
+         */
+        interface WithRules {
+            /**
+             * Specifies rules.
+             * @param rules Group of Firewall Policy rules
+             * @return the next update stage
+             */
+            Update withRules(List<FirewallPolicyRule> rules);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroups.java
new file mode 100644
index 000000000000..3506c8073e16
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyRuleGroups.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FirewallPolicyRuleGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing FirewallPolicyRuleGroups.
+ */
+public interface FirewallPolicyRuleGroups extends SupportsCreating<FirewallPolicyRuleGroup.DefinitionStages.Blank>, HasInner<FirewallPolicyRuleGroupsInner> {
+    /**
+     * Gets the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FirewallPolicyRuleGroup> getAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName);
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FirewallPolicyRuleGroup> listAsync(final String resourceGroupName, final String firewallPolicyName);
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyThreatIntelWhitelist.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyThreatIntelWhitelist.java
new file mode 100644
index 000000000000..ba8297091100
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyThreatIntelWhitelist.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ThreatIntel Whitelist for Firewall Policy.
+ */
+public class FirewallPolicyThreatIntelWhitelist {
+    /**
+     * List of IP addresses for the ThreatIntel Whitelist.
+     */
+    @JsonProperty(value = "ipAddresses")
+    private List<String> ipAddresses;
+
+    /**
+     * List of FQDNs for the ThreatIntel Whitelist.
+     */
+    @JsonProperty(value = "fqdns")
+    private List<String> fqdns;
+
+    /**
+     * Get list of IP addresses for the ThreatIntel Whitelist.
+     *
+     * @return the ipAddresses value
+     */
+    public List<String> ipAddresses() {
+        return this.ipAddresses;
+    }
+
+    /**
+     * Set list of IP addresses for the ThreatIntel Whitelist.
+     *
+     * @param ipAddresses the ipAddresses value to set
+     * @return the FirewallPolicyThreatIntelWhitelist object itself.
+     */
+    public FirewallPolicyThreatIntelWhitelist withIpAddresses(List<String> ipAddresses) {
+        this.ipAddresses = ipAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of FQDNs for the ThreatIntel Whitelist.
+     *
+     * @return the fqdns value
+     */
+    public List<String> fqdns() {
+        return this.fqdns;
+    }
+
+    /**
+     * Set list of FQDNs for the ThreatIntel Whitelist.
+     *
+     * @param fqdns the fqdns value to set
+     * @return the FirewallPolicyThreatIntelWhitelist object itself.
+     */
+    public FirewallPolicyThreatIntelWhitelist withFqdns(List<String> fqdns) {
+        this.fqdns = fqdns;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTransportSecurity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTransportSecurity.java
new file mode 100644
index 000000000000..f26fe2532897
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTransportSecurity.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Configuration needed to perform TLS termination &amp; initiation.
+ */
+public class FirewallPolicyTransportSecurity {
+    /**
+     * The CA used for intermediate CA generation.
+     */
+    @JsonProperty(value = "certificateAuthority")
+    private FirewallPolicyCertificateAuthority certificateAuthority;
+
+    /**
+     * List of domains which are excluded from TLS termination.
+     */
+    @JsonProperty(value = "excludedDomains")
+    private List<String> excludedDomains;
+
+    /**
+     * Certificates which are to be trusted by the firewall.
+     */
+    @JsonProperty(value = "trustedRootCertificates")
+    private List<FirewallPolicyTrustedRootCertificate> trustedRootCertificates;
+
+    /**
+     * Get the CA used for intermediate CA generation.
+     *
+     * @return the certificateAuthority value
+     */
+    public FirewallPolicyCertificateAuthority certificateAuthority() {
+        return this.certificateAuthority;
+    }
+
+    /**
+     * Set the CA used for intermediate CA generation.
+     *
+     * @param certificateAuthority the certificateAuthority value to set
+     * @return the FirewallPolicyTransportSecurity object itself.
+     */
+    public FirewallPolicyTransportSecurity withCertificateAuthority(FirewallPolicyCertificateAuthority certificateAuthority) {
+        this.certificateAuthority = certificateAuthority;
+        return this;
+    }
+
+    /**
+     * Get list of domains which are excluded from TLS termination.
+     *
+     * @return the excludedDomains value
+     */
+    public List<String> excludedDomains() {
+        return this.excludedDomains;
+    }
+
+    /**
+     * Set list of domains which are excluded from TLS termination.
+     *
+     * @param excludedDomains the excludedDomains value to set
+     * @return the FirewallPolicyTransportSecurity object itself.
+     */
+    public FirewallPolicyTransportSecurity withExcludedDomains(List<String> excludedDomains) {
+        this.excludedDomains = excludedDomains;
+        return this;
+    }
+
+    /**
+     * Get certificates which are to be trusted by the firewall.
+     *
+     * @return the trustedRootCertificates value
+     */
+    public List<FirewallPolicyTrustedRootCertificate> trustedRootCertificates() {
+        return this.trustedRootCertificates;
+    }
+
+    /**
+     * Set certificates which are to be trusted by the firewall.
+     *
+     * @param trustedRootCertificates the trustedRootCertificates value to set
+     * @return the FirewallPolicyTransportSecurity object itself.
+     */
+    public FirewallPolicyTransportSecurity withTrustedRootCertificates(List<FirewallPolicyTrustedRootCertificate> trustedRootCertificates) {
+        this.trustedRootCertificates = trustedRootCertificates;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTrustedRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTrustedRootCertificate.java
new file mode 100644
index 000000000000..f8b30a90c11b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicyTrustedRootCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Trusted Root certificates of a firewall policy.
+ */
+@JsonFlatten
+public class FirewallPolicyTrustedRootCertificate {
+    /**
+     * Secret Id of (base-64 encoded unencrypted pfx) the public certificate
+     * data stored in KeyVault.
+     */
+    @JsonProperty(value = "properties.keyVaultSecretId")
+    private String keyVaultSecretId;
+
+    /**
+     * Name of the trusted root certificate that is unique within a firewall
+     * policy.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Get secret Id of (base-64 encoded unencrypted pfx) the public certificate data stored in KeyVault.
+     *
+     * @return the keyVaultSecretId value
+     */
+    public String keyVaultSecretId() {
+        return this.keyVaultSecretId;
+    }
+
+    /**
+     * Set secret Id of (base-64 encoded unencrypted pfx) the public certificate data stored in KeyVault.
+     *
+     * @param keyVaultSecretId the keyVaultSecretId value to set
+     * @return the FirewallPolicyTrustedRootCertificate object itself.
+     */
+    public FirewallPolicyTrustedRootCertificate withKeyVaultSecretId(String keyVaultSecretId) {
+        this.keyVaultSecretId = keyVaultSecretId;
+        return this;
+    }
+
+    /**
+     * Get name of the trusted root certificate that is unique within a firewall policy.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the trusted root certificate that is unique within a firewall policy.
+     *
+     * @param name the name value to set
+     * @return the FirewallPolicyTrustedRootCertificate object itself.
+     */
+    public FirewallPolicyTrustedRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLog.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLog.java
new file mode 100644
index 000000000000..ef686138e91c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLog.java
@@ -0,0 +1,336 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FlowLogInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.Map;
+
+/**
+ * Type representing FlowLog.
+ */
+public interface FlowLog extends HasInner<FlowLogInner>, Indexable, Refreshable<FlowLog>, Updatable<FlowLog.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the enabled value.
+     */
+    Boolean enabled();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the flowAnalyticsConfiguration value.
+     */
+    TrafficAnalyticsProperties flowAnalyticsConfiguration();
+
+    /**
+     * @return the format value.
+     */
+    FlowLogFormatParameters format();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the retentionPolicy value.
+     */
+    RetentionPolicyParameters retentionPolicy();
+
+    /**
+     * @return the storageId value.
+     */
+    String storageId();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the targetResourceGuid value.
+     */
+    String targetResourceGuid();
+
+    /**
+     * @return the targetResourceId value.
+     */
+    String targetResourceId();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the FlowLog definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetworkWatcher, DefinitionStages.WithStorageId, DefinitionStages.WithTargetResourceId, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of FlowLog definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a FlowLog definition.
+         */
+        interface Blank extends WithNetworkWatcher {
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify NetworkWatcher.
+         */
+        interface WithNetworkWatcher {
+           /**
+            * Specifies resourceGroupName, networkWatcherName.
+            * @param resourceGroupName The name of the resource group
+            * @param networkWatcherName The name of the network watcher
+            * @return the next definition stage
+            */
+            WithStorageId withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify StorageId.
+         */
+        interface WithStorageId {
+           /**
+            * Specifies storageId.
+            * @param storageId ID of the storage account which is used to store the flow log
+            * @return the next definition stage
+            */
+            WithTargetResourceId withStorageId(String storageId);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify TargetResourceId.
+         */
+        interface WithTargetResourceId {
+           /**
+            * Specifies targetResourceId.
+            * @param targetResourceId ID of network security group to which flow log will be applied
+            * @return the next definition stage
+            */
+            WithCreate withTargetResourceId(String targetResourceId);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify Enabled.
+         */
+        interface WithEnabled {
+            /**
+             * Specifies enabled.
+             * @param enabled Flag to enable/disable flow logging
+             * @return the next definition stage
+             */
+            WithCreate withEnabled(Boolean enabled);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify FlowAnalyticsConfiguration.
+         */
+        interface WithFlowAnalyticsConfiguration {
+            /**
+             * Specifies flowAnalyticsConfiguration.
+             * @param flowAnalyticsConfiguration Parameters that define the configuration of traffic analytics
+             * @return the next definition stage
+             */
+            WithCreate withFlowAnalyticsConfiguration(TrafficAnalyticsProperties flowAnalyticsConfiguration);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify Format.
+         */
+        interface WithFormat {
+            /**
+             * Specifies format.
+             * @param format Parameters that define the flow log format
+             * @return the next definition stage
+             */
+            WithCreate withFormat(FlowLogFormatParameters format);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Resource location
+             * @return the next definition stage
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify RetentionPolicy.
+         */
+        interface WithRetentionPolicy {
+            /**
+             * Specifies retentionPolicy.
+             * @param retentionPolicy Parameters that define the retention policy for flow log
+             * @return the next definition stage
+             */
+            WithCreate withRetentionPolicy(RetentionPolicyParameters retentionPolicy);
+        }
+
+        /**
+         * The stage of the flowlog definition allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             * @param tags Resource tags
+             * @return the next definition stage
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * 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<FlowLog>, DefinitionStages.WithEnabled, DefinitionStages.WithFlowAnalyticsConfiguration, DefinitionStages.WithFormat, DefinitionStages.WithId, DefinitionStages.WithLocation, DefinitionStages.WithRetentionPolicy, DefinitionStages.WithTags {
+        }
+    }
+    /**
+     * The template for a FlowLog update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<FlowLog>, UpdateStages.WithEnabled, UpdateStages.WithFlowAnalyticsConfiguration, UpdateStages.WithFormat, UpdateStages.WithId, UpdateStages.WithLocation, UpdateStages.WithRetentionPolicy, UpdateStages.WithTags {
+    }
+
+    /**
+     * Grouping of FlowLog update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the flowlog update allowing to specify Enabled.
+         */
+        interface WithEnabled {
+            /**
+             * Specifies enabled.
+             * @param enabled Flag to enable/disable flow logging
+             * @return the next update stage
+             */
+            Update withEnabled(Boolean enabled);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify FlowAnalyticsConfiguration.
+         */
+        interface WithFlowAnalyticsConfiguration {
+            /**
+             * Specifies flowAnalyticsConfiguration.
+             * @param flowAnalyticsConfiguration Parameters that define the configuration of traffic analytics
+             * @return the next update stage
+             */
+            Update withFlowAnalyticsConfiguration(TrafficAnalyticsProperties flowAnalyticsConfiguration);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify Format.
+         */
+        interface WithFormat {
+            /**
+             * Specifies format.
+             * @param format Parameters that define the flow log format
+             * @return the next update stage
+             */
+            Update withFormat(FlowLogFormatParameters format);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Resource location
+             * @return the next update stage
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify RetentionPolicy.
+         */
+        interface WithRetentionPolicy {
+            /**
+             * Specifies retentionPolicy.
+             * @param retentionPolicy Parameters that define the retention policy for flow log
+             * @return the next update stage
+             */
+            Update withRetentionPolicy(RetentionPolicyParameters retentionPolicy);
+        }
+
+        /**
+         * The stage of the flowlog update allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             * @param tags Resource tags
+             * @return the next update stage
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatParameters.java
new file mode 100644
index 000000000000..5c332099eb64
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the flow log format.
+ */
+public class FlowLogFormatParameters {
+    /**
+     * The file type of flow log. Possible values include: 'JSON'.
+     */
+    @JsonProperty(value = "type")
+    private FlowLogFormatType type;
+
+    /**
+     * The version (revision) of the flow log.
+     */
+    @JsonProperty(value = "version")
+    private Integer version;
+
+    /**
+     * Get the file type of flow log. Possible values include: 'JSON'.
+     *
+     * @return the type value
+     */
+    public FlowLogFormatType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the file type of flow log. Possible values include: 'JSON'.
+     *
+     * @param type the type value to set
+     * @return the FlowLogFormatParameters object itself.
+     */
+    public FlowLogFormatParameters withType(FlowLogFormatType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the version (revision) of the flow log.
+     *
+     * @return the version value
+     */
+    public Integer version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version (revision) of the flow log.
+     *
+     * @param version the version value to set
+     * @return the FlowLogFormatParameters object itself.
+     */
+    public FlowLogFormatParameters withVersion(Integer version) {
+        this.version = version;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatType.java
new file mode 100644
index 000000000000..52da5b9c56db
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogFormatType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for FlowLogFormatType.
+ */
+public final class FlowLogFormatType extends ExpandableStringEnum<FlowLogFormatType> {
+    /** Static value JSON for FlowLogFormatType. */
+    public static final FlowLogFormatType JSON = fromString("JSON");
+
+    /**
+     * Creates or finds a FlowLogFormatType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding FlowLogFormatType
+     */
+    @JsonCreator
+    public static FlowLogFormatType fromString(String name) {
+        return fromString(name, FlowLogFormatType.class);
+    }
+
+    /**
+     * @return known FlowLogFormatType values
+     */
+    public static Collection<FlowLogFormatType> values() {
+        return values(FlowLogFormatType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogInformation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogInformation.java
new file mode 100644
index 000000000000..71e8a1704e42
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogInformation.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FlowLogInformationInner;
+
+/**
+ * Type representing FlowLogInformation.
+ */
+public interface FlowLogInformation extends HasInner<FlowLogInformationInner>, HasManager<NetworkManager> {
+    /**
+     * @return the enabled value.
+     */
+    boolean enabled();
+
+    /**
+     * @return the flowAnalyticsConfiguration value.
+     */
+    TrafficAnalyticsProperties flowAnalyticsConfiguration();
+
+    /**
+     * @return the format value.
+     */
+    FlowLogFormatParameters format();
+
+    /**
+     * @return the retentionPolicy value.
+     */
+    RetentionPolicyParameters retentionPolicy();
+
+    /**
+     * @return the storageId value.
+     */
+    String storageId();
+
+    /**
+     * @return the targetResourceId value.
+     */
+    String targetResourceId();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogStatusParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogStatusParameters.java
new file mode 100644
index 000000000000..881f45a9c4de
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogStatusParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define a resource to query flow log and traffic analytics
+ * (optional) status.
+ */
+public class FlowLogStatusParameters {
+    /**
+     * The target resource where getting the flow log and traffic analytics
+     * (optional) status.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * Get the target resource where getting the flow log and traffic analytics (optional) status.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the target resource where getting the flow log and traffic analytics (optional) status.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the FlowLogStatusParameters object itself.
+     */
+    public FlowLogStatusParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogs.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogs.java
new file mode 100644
index 000000000000..184edb92d592
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FlowLogs.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FlowLogsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing FlowLogs.
+ */
+public interface FlowLogs extends SupportsCreating<FlowLog.DefinitionStages.Blank>, HasInner<FlowLogsInner> {
+    /**
+     * Gets a flow log resource by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FlowLog> getAsync(String resourceGroupName, String networkWatcherName, String flowLogName);
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FlowLog> listAsync(final String resourceGroupName, final String networkWatcherName);
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FrontendIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FrontendIPConfiguration.java
new file mode 100644
index 000000000000..0495f1bd0575
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FrontendIPConfiguration.java
@@ -0,0 +1,104 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FrontendIPConfigurationInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing FrontendIPConfiguration.
+ */
+public interface FrontendIPConfiguration extends HasInner<FrontendIPConfigurationInner>, Indexable, Refreshable<FrontendIPConfiguration>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the inboundNatPools value.
+     */
+    List<SubResource> inboundNatPools();
+
+    /**
+     * @return the inboundNatRules value.
+     */
+    List<SubResource> inboundNatRules();
+
+    /**
+     * @return the loadBalancingRules value.
+     */
+    List<SubResource> loadBalancingRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the outboundRules value.
+     */
+    List<SubResource> outboundRules();
+
+    /**
+     * @return the privateIPAddress value.
+     */
+    String privateIPAddress();
+
+    /**
+     * @return the privateIPAddressVersion value.
+     */
+    IPVersion privateIPAddressVersion();
+
+    /**
+     * @return the privateIPAllocationMethod value.
+     */
+    IPAllocationMethod privateIPAllocationMethod();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddress value.
+     */
+    PublicIPAddress publicIPAddress();
+
+    /**
+     * @return the publicIPPrefix value.
+     */
+    SubResource publicIPPrefix();
+
+    /**
+     * @return the subnet value.
+     */
+    Subnet subnet();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRoute.java
new file mode 100644
index 000000000000..abc68f472cb2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRoute.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Gateway routing details.
+ */
+public class GatewayRoute {
+    /**
+     * The gateway's local address.
+     */
+    @JsonProperty(value = "localAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String localAddress;
+
+    /**
+     * The route's network prefix.
+     */
+    @JsonProperty(value = "network", access = JsonProperty.Access.WRITE_ONLY)
+    private String network;
+
+    /**
+     * The route's next hop.
+     */
+    @JsonProperty(value = "nextHop", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextHop;
+
+    /**
+     * The peer this route was learned from.
+     */
+    @JsonProperty(value = "sourcePeer", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourcePeer;
+
+    /**
+     * The source this route was learned from.
+     */
+    @JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY)
+    private String origin;
+
+    /**
+     * The route's AS path sequence.
+     */
+    @JsonProperty(value = "asPath", access = JsonProperty.Access.WRITE_ONLY)
+    private String asPath;
+
+    /**
+     * The route's weight.
+     */
+    @JsonProperty(value = "weight", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer weight;
+
+    /**
+     * Get the gateway's local address.
+     *
+     * @return the localAddress value
+     */
+    public String localAddress() {
+        return this.localAddress;
+    }
+
+    /**
+     * Get the route's network prefix.
+     *
+     * @return the network value
+     */
+    public String network() {
+        return this.network;
+    }
+
+    /**
+     * Get the route's next hop.
+     *
+     * @return the nextHop value
+     */
+    public String nextHop() {
+        return this.nextHop;
+    }
+
+    /**
+     * Get the peer this route was learned from.
+     *
+     * @return the sourcePeer value
+     */
+    public String sourcePeer() {
+        return this.sourcePeer;
+    }
+
+    /**
+     * Get the source this route was learned from.
+     *
+     * @return the origin value
+     */
+    public String origin() {
+        return this.origin;
+    }
+
+    /**
+     * Get the route's AS path sequence.
+     *
+     * @return the asPath value
+     */
+    public String asPath() {
+        return this.asPath;
+    }
+
+    /**
+     * Get the route's weight.
+     *
+     * @return the weight value
+     */
+    public Integer weight() {
+        return this.weight;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRouteListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRouteListResult.java
new file mode 100644
index 000000000000..23af2018c04e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GatewayRouteListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.GatewayRouteListResultInner;
+import java.util.List;
+
+/**
+ * Type representing GatewayRouteListResult.
+ */
+public interface GatewayRouteListResult extends HasInner<GatewayRouteListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the value value.
+     */
+    List<GatewayRoute> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GetVpnSitesConfigurationRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GetVpnSitesConfigurationRequest.java
new file mode 100644
index 000000000000..f532996c31b4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/GetVpnSitesConfigurationRequest.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of Vpn-Sites.
+ */
+public class GetVpnSitesConfigurationRequest {
+    /**
+     * List of resource-ids of the vpn-sites for which config is to be
+     * downloaded.
+     */
+    @JsonProperty(value = "vpnSites")
+    private List<String> vpnSites;
+
+    /**
+     * The sas-url to download the configurations for vpn-sites.
+     */
+    @JsonProperty(value = "outputBlobSasUrl", required = true)
+    private String outputBlobSasUrl;
+
+    /**
+     * Get list of resource-ids of the vpn-sites for which config is to be downloaded.
+     *
+     * @return the vpnSites value
+     */
+    public List<String> vpnSites() {
+        return this.vpnSites;
+    }
+
+    /**
+     * Set list of resource-ids of the vpn-sites for which config is to be downloaded.
+     *
+     * @param vpnSites the vpnSites value to set
+     * @return the GetVpnSitesConfigurationRequest object itself.
+     */
+    public GetVpnSitesConfigurationRequest withVpnSites(List<String> vpnSites) {
+        this.vpnSites = vpnSites;
+        return this;
+    }
+
+    /**
+     * Get the sas-url to download the configurations for vpn-sites.
+     *
+     * @return the outputBlobSasUrl value
+     */
+    public String outputBlobSasUrl() {
+        return this.outputBlobSasUrl;
+    }
+
+    /**
+     * Set the sas-url to download the configurations for vpn-sites.
+     *
+     * @param outputBlobSasUrl the outputBlobSasUrl value to set
+     * @return the GetVpnSitesConfigurationRequest object itself.
+     */
+    public GetVpnSitesConfigurationRequest withOutputBlobSasUrl(String outputBlobSasUrl) {
+        this.outputBlobSasUrl = outputBlobSasUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfiguration.java
new file mode 100644
index 000000000000..4067765acf38
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfiguration.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * HTTP configuration of the connectivity check.
+ */
+public class HTTPConfiguration {
+    /**
+     * HTTP method. Possible values include: 'Get'.
+     */
+    @JsonProperty(value = "method")
+    private HTTPMethod method;
+
+    /**
+     * List of HTTP headers.
+     */
+    @JsonProperty(value = "headers")
+    private List<HTTPHeader> headers;
+
+    /**
+     * Valid status codes.
+     */
+    @JsonProperty(value = "validStatusCodes")
+    private List<Integer> validStatusCodes;
+
+    /**
+     * Get hTTP method. Possible values include: 'Get'.
+     *
+     * @return the method value
+     */
+    public HTTPMethod method() {
+        return this.method;
+    }
+
+    /**
+     * Set hTTP method. Possible values include: 'Get'.
+     *
+     * @param method the method value to set
+     * @return the HTTPConfiguration object itself.
+     */
+    public HTTPConfiguration withMethod(HTTPMethod method) {
+        this.method = method;
+        return this;
+    }
+
+    /**
+     * Get list of HTTP headers.
+     *
+     * @return the headers value
+     */
+    public List<HTTPHeader> headers() {
+        return this.headers;
+    }
+
+    /**
+     * Set list of HTTP headers.
+     *
+     * @param headers the headers value to set
+     * @return the HTTPConfiguration object itself.
+     */
+    public HTTPConfiguration withHeaders(List<HTTPHeader> headers) {
+        this.headers = headers;
+        return this;
+    }
+
+    /**
+     * Get valid status codes.
+     *
+     * @return the validStatusCodes value
+     */
+    public List<Integer> validStatusCodes() {
+        return this.validStatusCodes;
+    }
+
+    /**
+     * Set valid status codes.
+     *
+     * @param validStatusCodes the validStatusCodes value to set
+     * @return the HTTPConfiguration object itself.
+     */
+    public HTTPConfiguration withValidStatusCodes(List<Integer> validStatusCodes) {
+        this.validStatusCodes = validStatusCodes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfigurationMethod.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfigurationMethod.java
new file mode 100644
index 000000000000..83ecb4330777
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPConfigurationMethod.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for HTTPConfigurationMethod.
+ */
+public final class HTTPConfigurationMethod extends ExpandableStringEnum<HTTPConfigurationMethod> {
+    /** Static value Get for HTTPConfigurationMethod. */
+    public static final HTTPConfigurationMethod GET = fromString("Get");
+
+    /** Static value Post for HTTPConfigurationMethod. */
+    public static final HTTPConfigurationMethod POST = fromString("Post");
+
+    /**
+     * Creates or finds a HTTPConfigurationMethod from its string representation.
+     * @param name a name to look for
+     * @return the corresponding HTTPConfigurationMethod
+     */
+    @JsonCreator
+    public static HTTPConfigurationMethod fromString(String name) {
+        return fromString(name, HTTPConfigurationMethod.class);
+    }
+
+    /**
+     * @return known HTTPConfigurationMethod values
+     */
+    public static Collection<HTTPConfigurationMethod> values() {
+        return values(HTTPConfigurationMethod.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPHeader.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPHeader.java
new file mode 100644
index 000000000000..d7a8034044df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPHeader.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The HTTP header.
+ */
+public class HTTPHeader {
+    /**
+     * The name in HTTP header.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The value in HTTP header.
+     */
+    @JsonProperty(value = "value")
+    private String value;
+
+    /**
+     * Get the name in HTTP header.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name in HTTP header.
+     *
+     * @param name the name value to set
+     * @return the HTTPHeader object itself.
+     */
+    public HTTPHeader withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the value in HTTP header.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value in HTTP header.
+     *
+     * @param value the value value to set
+     * @return the HTTPHeader object itself.
+     */
+    public HTTPHeader withValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPMethod.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPMethod.java
new file mode 100644
index 000000000000..d70eaebc100c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HTTPMethod.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for HTTPMethod.
+ */
+public final class HTTPMethod extends ExpandableStringEnum<HTTPMethod> {
+    /** Static value Get for HTTPMethod. */
+    public static final HTTPMethod GET = fromString("Get");
+
+    /**
+     * Creates or finds a HTTPMethod from its string representation.
+     * @param name a name to look for
+     * @return the corresponding HTTPMethod
+     */
+    @JsonCreator
+    public static HTTPMethod fromString(String name) {
+        return fromString(name, HTTPMethod.class);
+    }
+
+    /**
+     * @return known HTTPMethod values
+     */
+    public static Collection<HTTPMethod> values() {
+        return values(HTTPMethod.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubIPAddresses.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubIPAddresses.java
new file mode 100644
index 000000000000..82f2cbcab803
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubIPAddresses.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * IP addresses associated with azure firewall.
+ */
+public class HubIPAddresses {
+    /**
+     * List of Public IP addresses associated with azure firewall.
+     */
+    @JsonProperty(value = "publicIPAddresses")
+    private List<AzureFirewallPublicIPAddress> publicIPAddresses;
+
+    /**
+     * Private IP Address associated with azure firewall.
+     */
+    @JsonProperty(value = "privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * Get list of Public IP addresses associated with azure firewall.
+     *
+     * @return the publicIPAddresses value
+     */
+    public List<AzureFirewallPublicIPAddress> publicIPAddresses() {
+        return this.publicIPAddresses;
+    }
+
+    /**
+     * Set list of Public IP addresses associated with azure firewall.
+     *
+     * @param publicIPAddresses the publicIPAddresses value to set
+     * @return the HubIPAddresses object itself.
+     */
+    public HubIPAddresses withPublicIPAddresses(List<AzureFirewallPublicIPAddress> publicIPAddresses) {
+        this.publicIPAddresses = publicIPAddresses;
+        return this;
+    }
+
+    /**
+     * Get private IP Address associated with azure firewall.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set private IP Address associated with azure firewall.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the HubIPAddresses object itself.
+     */
+    public HubIPAddresses withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRoute.java
new file mode 100644
index 000000000000..6826baff81cb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRoute.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * RouteTable route.
+ */
+public class HubRoute {
+    /**
+     * The name of the Route that is unique within a RouteTable. This name can
+     * be used to access this route.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * The type of destinations (eg: CIDR, ResourceId, Service).
+     */
+    @JsonProperty(value = "destinationType", required = true)
+    private String destinationType;
+
+    /**
+     * List of all destinations.
+     */
+    @JsonProperty(value = "destinations", required = true)
+    private List<String> destinations;
+
+    /**
+     * The type of next hop (eg: ResourceId).
+     */
+    @JsonProperty(value = "nextHopType", required = true)
+    private String nextHopType;
+
+    /**
+     * NextHop resource ID.
+     */
+    @JsonProperty(value = "nextHop", required = true)
+    private String nextHop;
+
+    /**
+     * Get the name of the Route that is unique within a RouteTable. This name can be used to access this route.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the Route that is unique within a RouteTable. This name can be used to access this route.
+     *
+     * @param name the name value to set
+     * @return the HubRoute object itself.
+     */
+    public HubRoute withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the type of destinations (eg: CIDR, ResourceId, Service).
+     *
+     * @return the destinationType value
+     */
+    public String destinationType() {
+        return this.destinationType;
+    }
+
+    /**
+     * Set the type of destinations (eg: CIDR, ResourceId, Service).
+     *
+     * @param destinationType the destinationType value to set
+     * @return the HubRoute object itself.
+     */
+    public HubRoute withDestinationType(String destinationType) {
+        this.destinationType = destinationType;
+        return this;
+    }
+
+    /**
+     * Get list of all destinations.
+     *
+     * @return the destinations value
+     */
+    public List<String> destinations() {
+        return this.destinations;
+    }
+
+    /**
+     * Set list of all destinations.
+     *
+     * @param destinations the destinations value to set
+     * @return the HubRoute object itself.
+     */
+    public HubRoute withDestinations(List<String> destinations) {
+        this.destinations = destinations;
+        return this;
+    }
+
+    /**
+     * Get the type of next hop (eg: ResourceId).
+     *
+     * @return the nextHopType value
+     */
+    public String nextHopType() {
+        return this.nextHopType;
+    }
+
+    /**
+     * Set the type of next hop (eg: ResourceId).
+     *
+     * @param nextHopType the nextHopType value to set
+     * @return the HubRoute object itself.
+     */
+    public HubRoute withNextHopType(String nextHopType) {
+        this.nextHopType = nextHopType;
+        return this;
+    }
+
+    /**
+     * Get nextHop resource ID.
+     *
+     * @return the nextHop value
+     */
+    public String nextHop() {
+        return this.nextHop;
+    }
+
+    /**
+     * Set nextHop resource ID.
+     *
+     * @param nextHop the nextHop value to set
+     * @return the HubRoute object itself.
+     */
+    public HubRoute withNextHop(String nextHop) {
+        this.nextHop = nextHop;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
new file mode 100644
index 000000000000..84c28b8f4b41
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
@@ -0,0 +1,216 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.HubRouteTableInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing HubRouteTable.
+ */
+public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable, Refreshable<HubRouteTable>, Updatable<HubRouteTable.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the associatedConnections value.
+     */
+    List<SubResource> associatedConnections();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the labels value.
+     */
+    List<String> labels();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the propagatingConnections value.
+     */
+    List<SubResource> propagatingConnections();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routes value.
+     */
+    List<HubRoute> routes();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the HubRouteTable definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVirtualHub, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of HubRouteTable definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a HubRouteTable definition.
+         */
+        interface Blank extends WithVirtualHub {
+        }
+
+        /**
+         * The stage of the hubroutetable definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+           /**
+            * Specifies resourceGroupName, virtualHubName.
+            * @param resourceGroupName The resource group name of the VirtualHub
+            * @param virtualHubName The name of the VirtualHub
+            * @return the next definition stage
+            */
+            WithCreate withExistingVirtualHub(String resourceGroupName, String virtualHubName);
+        }
+
+        /**
+         * The stage of the hubroutetable definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the hubroutetable definition allowing to specify Labels.
+         */
+        interface WithLabels {
+            /**
+             * Specifies labels.
+             * @param labels List of labels associated with this route table
+             * @return the next definition stage
+             */
+            WithCreate withLabels(List<String> labels);
+        }
+
+        /**
+         * The stage of the hubroutetable definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the hubroutetable definition allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes List of all routes
+             * @return the next definition stage
+             */
+            WithCreate withRoutes(List<HubRoute> routes);
+        }
+
+        /**
+         * 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<HubRouteTable>, DefinitionStages.WithId, DefinitionStages.WithLabels, DefinitionStages.WithName, DefinitionStages.WithRoutes {
+        }
+    }
+    /**
+     * The template for a HubRouteTable update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<HubRouteTable>, UpdateStages.WithId, UpdateStages.WithLabels, UpdateStages.WithName, UpdateStages.WithRoutes {
+    }
+
+    /**
+     * Grouping of HubRouteTable update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the hubroutetable update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the hubroutetable update allowing to specify Labels.
+         */
+        interface WithLabels {
+            /**
+             * Specifies labels.
+             * @param labels List of labels associated with this route table
+             * @return the next update stage
+             */
+            Update withLabels(List<String> labels);
+        }
+
+        /**
+         * The stage of the hubroutetable update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the hubroutetable update allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes List of all routes
+             * @return the next update stage
+             */
+            Update withRoutes(List<HubRoute> routes);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTables.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTables.java
new file mode 100644
index 000000000000..2bd11736295d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTables.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.HubRouteTablesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing HubRouteTables.
+ */
+public interface HubRouteTables extends SupportsCreating<HubRouteTable.DefinitionStages.Blank>, HasInner<HubRouteTablesInner> {
+    /**
+     * Retrieves the details of a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<HubRouteTable> getAsync(String resourceGroupName, String virtualHubName, String routeTableName);
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<HubRouteTable> listAsync(final String resourceGroupName, final String virtualHubName);
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnection.java
new file mode 100644
index 000000000000..9da2eef055eb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnection.java
@@ -0,0 +1,68 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.HubVirtualNetworkConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing HubVirtualNetworkConnection.
+ */
+public interface HubVirtualNetworkConnection extends HasInner<HubVirtualNetworkConnectionInner>, Indexable, Refreshable<HubVirtualNetworkConnection>, HasManager<NetworkManager> {
+    /**
+     * @return the allowHubToRemoteVnetTransit value.
+     */
+    Boolean allowHubToRemoteVnetTransit();
+
+    /**
+     * @return the allowRemoteVnetToUseHubVnetGateways value.
+     */
+    Boolean allowRemoteVnetToUseHubVnetGateways();
+
+    /**
+     * @return the enableInternetSecurity value.
+     */
+    Boolean enableInternetSecurity();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the remoteVirtualNetwork value.
+     */
+    SubResource remoteVirtualNetwork();
+
+    /**
+     * @return the routingConfiguration value.
+     */
+    RoutingConfiguration routingConfiguration();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnectionStatus.java
new file mode 100644
index 000000000000..e3e7869946dc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for HubVirtualNetworkConnectionStatus.
+ */
+public final class HubVirtualNetworkConnectionStatus extends ExpandableStringEnum<HubVirtualNetworkConnectionStatus> {
+    /** Static value Unknown for HubVirtualNetworkConnectionStatus. */
+    public static final HubVirtualNetworkConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Connecting for HubVirtualNetworkConnectionStatus. */
+    public static final HubVirtualNetworkConnectionStatus CONNECTING = fromString("Connecting");
+
+    /** Static value Connected for HubVirtualNetworkConnectionStatus. */
+    public static final HubVirtualNetworkConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value NotConnected for HubVirtualNetworkConnectionStatus. */
+    public static final HubVirtualNetworkConnectionStatus NOT_CONNECTED = fromString("NotConnected");
+
+    /**
+     * Creates or finds a HubVirtualNetworkConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding HubVirtualNetworkConnectionStatus
+     */
+    @JsonCreator
+    public static HubVirtualNetworkConnectionStatus fromString(String name) {
+        return fromString(name, HubVirtualNetworkConnectionStatus.class);
+    }
+
+    /**
+     * @return known HubVirtualNetworkConnectionStatus values
+     */
+    public static Collection<HubVirtualNetworkConnectionStatus> values() {
+        return values(HubVirtualNetworkConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnections.java
new file mode 100644
index 000000000000..d0f9d6e21a36
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubVirtualNetworkConnections.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.HubVirtualNetworkConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing HubVirtualNetworkConnections.
+ */
+public interface HubVirtualNetworkConnections extends HasInner<HubVirtualNetworkConnectionsInner> {
+    /**
+     * Retrieves the details of a HubVirtualNetworkConnection.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<HubVirtualNetworkConnection> getAsync(String resourceGroupName, String virtualHubName, String connectionName);
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<HubVirtualNetworkConnection> listAsync(final String resourceGroupName, final String virtualHubName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAddressAvailabilityResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAddressAvailabilityResult.java
new file mode 100644
index 000000000000..9743030cf8be
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAddressAvailabilityResult.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.IPAddressAvailabilityResultInner;
+import java.util.List;
+
+/**
+ * Type representing IPAddressAvailabilityResult.
+ */
+public interface IPAddressAvailabilityResult extends HasInner<IPAddressAvailabilityResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the available value.
+     */
+    Boolean available();
+
+    /**
+     * @return the availableIPAddresses value.
+     */
+    List<String> availableIPAddresses();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAllocationMethod.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAllocationMethod.java
new file mode 100644
index 000000000000..78447d03c8c0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPAllocationMethod.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IPAllocationMethod.
+ */
+public final class IPAllocationMethod extends ExpandableStringEnum<IPAllocationMethod> {
+    /** Static value Static for IPAllocationMethod. */
+    public static final IPAllocationMethod STATIC = fromString("Static");
+
+    /** Static value Dynamic for IPAllocationMethod. */
+    public static final IPAllocationMethod DYNAMIC = fromString("Dynamic");
+
+    /**
+     * Creates or finds a IPAllocationMethod from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IPAllocationMethod
+     */
+    @JsonCreator
+    public static IPAllocationMethod fromString(String name) {
+        return fromString(name, IPAllocationMethod.class);
+    }
+
+    /**
+     * @return known IPAllocationMethod values
+     */
+    public static Collection<IPAllocationMethod> values() {
+        return values(IPAllocationMethod.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfiguration.java
new file mode 100644
index 000000000000..72ebd696731d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfiguration.java
@@ -0,0 +1,185 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PublicIPAddressInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * IP configuration.
+ */
+@JsonFlatten
+public class IPConfiguration extends SubResource {
+    /**
+     * The private IP address of the IP configuration.
+     */
+    @JsonProperty(value = "properties.privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * The private IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * The reference to the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * The reference to the public IP resource.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private PublicIPAddressInner publicIPAddress;
+
+    /**
+     * The provisioning state of the IP configuration resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the private IP address of the IP configuration.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set the private IP address of the IP configuration.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the IPConfiguration object itself.
+     */
+    public IPConfiguration withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the IPConfiguration object itself.
+     */
+    public IPConfiguration withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get the reference to the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the reference to the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the IPConfiguration object itself.
+     */
+    public IPConfiguration withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the reference to the public IP resource.
+     *
+     * @return the publicIPAddress value
+     */
+    public PublicIPAddressInner publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set the reference to the public IP resource.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the IPConfiguration object itself.
+     */
+    public IPConfiguration withPublicIPAddress(PublicIPAddressInner publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the IPConfiguration object itself.
+     */
+    public IPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationBgpPeeringAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationBgpPeeringAddress.java
new file mode 100644
index 000000000000..5ceb8ec71591
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationBgpPeeringAddress.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of IPConfigurationBgpPeeringAddress.
+ */
+public class IPConfigurationBgpPeeringAddress {
+    /**
+     * The ID of IP configuration which belongs to gateway.
+     */
+    @JsonProperty(value = "ipconfigurationId")
+    private String ipconfigurationId;
+
+    /**
+     * The list of default BGP peering addresses which belong to IP
+     * configuration.
+     */
+    @JsonProperty(value = "defaultBgpIpAddresses", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> defaultBgpIpAddresses;
+
+    /**
+     * The list of custom BGP peering addresses which belong to IP
+     * configuration.
+     */
+    @JsonProperty(value = "customBgpIpAddresses")
+    private List<String> customBgpIpAddresses;
+
+    /**
+     * The list of tunnel public IP addresses which belong to IP configuration.
+     */
+    @JsonProperty(value = "tunnelIpAddresses", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> tunnelIpAddresses;
+
+    /**
+     * Get the ID of IP configuration which belongs to gateway.
+     *
+     * @return the ipconfigurationId value
+     */
+    public String ipconfigurationId() {
+        return this.ipconfigurationId;
+    }
+
+    /**
+     * Set the ID of IP configuration which belongs to gateway.
+     *
+     * @param ipconfigurationId the ipconfigurationId value to set
+     * @return the IPConfigurationBgpPeeringAddress object itself.
+     */
+    public IPConfigurationBgpPeeringAddress withIpconfigurationId(String ipconfigurationId) {
+        this.ipconfigurationId = ipconfigurationId;
+        return this;
+    }
+
+    /**
+     * Get the list of default BGP peering addresses which belong to IP configuration.
+     *
+     * @return the defaultBgpIpAddresses value
+     */
+    public List<String> defaultBgpIpAddresses() {
+        return this.defaultBgpIpAddresses;
+    }
+
+    /**
+     * Get the list of custom BGP peering addresses which belong to IP configuration.
+     *
+     * @return the customBgpIpAddresses value
+     */
+    public List<String> customBgpIpAddresses() {
+        return this.customBgpIpAddresses;
+    }
+
+    /**
+     * Set the list of custom BGP peering addresses which belong to IP configuration.
+     *
+     * @param customBgpIpAddresses the customBgpIpAddresses value to set
+     * @return the IPConfigurationBgpPeeringAddress object itself.
+     */
+    public IPConfigurationBgpPeeringAddress withCustomBgpIpAddresses(List<String> customBgpIpAddresses) {
+        this.customBgpIpAddresses = customBgpIpAddresses;
+        return this;
+    }
+
+    /**
+     * Get the list of tunnel public IP addresses which belong to IP configuration.
+     *
+     * @return the tunnelIpAddresses value
+     */
+    public List<String> tunnelIpAddresses() {
+        return this.tunnelIpAddresses;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationProfile.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationProfile.java
new file mode 100644
index 000000000000..aa6c983f135b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPConfigurationProfile.java
@@ -0,0 +1,120 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * IP configuration profile child resource.
+ */
+@JsonFlatten
+public class IPConfigurationProfile extends SubResource {
+    /**
+     * The reference to the subnet resource to create a container network
+     * interface ip configuration.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * The provisioning state of the IP configuration profile resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Sub Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the reference to the subnet resource to create a container network interface ip configuration.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the reference to the subnet resource to create a container network interface ip configuration.
+     *
+     * @param subnet the subnet value to set
+     * @return the IPConfigurationProfile object itself.
+     */
+    public IPConfigurationProfile withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the IP configuration profile resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the IPConfigurationProfile object itself.
+     */
+    public IPConfigurationProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get sub Resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPVersion.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPVersion.java
new file mode 100644
index 000000000000..122cc3d89293
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IPVersion.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IPVersion.
+ */
+public final class IPVersion extends ExpandableStringEnum<IPVersion> {
+    /** Static value IPv4 for IPVersion. */
+    public static final IPVersion IPV4 = fromString("IPv4");
+
+    /** Static value IPv6 for IPVersion. */
+    public static final IPVersion IPV6 = fromString("IPv6");
+
+    /**
+     * Creates or finds a IPVersion from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IPVersion
+     */
+    @JsonCreator
+    public static IPVersion fromString(String name) {
+        return fromString(name, IPVersion.class);
+    }
+
+    /**
+     * @return known IPVersion values
+     */
+    public static Collection<IPVersion> values() {
+        return values(IPVersion.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeEncryption.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeEncryption.java
new file mode 100644
index 000000000000..5cad1b8017ec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeEncryption.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IkeEncryption.
+ */
+public final class IkeEncryption extends ExpandableStringEnum<IkeEncryption> {
+    /** Static value DES for IkeEncryption. */
+    public static final IkeEncryption DES = fromString("DES");
+
+    /** Static value DES3 for IkeEncryption. */
+    public static final IkeEncryption DES3 = fromString("DES3");
+
+    /** Static value AES128 for IkeEncryption. */
+    public static final IkeEncryption AES128 = fromString("AES128");
+
+    /** Static value AES192 for IkeEncryption. */
+    public static final IkeEncryption AES192 = fromString("AES192");
+
+    /** Static value AES256 for IkeEncryption. */
+    public static final IkeEncryption AES256 = fromString("AES256");
+
+    /** Static value GCMAES256 for IkeEncryption. */
+    public static final IkeEncryption GCMAES256 = fromString("GCMAES256");
+
+    /** Static value GCMAES128 for IkeEncryption. */
+    public static final IkeEncryption GCMAES128 = fromString("GCMAES128");
+
+    /**
+     * Creates or finds a IkeEncryption from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IkeEncryption
+     */
+    @JsonCreator
+    public static IkeEncryption fromString(String name) {
+        return fromString(name, IkeEncryption.class);
+    }
+
+    /**
+     * @return known IkeEncryption values
+     */
+    public static Collection<IkeEncryption> values() {
+        return values(IkeEncryption.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeIntegrity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeIntegrity.java
new file mode 100644
index 000000000000..b6461c6b24f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IkeIntegrity.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IkeIntegrity.
+ */
+public final class IkeIntegrity extends ExpandableStringEnum<IkeIntegrity> {
+    /** Static value MD5 for IkeIntegrity. */
+    public static final IkeIntegrity MD5 = fromString("MD5");
+
+    /** Static value SHA1 for IkeIntegrity. */
+    public static final IkeIntegrity SHA1 = fromString("SHA1");
+
+    /** Static value SHA256 for IkeIntegrity. */
+    public static final IkeIntegrity SHA256 = fromString("SHA256");
+
+    /** Static value SHA384 for IkeIntegrity. */
+    public static final IkeIntegrity SHA384 = fromString("SHA384");
+
+    /** Static value GCMAES256 for IkeIntegrity. */
+    public static final IkeIntegrity GCMAES256 = fromString("GCMAES256");
+
+    /** Static value GCMAES128 for IkeIntegrity. */
+    public static final IkeIntegrity GCMAES128 = fromString("GCMAES128");
+
+    /**
+     * Creates or finds a IkeIntegrity from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IkeIntegrity
+     */
+    @JsonCreator
+    public static IkeIntegrity fromString(String name) {
+        return fromString(name, IkeIntegrity.class);
+    }
+
+    /**
+     * @return known IkeIntegrity values
+     */
+    public static Collection<IkeIntegrity> values() {
+        return values(IkeIntegrity.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatPool.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatPool.java
new file mode 100644
index 000000000000..91015ab0d570
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatPool.java
@@ -0,0 +1,315 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Inbound NAT pool of the load balancer.
+ */
+@JsonFlatten
+public class InboundNatPool extends SubResource {
+    /**
+     * A reference to frontend IP addresses.
+     */
+    @JsonProperty(value = "properties.frontendIPConfiguration")
+    private SubResource frontendIPConfiguration;
+
+    /**
+     * The reference to the transport protocol used by the inbound NAT pool.
+     * Possible values include: 'Udp', 'Tcp', 'All'.
+     */
+    @JsonProperty(value = "properties.protocol", required = true)
+    private TransportProtocol protocol;
+
+    /**
+     * The first port number in the range of external ports that will be used
+     * to provide Inbound Nat to NICs associated with a load balancer.
+     * Acceptable values range between 1 and 65534.
+     */
+    @JsonProperty(value = "properties.frontendPortRangeStart", required = true)
+    private int frontendPortRangeStart;
+
+    /**
+     * The last port number in the range of external ports that will be used to
+     * provide Inbound Nat to NICs associated with a load balancer. Acceptable
+     * values range between 1 and 65535.
+     */
+    @JsonProperty(value = "properties.frontendPortRangeEnd", required = true)
+    private int frontendPortRangeEnd;
+
+    /**
+     * The port used for internal connections on the endpoint. Acceptable
+     * values are between 1 and 65535.
+     */
+    @JsonProperty(value = "properties.backendPort", required = true)
+    private int backendPort;
+
+    /**
+     * The timeout for the TCP idle connection. The value can be set between 4
+     * and 30 minutes. The default value is 4 minutes. This element is only
+     * used when the protocol is set to TCP.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * Configures a virtual machine's endpoint for the floating IP capability
+     * required to configure a SQL AlwaysOn Availability Group. This setting is
+     * required when using the SQL AlwaysOn Availability Groups in SQL server.
+     * This setting can't be changed after you create the endpoint.
+     */
+    @JsonProperty(value = "properties.enableFloatingIP")
+    private Boolean enableFloatingIP;
+
+    /**
+     * Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected
+     * connection termination. This element is only used when the protocol is
+     * set to TCP.
+     */
+    @JsonProperty(value = "properties.enableTcpReset")
+    private Boolean enableTcpReset;
+
+    /**
+     * The provisioning state of the inbound NAT pool resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of inbound NAT
+     * pools used by the load balancer. This name can be used to access the
+     * resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get a reference to frontend IP addresses.
+     *
+     * @return the frontendIPConfiguration value
+     */
+    public SubResource frontendIPConfiguration() {
+        return this.frontendIPConfiguration;
+    }
+
+    /**
+     * Set a reference to frontend IP addresses.
+     *
+     * @param frontendIPConfiguration the frontendIPConfiguration value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withFrontendIPConfiguration(SubResource frontendIPConfiguration) {
+        this.frontendIPConfiguration = frontendIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the reference to the transport protocol used by the inbound NAT pool. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @return the protocol value
+     */
+    public TransportProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the reference to the transport protocol used by the inbound NAT pool. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @param protocol the protocol value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withProtocol(TransportProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the first port number in the range of external ports that will be used to provide Inbound Nat to NICs associated with a load balancer. Acceptable values range between 1 and 65534.
+     *
+     * @return the frontendPortRangeStart value
+     */
+    public int frontendPortRangeStart() {
+        return this.frontendPortRangeStart;
+    }
+
+    /**
+     * Set the first port number in the range of external ports that will be used to provide Inbound Nat to NICs associated with a load balancer. Acceptable values range between 1 and 65534.
+     *
+     * @param frontendPortRangeStart the frontendPortRangeStart value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withFrontendPortRangeStart(int frontendPortRangeStart) {
+        this.frontendPortRangeStart = frontendPortRangeStart;
+        return this;
+    }
+
+    /**
+     * Get the last port number in the range of external ports that will be used to provide Inbound Nat to NICs associated with a load balancer. Acceptable values range between 1 and 65535.
+     *
+     * @return the frontendPortRangeEnd value
+     */
+    public int frontendPortRangeEnd() {
+        return this.frontendPortRangeEnd;
+    }
+
+    /**
+     * Set the last port number in the range of external ports that will be used to provide Inbound Nat to NICs associated with a load balancer. Acceptable values range between 1 and 65535.
+     *
+     * @param frontendPortRangeEnd the frontendPortRangeEnd value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withFrontendPortRangeEnd(int frontendPortRangeEnd) {
+        this.frontendPortRangeEnd = frontendPortRangeEnd;
+        return this;
+    }
+
+    /**
+     * Get the port used for internal connections on the endpoint. Acceptable values are between 1 and 65535.
+     *
+     * @return the backendPort value
+     */
+    public int backendPort() {
+        return this.backendPort;
+    }
+
+    /**
+     * Set the port used for internal connections on the endpoint. Acceptable values are between 1 and 65535.
+     *
+     * @param backendPort the backendPort value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withBackendPort(int backendPort) {
+        this.backendPort = backendPort;
+        return this;
+    }
+
+    /**
+     * Get the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @return the enableFloatingIP value
+     */
+    public Boolean enableFloatingIP() {
+        return this.enableFloatingIP;
+    }
+
+    /**
+     * Set configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @param enableFloatingIP the enableFloatingIP value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withEnableFloatingIP(Boolean enableFloatingIP) {
+        this.enableFloatingIP = enableFloatingIP;
+        return this;
+    }
+
+    /**
+     * Get receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @return the enableTcpReset value
+     */
+    public Boolean enableTcpReset() {
+        return this.enableTcpReset;
+    }
+
+    /**
+     * Set receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @param enableTcpReset the enableTcpReset value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withEnableTcpReset(Boolean enableTcpReset) {
+        this.enableTcpReset = enableTcpReset;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the inbound NAT pool resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of inbound NAT pools used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of inbound NAT pools used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the InboundNatPool object itself.
+     */
+    public InboundNatPool withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRule.java
new file mode 100644
index 000000000000..6c6fd5a7fd7d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRule.java
@@ -0,0 +1,355 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.InboundNatRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing InboundNatRule.
+ */
+public interface InboundNatRule extends HasInner<InboundNatRuleInner>, Indexable, Refreshable<InboundNatRule>, Updatable<InboundNatRule.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the backendIPConfiguration value.
+     */
+    VirtualMachineScaleSetNetworkInterfaceIPConfiguration backendIPConfiguration();
+
+    /**
+     * @return the backendPort value.
+     */
+    Integer backendPort();
+
+    /**
+     * @return the enableFloatingIP value.
+     */
+    Boolean enableFloatingIP();
+
+    /**
+     * @return the enableTcpReset value.
+     */
+    Boolean enableTcpReset();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the frontendIPConfiguration value.
+     */
+    SubResource frontendIPConfiguration();
+
+    /**
+     * @return the frontendPort value.
+     */
+    Integer frontendPort();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the idleTimeoutInMinutes value.
+     */
+    Integer idleTimeoutInMinutes();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the protocol value.
+     */
+    TransportProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the InboundNatRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLoadBalancer, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of InboundNatRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a InboundNatRule definition.
+         */
+        interface Blank extends WithLoadBalancer {
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify LoadBalancer.
+         */
+        interface WithLoadBalancer {
+           /**
+            * Specifies resourceGroupName, loadBalancerName.
+            * @param resourceGroupName The name of the resource group
+            * @param loadBalancerName The name of the load balancer
+            * @return the next definition stage
+            */
+            WithCreate withExistingLoadBalancer(String resourceGroupName, String loadBalancerName);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify BackendPort.
+         */
+        interface WithBackendPort {
+            /**
+             * Specifies backendPort.
+             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
+             * @return the next definition stage
+             */
+            WithCreate withBackendPort(Integer backendPort);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify EnableFloatingIP.
+         */
+        interface WithEnableFloatingIP {
+            /**
+             * Specifies enableFloatingIP.
+             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
+             * @return the next definition stage
+             */
+            WithCreate withEnableFloatingIP(Boolean enableFloatingIP);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify EnableTcpReset.
+         */
+        interface WithEnableTcpReset {
+            /**
+             * Specifies enableTcpReset.
+             * @param enableTcpReset Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP
+             * @return the next definition stage
+             */
+            WithCreate withEnableTcpReset(Boolean enableTcpReset);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify FrontendIPConfiguration.
+         */
+        interface WithFrontendIPConfiguration {
+            /**
+             * Specifies frontendIPConfiguration.
+             * @param frontendIPConfiguration A reference to frontend IP addresses
+             * @return the next definition stage
+             */
+            WithCreate withFrontendIPConfiguration(SubResource frontendIPConfiguration);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify FrontendPort.
+         */
+        interface WithFrontendPort {
+            /**
+             * Specifies frontendPort.
+             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
+             * @return the next definition stage
+             */
+            WithCreate withFrontendPort(Integer frontendPort);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
+             * @return the next definition stage
+             */
+            WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within the set of inbound NAT rules used by the load balancer. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the inboundnatrule definition allowing to specify Protocol.
+         */
+        interface WithProtocol {
+            /**
+             * Specifies protocol.
+             * @param protocol The reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'
+             * @return the next definition stage
+             */
+            WithCreate withProtocol(TransportProtocol protocol);
+        }
+
+        /**
+         * 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<InboundNatRule>, DefinitionStages.WithBackendPort, DefinitionStages.WithEnableFloatingIP, DefinitionStages.WithEnableTcpReset, DefinitionStages.WithFrontendIPConfiguration, DefinitionStages.WithFrontendPort, DefinitionStages.WithId, DefinitionStages.WithIdleTimeoutInMinutes, DefinitionStages.WithName, DefinitionStages.WithProtocol {
+        }
+    }
+    /**
+     * The template for a InboundNatRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<InboundNatRule>, UpdateStages.WithBackendPort, UpdateStages.WithEnableFloatingIP, UpdateStages.WithEnableTcpReset, UpdateStages.WithFrontendIPConfiguration, UpdateStages.WithFrontendPort, UpdateStages.WithId, UpdateStages.WithIdleTimeoutInMinutes, UpdateStages.WithName, UpdateStages.WithProtocol {
+    }
+
+    /**
+     * Grouping of InboundNatRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the inboundnatrule update allowing to specify BackendPort.
+         */
+        interface WithBackendPort {
+            /**
+             * Specifies backendPort.
+             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
+             * @return the next update stage
+             */
+            Update withBackendPort(Integer backendPort);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify EnableFloatingIP.
+         */
+        interface WithEnableFloatingIP {
+            /**
+             * Specifies enableFloatingIP.
+             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
+             * @return the next update stage
+             */
+            Update withEnableFloatingIP(Boolean enableFloatingIP);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify EnableTcpReset.
+         */
+        interface WithEnableTcpReset {
+            /**
+             * Specifies enableTcpReset.
+             * @param enableTcpReset Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP
+             * @return the next update stage
+             */
+            Update withEnableTcpReset(Boolean enableTcpReset);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify FrontendIPConfiguration.
+         */
+        interface WithFrontendIPConfiguration {
+            /**
+             * Specifies frontendIPConfiguration.
+             * @param frontendIPConfiguration A reference to frontend IP addresses
+             * @return the next update stage
+             */
+            Update withFrontendIPConfiguration(SubResource frontendIPConfiguration);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify FrontendPort.
+         */
+        interface WithFrontendPort {
+            /**
+             * Specifies frontendPort.
+             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
+             * @return the next update stage
+             */
+            Update withFrontendPort(Integer frontendPort);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
+             * @return the next update stage
+             */
+            Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within the set of inbound NAT rules used by the load balancer. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the inboundnatrule update allowing to specify Protocol.
+         */
+        interface WithProtocol {
+            /**
+             * Specifies protocol.
+             * @param protocol The reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'
+             * @return the next update stage
+             */
+            Update withProtocol(TransportProtocol protocol);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRules.java
new file mode 100644
index 000000000000..4c26eb5895fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/InboundNatRules.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.InboundNatRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing InboundNatRules.
+ */
+public interface InboundNatRules extends SupportsCreating<InboundNatRule.DefinitionStages.Blank>, HasInner<InboundNatRulesInner> {
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<InboundNatRule> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName);
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<InboundNatRule> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocation.java
new file mode 100644
index 000000000000..f90262b41ec4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocation.java
@@ -0,0 +1,259 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.IpAllocationInner;
+
+/**
+ * Type representing IpAllocation.
+ */
+public interface IpAllocation extends HasInner<IpAllocationInner>, Resource, GroupableResourceCore<NetworkManager, IpAllocationInner>, HasResourceGroup, Refreshable<IpAllocation>, Updatable<IpAllocation.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the allocationTags value.
+     */
+    Map<String, String> allocationTags();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipAllocationType value.
+     */
+    IpAllocationType ipAllocationType();
+
+    /**
+     * @return the ipamAllocationId value.
+     */
+    String ipamAllocationId();
+
+    /**
+     * @return the prefix value.
+     */
+    String prefix();
+
+    /**
+     * @return the prefixLength value.
+     */
+    Integer prefixLength();
+
+    /**
+     * @return the prefixType value.
+     */
+    IPVersion prefixType();
+
+    /**
+     * @return the subnet value.
+     */
+    SubResource subnet();
+
+    /**
+     * @return the virtualNetwork value.
+     */
+    SubResource virtualNetwork();
+
+    /**
+     * The entirety of the IpAllocation definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of IpAllocation definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a IpAllocation definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the IpAllocation definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify AllocationTags.
+         */
+        interface WithAllocationTags {
+            /**
+             * Specifies allocationTags.
+             * @param allocationTags IpAllocation tags
+             * @return the next definition stage
+             */
+            WithCreate withAllocationTags(Map<String, String> allocationTags);
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify IpAllocationType.
+         */
+        interface WithIpAllocationType {
+            /**
+             * Specifies ipAllocationType.
+             * @param ipAllocationType The type for the IpAllocation. Possible values include: 'Undefined', 'Hypernet'
+             * @return the next definition stage
+             */
+            WithCreate withIpAllocationType(IpAllocationType ipAllocationType);
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify IpamAllocationId.
+         */
+        interface WithIpamAllocationId {
+            /**
+             * Specifies ipamAllocationId.
+             * @param ipamAllocationId The IPAM allocation ID
+             * @return the next definition stage
+             */
+            WithCreate withIpamAllocationId(String ipamAllocationId);
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify Prefix.
+         */
+        interface WithPrefix {
+            /**
+             * Specifies prefix.
+             * @param prefix The address prefix for the IpAllocation
+             * @return the next definition stage
+             */
+            WithCreate withPrefix(String prefix);
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify PrefixLength.
+         */
+        interface WithPrefixLength {
+            /**
+             * Specifies prefixLength.
+             * @param prefixLength The address prefix length for the IpAllocation
+             * @return the next definition stage
+             */
+            WithCreate withPrefixLength(Integer prefixLength);
+        }
+
+        /**
+         * The stage of the ipallocation definition allowing to specify PrefixType.
+         */
+        interface WithPrefixType {
+            /**
+             * Specifies prefixType.
+             * @param prefixType The address prefix Type for the IpAllocation. Possible values include: 'IPv4', 'IPv6'
+             * @return the next definition stage
+             */
+            WithCreate withPrefixType(IPVersion prefixType);
+        }
+
+        /**
+         * 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<IpAllocation>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAllocationTags, DefinitionStages.WithIpAllocationType, DefinitionStages.WithIpamAllocationId, DefinitionStages.WithPrefix, DefinitionStages.WithPrefixLength, DefinitionStages.WithPrefixType {
+        }
+    }
+    /**
+     * The template for a IpAllocation update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<IpAllocation>, Resource.UpdateWithTags<Update>, UpdateStages.WithAllocationTags, UpdateStages.WithIpAllocationType, UpdateStages.WithIpamAllocationId, UpdateStages.WithPrefix, UpdateStages.WithPrefixLength, UpdateStages.WithPrefixType {
+    }
+
+    /**
+     * Grouping of IpAllocation update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ipallocation update allowing to specify AllocationTags.
+         */
+        interface WithAllocationTags {
+            /**
+             * Specifies allocationTags.
+             * @param allocationTags IpAllocation tags
+             * @return the next update stage
+             */
+            Update withAllocationTags(Map<String, String> allocationTags);
+        }
+
+        /**
+         * The stage of the ipallocation update allowing to specify IpAllocationType.
+         */
+        interface WithIpAllocationType {
+            /**
+             * Specifies ipAllocationType.
+             * @param ipAllocationType The type for the IpAllocation. Possible values include: 'Undefined', 'Hypernet'
+             * @return the next update stage
+             */
+            Update withIpAllocationType(IpAllocationType ipAllocationType);
+        }
+
+        /**
+         * The stage of the ipallocation update allowing to specify IpamAllocationId.
+         */
+        interface WithIpamAllocationId {
+            /**
+             * Specifies ipamAllocationId.
+             * @param ipamAllocationId The IPAM allocation ID
+             * @return the next update stage
+             */
+            Update withIpamAllocationId(String ipamAllocationId);
+        }
+
+        /**
+         * The stage of the ipallocation update allowing to specify Prefix.
+         */
+        interface WithPrefix {
+            /**
+             * Specifies prefix.
+             * @param prefix The address prefix for the IpAllocation
+             * @return the next update stage
+             */
+            Update withPrefix(String prefix);
+        }
+
+        /**
+         * The stage of the ipallocation update allowing to specify PrefixLength.
+         */
+        interface WithPrefixLength {
+            /**
+             * Specifies prefixLength.
+             * @param prefixLength The address prefix length for the IpAllocation
+             * @return the next update stage
+             */
+            Update withPrefixLength(Integer prefixLength);
+        }
+
+        /**
+         * The stage of the ipallocation update allowing to specify PrefixType.
+         */
+        interface WithPrefixType {
+            /**
+             * Specifies prefixType.
+             * @param prefixType The address prefix Type for the IpAllocation. Possible values include: 'IPv4', 'IPv6'
+             * @return the next update stage
+             */
+            Update withPrefixType(IPVersion prefixType);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocationType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocationType.java
new file mode 100644
index 000000000000..fb8794021b1c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocationType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IpAllocationType.
+ */
+public final class IpAllocationType extends ExpandableStringEnum<IpAllocationType> {
+    /** Static value Undefined for IpAllocationType. */
+    public static final IpAllocationType UNDEFINED = fromString("Undefined");
+
+    /** Static value Hypernet for IpAllocationType. */
+    public static final IpAllocationType HYPERNET = fromString("Hypernet");
+
+    /**
+     * Creates or finds a IpAllocationType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IpAllocationType
+     */
+    @JsonCreator
+    public static IpAllocationType fromString(String name) {
+        return fromString(name, IpAllocationType.class);
+    }
+
+    /**
+     * @return known IpAllocationType values
+     */
+    public static Collection<IpAllocationType> values() {
+        return values(IpAllocationType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocations.java
new file mode 100644
index 000000000000..16c6ab5f839f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpAllocations.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.IpAllocationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing IpAllocations.
+ */
+public interface IpAllocations extends SupportsCreating<IpAllocation.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<IpAllocation>, SupportsListingByResourceGroup<IpAllocation>, SupportsListing<IpAllocation>, HasInner<IpAllocationsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpFlowProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpFlowProtocol.java
new file mode 100644
index 000000000000..804beb4a2861
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpFlowProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IpFlowProtocol.
+ */
+public final class IpFlowProtocol extends ExpandableStringEnum<IpFlowProtocol> {
+    /** Static value TCP for IpFlowProtocol. */
+    public static final IpFlowProtocol TCP = fromString("TCP");
+
+    /** Static value UDP for IpFlowProtocol. */
+    public static final IpFlowProtocol UDP = fromString("UDP");
+
+    /**
+     * Creates or finds a IpFlowProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IpFlowProtocol
+     */
+    @JsonCreator
+    public static IpFlowProtocol fromString(String name) {
+        return fromString(name, IpFlowProtocol.class);
+    }
+
+    /**
+     * @return known IpFlowProtocol values
+     */
+    public static Collection<IpFlowProtocol> values() {
+        return values(IpFlowProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroup.java
new file mode 100644
index 000000000000..077a881cb687
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroup.java
@@ -0,0 +1,114 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.IpGroupInner;
+
+/**
+ * Type representing IpGroup.
+ */
+public interface IpGroup extends HasInner<IpGroupInner>, Resource, GroupableResourceCore<NetworkManager, IpGroupInner>, HasResourceGroup, Refreshable<IpGroup>, Updatable<IpGroup.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the firewalls value.
+     */
+    List<SubResource> firewalls();
+
+    /**
+     * @return the ipAddresses value.
+     */
+    List<String> ipAddresses();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * The entirety of the IpGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of IpGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a IpGroup definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the IpGroup definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the ipgroup definition allowing to specify IpAddresses.
+         */
+        interface WithIpAddresses {
+            /**
+             * Specifies ipAddresses.
+             * @param ipAddresses IpAddresses/IpAddressPrefixes in the IpGroups resource
+             * @return the next definition stage
+             */
+            WithCreate withIpAddresses(List<String> ipAddresses);
+        }
+
+        /**
+         * 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<IpGroup>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithIpAddresses {
+        }
+    }
+    /**
+     * The template for a IpGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<IpGroup>, Resource.UpdateWithTags<Update>, UpdateStages.WithIpAddresses {
+    }
+
+    /**
+     * Grouping of IpGroup update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ipgroup update allowing to specify IpAddresses.
+         */
+        interface WithIpAddresses {
+            /**
+             * Specifies ipAddresses.
+             * @param ipAddresses IpAddresses/IpAddressPrefixes in the IpGroups resource
+             * @return the next update stage
+             */
+            Update withIpAddresses(List<String> ipAddresses);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroups.java
new file mode 100644
index 000000000000..2cab87abc9eb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpGroups.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.IpGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing IpGroups.
+ */
+public interface IpGroups extends SupportsCreating<IpGroup.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<IpGroup>, SupportsListingByResourceGroup<IpGroup>, SupportsListing<IpGroup>, HasInner<IpGroupsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpTag.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpTag.java
new file mode 100644
index 000000000000..e0c6f572824b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpTag.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains the IpTag associated with the object.
+ */
+public class IpTag {
+    /**
+     * The IP tag type. Example: FirstPartyUsage.
+     */
+    @JsonProperty(value = "ipTagType")
+    private String ipTagType;
+
+    /**
+     * The value of the IP tag associated with the public IP. Example: SQL.
+     */
+    @JsonProperty(value = "tag")
+    private String tag;
+
+    /**
+     * Get the IP tag type. Example: FirstPartyUsage.
+     *
+     * @return the ipTagType value
+     */
+    public String ipTagType() {
+        return this.ipTagType;
+    }
+
+    /**
+     * Set the IP tag type. Example: FirstPartyUsage.
+     *
+     * @param ipTagType the ipTagType value to set
+     * @return the IpTag object itself.
+     */
+    public IpTag withIpTagType(String ipTagType) {
+        this.ipTagType = ipTagType;
+        return this;
+    }
+
+    /**
+     * Get the value of the IP tag associated with the public IP. Example: SQL.
+     *
+     * @return the tag value
+     */
+    public String tag() {
+        return this.tag;
+    }
+
+    /**
+     * Set the value of the IP tag associated with the public IP. Example: SQL.
+     *
+     * @param tag the tag value to set
+     * @return the IpTag object itself.
+     */
+    public IpTag withTag(String tag) {
+        this.tag = tag;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecEncryption.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecEncryption.java
new file mode 100644
index 000000000000..3ec19b3a65ba
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecEncryption.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IpsecEncryption.
+ */
+public final class IpsecEncryption extends ExpandableStringEnum<IpsecEncryption> {
+    /** Static value None for IpsecEncryption. */
+    public static final IpsecEncryption NONE = fromString("None");
+
+    /** Static value DES for IpsecEncryption. */
+    public static final IpsecEncryption DES = fromString("DES");
+
+    /** Static value DES3 for IpsecEncryption. */
+    public static final IpsecEncryption DES3 = fromString("DES3");
+
+    /** Static value AES128 for IpsecEncryption. */
+    public static final IpsecEncryption AES128 = fromString("AES128");
+
+    /** Static value AES192 for IpsecEncryption. */
+    public static final IpsecEncryption AES192 = fromString("AES192");
+
+    /** Static value AES256 for IpsecEncryption. */
+    public static final IpsecEncryption AES256 = fromString("AES256");
+
+    /** Static value GCMAES128 for IpsecEncryption. */
+    public static final IpsecEncryption GCMAES128 = fromString("GCMAES128");
+
+    /** Static value GCMAES192 for IpsecEncryption. */
+    public static final IpsecEncryption GCMAES192 = fromString("GCMAES192");
+
+    /** Static value GCMAES256 for IpsecEncryption. */
+    public static final IpsecEncryption GCMAES256 = fromString("GCMAES256");
+
+    /**
+     * Creates or finds a IpsecEncryption from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IpsecEncryption
+     */
+    @JsonCreator
+    public static IpsecEncryption fromString(String name) {
+        return fromString(name, IpsecEncryption.class);
+    }
+
+    /**
+     * @return known IpsecEncryption values
+     */
+    public static Collection<IpsecEncryption> values() {
+        return values(IpsecEncryption.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecIntegrity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecIntegrity.java
new file mode 100644
index 000000000000..bcf6a5167b43
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecIntegrity.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IpsecIntegrity.
+ */
+public final class IpsecIntegrity extends ExpandableStringEnum<IpsecIntegrity> {
+    /** Static value MD5 for IpsecIntegrity. */
+    public static final IpsecIntegrity MD5 = fromString("MD5");
+
+    /** Static value SHA1 for IpsecIntegrity. */
+    public static final IpsecIntegrity SHA1 = fromString("SHA1");
+
+    /** Static value SHA256 for IpsecIntegrity. */
+    public static final IpsecIntegrity SHA256 = fromString("SHA256");
+
+    /** Static value GCMAES128 for IpsecIntegrity. */
+    public static final IpsecIntegrity GCMAES128 = fromString("GCMAES128");
+
+    /** Static value GCMAES192 for IpsecIntegrity. */
+    public static final IpsecIntegrity GCMAES192 = fromString("GCMAES192");
+
+    /** Static value GCMAES256 for IpsecIntegrity. */
+    public static final IpsecIntegrity GCMAES256 = fromString("GCMAES256");
+
+    /**
+     * Creates or finds a IpsecIntegrity from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IpsecIntegrity
+     */
+    @JsonCreator
+    public static IpsecIntegrity fromString(String name) {
+        return fromString(name, IpsecIntegrity.class);
+    }
+
+    /**
+     * @return known IpsecIntegrity values
+     */
+    public static Collection<IpsecIntegrity> values() {
+        return values(IpsecIntegrity.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecPolicy.java
new file mode 100644
index 000000000000..eed5de513896
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IpsecPolicy.java
@@ -0,0 +1,236 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * An IPSec Policy configuration for a virtual network gateway connection.
+ */
+public class IpsecPolicy {
+    /**
+     * The IPSec Security Association (also called Quick Mode or Phase 2 SA)
+     * lifetime in seconds for a site to site VPN tunnel.
+     */
+    @JsonProperty(value = "saLifeTimeSeconds", required = true)
+    private int saLifeTimeSeconds;
+
+    /**
+     * The IPSec Security Association (also called Quick Mode or Phase 2 SA)
+     * payload size in KB for a site to site VPN tunnel.
+     */
+    @JsonProperty(value = "saDataSizeKilobytes", required = true)
+    private int saDataSizeKilobytes;
+
+    /**
+     * The IPSec encryption algorithm (IKE phase 1). Possible values include:
+     * 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128',
+     * 'GCMAES192', 'GCMAES256'.
+     */
+    @JsonProperty(value = "ipsecEncryption", required = true)
+    private IpsecEncryption ipsecEncryption;
+
+    /**
+     * The IPSec integrity algorithm (IKE phase 1). Possible values include:
+     * 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     */
+    @JsonProperty(value = "ipsecIntegrity", required = true)
+    private IpsecIntegrity ipsecIntegrity;
+
+    /**
+     * The IKE encryption algorithm (IKE phase 2). Possible values include:
+     * 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     */
+    @JsonProperty(value = "ikeEncryption", required = true)
+    private IkeEncryption ikeEncryption;
+
+    /**
+     * The IKE integrity algorithm (IKE phase 2). Possible values include:
+     * 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     */
+    @JsonProperty(value = "ikeIntegrity", required = true)
+    private IkeIntegrity ikeIntegrity;
+
+    /**
+     * The DH Group used in IKE Phase 1 for initial SA. Possible values
+     * include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048',
+     * 'ECP256', 'ECP384', 'DHGroup24'.
+     */
+    @JsonProperty(value = "dhGroup", required = true)
+    private DhGroup dhGroup;
+
+    /**
+     * The Pfs Group used in IKE Phase 2 for new child SA. Possible values
+     * include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24',
+     * 'PFS14', 'PFSMM'.
+     */
+    @JsonProperty(value = "pfsGroup", required = true)
+    private PfsGroup pfsGroup;
+
+    /**
+     * Get the IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site to site VPN tunnel.
+     *
+     * @return the saLifeTimeSeconds value
+     */
+    public int saLifeTimeSeconds() {
+        return this.saLifeTimeSeconds;
+    }
+
+    /**
+     * Set the IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site to site VPN tunnel.
+     *
+     * @param saLifeTimeSeconds the saLifeTimeSeconds value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withSaLifeTimeSeconds(int saLifeTimeSeconds) {
+        this.saLifeTimeSeconds = saLifeTimeSeconds;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site to site VPN tunnel.
+     *
+     * @return the saDataSizeKilobytes value
+     */
+    public int saDataSizeKilobytes() {
+        return this.saDataSizeKilobytes;
+    }
+
+    /**
+     * Set the IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site to site VPN tunnel.
+     *
+     * @param saDataSizeKilobytes the saDataSizeKilobytes value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withSaDataSizeKilobytes(int saDataSizeKilobytes) {
+        this.saDataSizeKilobytes = saDataSizeKilobytes;
+        return this;
+    }
+
+    /**
+     * Get the IPSec encryption algorithm (IKE phase 1). Possible values include: 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @return the ipsecEncryption value
+     */
+    public IpsecEncryption ipsecEncryption() {
+        return this.ipsecEncryption;
+    }
+
+    /**
+     * Set the IPSec encryption algorithm (IKE phase 1). Possible values include: 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @param ipsecEncryption the ipsecEncryption value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withIpsecEncryption(IpsecEncryption ipsecEncryption) {
+        this.ipsecEncryption = ipsecEncryption;
+        return this;
+    }
+
+    /**
+     * Get the IPSec integrity algorithm (IKE phase 1). Possible values include: 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @return the ipsecIntegrity value
+     */
+    public IpsecIntegrity ipsecIntegrity() {
+        return this.ipsecIntegrity;
+    }
+
+    /**
+     * Set the IPSec integrity algorithm (IKE phase 1). Possible values include: 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @param ipsecIntegrity the ipsecIntegrity value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withIpsecIntegrity(IpsecIntegrity ipsecIntegrity) {
+        this.ipsecIntegrity = ipsecIntegrity;
+        return this;
+    }
+
+    /**
+     * Get the IKE encryption algorithm (IKE phase 2). Possible values include: 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     *
+     * @return the ikeEncryption value
+     */
+    public IkeEncryption ikeEncryption() {
+        return this.ikeEncryption;
+    }
+
+    /**
+     * Set the IKE encryption algorithm (IKE phase 2). Possible values include: 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     *
+     * @param ikeEncryption the ikeEncryption value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withIkeEncryption(IkeEncryption ikeEncryption) {
+        this.ikeEncryption = ikeEncryption;
+        return this;
+    }
+
+    /**
+     * Get the IKE integrity algorithm (IKE phase 2). Possible values include: 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     *
+     * @return the ikeIntegrity value
+     */
+    public IkeIntegrity ikeIntegrity() {
+        return this.ikeIntegrity;
+    }
+
+    /**
+     * Set the IKE integrity algorithm (IKE phase 2). Possible values include: 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     *
+     * @param ikeIntegrity the ikeIntegrity value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withIkeIntegrity(IkeIntegrity ikeIntegrity) {
+        this.ikeIntegrity = ikeIntegrity;
+        return this;
+    }
+
+    /**
+     * Get the DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'.
+     *
+     * @return the dhGroup value
+     */
+    public DhGroup dhGroup() {
+        return this.dhGroup;
+    }
+
+    /**
+     * Set the DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'.
+     *
+     * @param dhGroup the dhGroup value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withDhGroup(DhGroup dhGroup) {
+        this.dhGroup = dhGroup;
+        return this;
+    }
+
+    /**
+     * Get the Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM'.
+     *
+     * @return the pfsGroup value
+     */
+    public PfsGroup pfsGroup() {
+        return this.pfsGroup;
+    }
+
+    /**
+     * Set the Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM'.
+     *
+     * @param pfsGroup the pfsGroup value to set
+     * @return the IpsecPolicy object itself.
+     */
+    public IpsecPolicy withPfsGroup(PfsGroup pfsGroup) {
+        this.pfsGroup = pfsGroup;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6CircuitConnectionConfig.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6CircuitConnectionConfig.java
new file mode 100644
index 000000000000..6c68d6a4fde3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6CircuitConnectionConfig.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * IPv6 Circuit Connection properties for global reach.
+ */
+public class Ipv6CircuitConnectionConfig {
+    /**
+     * /125 IP address space to carve out customer addresses for global reach.
+     */
+    @JsonProperty(value = "addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * Express Route Circuit connection state. Possible values include:
+     * 'Connected', 'Connecting', 'Disconnected'.
+     */
+    @JsonProperty(value = "circuitConnectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private CircuitConnectionStatus circuitConnectionStatus;
+
+    /**
+     * Get /125 IP address space to carve out customer addresses for global reach.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set /125 IP address space to carve out customer addresses for global reach.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the Ipv6CircuitConnectionConfig object itself.
+     */
+    public Ipv6CircuitConnectionConfig withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'.
+     *
+     * @return the circuitConnectionStatus value
+     */
+    public CircuitConnectionStatus circuitConnectionStatus() {
+        return this.circuitConnectionStatus;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6ExpressRouteCircuitPeeringConfig.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6ExpressRouteCircuitPeeringConfig.java
new file mode 100644
index 000000000000..7b9beaa7af8c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Ipv6ExpressRouteCircuitPeeringConfig.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains IPv6 peering config.
+ */
+public class Ipv6ExpressRouteCircuitPeeringConfig {
+    /**
+     * The primary address prefix.
+     */
+    @JsonProperty(value = "primaryPeerAddressPrefix")
+    private String primaryPeerAddressPrefix;
+
+    /**
+     * The secondary address prefix.
+     */
+    @JsonProperty(value = "secondaryPeerAddressPrefix")
+    private String secondaryPeerAddressPrefix;
+
+    /**
+     * The Microsoft peering configuration.
+     */
+    @JsonProperty(value = "microsoftPeeringConfig")
+    private ExpressRouteCircuitPeeringConfig microsoftPeeringConfig;
+
+    /**
+     * The reference to the RouteFilter resource.
+     */
+    @JsonProperty(value = "routeFilter")
+    private SubResource routeFilter;
+
+    /**
+     * The state of peering. Possible values include: 'Disabled', 'Enabled'.
+     */
+    @JsonProperty(value = "state")
+    private ExpressRouteCircuitPeeringState state;
+
+    /**
+     * Get the primary address prefix.
+     *
+     * @return the primaryPeerAddressPrefix value
+     */
+    public String primaryPeerAddressPrefix() {
+        return this.primaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the primary address prefix.
+     *
+     * @param primaryPeerAddressPrefix the primaryPeerAddressPrefix value to set
+     * @return the Ipv6ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix) {
+        this.primaryPeerAddressPrefix = primaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the secondary address prefix.
+     *
+     * @return the secondaryPeerAddressPrefix value
+     */
+    public String secondaryPeerAddressPrefix() {
+        return this.secondaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the secondary address prefix.
+     *
+     * @param secondaryPeerAddressPrefix the secondaryPeerAddressPrefix value to set
+     * @return the Ipv6ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix) {
+        this.secondaryPeerAddressPrefix = secondaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the Microsoft peering configuration.
+     *
+     * @return the microsoftPeeringConfig value
+     */
+    public ExpressRouteCircuitPeeringConfig microsoftPeeringConfig() {
+        return this.microsoftPeeringConfig;
+    }
+
+    /**
+     * Set the Microsoft peering configuration.
+     *
+     * @param microsoftPeeringConfig the microsoftPeeringConfig value to set
+     * @return the Ipv6ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig) {
+        this.microsoftPeeringConfig = microsoftPeeringConfig;
+        return this;
+    }
+
+    /**
+     * Get the reference to the RouteFilter resource.
+     *
+     * @return the routeFilter value
+     */
+    public SubResource routeFilter() {
+        return this.routeFilter;
+    }
+
+    /**
+     * Set the reference to the RouteFilter resource.
+     *
+     * @param routeFilter the routeFilter value to set
+     * @return the Ipv6ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig withRouteFilter(SubResource routeFilter) {
+        this.routeFilter = routeFilter;
+        return this;
+    }
+
+    /**
+     * Get the state of peering. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @return the state value
+     */
+    public ExpressRouteCircuitPeeringState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the state of peering. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @param state the state value to set
+     * @return the Ipv6ExpressRouteCircuitPeeringConfig object itself.
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig withState(ExpressRouteCircuitPeeringState state) {
+        this.state = state;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IssueType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IssueType.java
new file mode 100644
index 000000000000..a70511fbef40
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/IssueType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IssueType.
+ */
+public final class IssueType extends ExpandableStringEnum<IssueType> {
+    /** Static value Unknown for IssueType. */
+    public static final IssueType UNKNOWN = fromString("Unknown");
+
+    /** Static value AgentStopped for IssueType. */
+    public static final IssueType AGENT_STOPPED = fromString("AgentStopped");
+
+    /** Static value GuestFirewall for IssueType. */
+    public static final IssueType GUEST_FIREWALL = fromString("GuestFirewall");
+
+    /** Static value DnsResolution for IssueType. */
+    public static final IssueType DNS_RESOLUTION = fromString("DnsResolution");
+
+    /** Static value SocketBind for IssueType. */
+    public static final IssueType SOCKET_BIND = fromString("SocketBind");
+
+    /** Static value NetworkSecurityRule for IssueType. */
+    public static final IssueType NETWORK_SECURITY_RULE = fromString("NetworkSecurityRule");
+
+    /** Static value UserDefinedRoute for IssueType. */
+    public static final IssueType USER_DEFINED_ROUTE = fromString("UserDefinedRoute");
+
+    /** Static value PortThrottled for IssueType. */
+    public static final IssueType PORT_THROTTLED = fromString("PortThrottled");
+
+    /** Static value Platform for IssueType. */
+    public static final IssueType PLATFORM = fromString("Platform");
+
+    /**
+     * Creates or finds a IssueType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IssueType
+     */
+    @JsonCreator
+    public static IssueType fromString(String name) {
+        return fromString(name, IssueType.class);
+    }
+
+    /**
+     * @return known IssueType values
+     */
+    public static Collection<IssueType> values() {
+        return values(IssueType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancer.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancer.java
new file mode 100644
index 000000000000..d4a3f5b6693a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancer.java
@@ -0,0 +1,322 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.BackendAddressPoolInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FrontendIPConfigurationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.InboundNatRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancingRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.OutboundRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ProbeInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerInner;
+
+/**
+ * Type representing LoadBalancer.
+ */
+public interface LoadBalancer extends HasInner<LoadBalancerInner>, Resource, GroupableResourceCore<NetworkManager, LoadBalancerInner>, HasResourceGroup, Refreshable<LoadBalancer>, Updatable<LoadBalancer.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the backendAddressPools value.
+     */
+    List<BackendAddressPool> backendAddressPools();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the frontendIPConfigurations value.
+     */
+    List<FrontendIPConfiguration> frontendIPConfigurations();
+
+    /**
+     * @return the inboundNatPools value.
+     */
+    List<InboundNatPool> inboundNatPools();
+
+    /**
+     * @return the inboundNatRules value.
+     */
+    List<InboundNatRule> inboundNatRules();
+
+    /**
+     * @return the loadBalancingRules value.
+     */
+    List<LoadBalancingRule> loadBalancingRules();
+
+    /**
+     * @return the outboundRules value.
+     */
+    List<OutboundRule> outboundRules();
+
+    /**
+     * @return the probes value.
+     */
+    List<Probe> probes();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    LoadBalancerSku sku();
+
+    /**
+     * The entirety of the LoadBalancer definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of LoadBalancer definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a LoadBalancer definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the LoadBalancer definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify BackendAddressPools.
+         */
+        interface WithBackendAddressPools {
+            /**
+             * Specifies backendAddressPools.
+             * @param backendAddressPools Collection of backend address pools used by a load balancer
+             * @return the next definition stage
+             */
+            WithCreate withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify FrontendIPConfigurations.
+         */
+        interface WithFrontendIPConfigurations {
+            /**
+             * Specifies frontendIPConfigurations.
+             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
+             * @return the next definition stage
+             */
+            WithCreate withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify InboundNatPools.
+         */
+        interface WithInboundNatPools {
+            /**
+             * Specifies inboundNatPools.
+             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
+             * @return the next definition stage
+             */
+            WithCreate withInboundNatPools(List<InboundNatPool> inboundNatPools);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify InboundNatRules.
+         */
+        interface WithInboundNatRules {
+            /**
+             * Specifies inboundNatRules.
+             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
+             * @return the next definition stage
+             */
+            WithCreate withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify LoadBalancingRules.
+         */
+        interface WithLoadBalancingRules {
+            /**
+             * Specifies loadBalancingRules.
+             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
+             * @return the next definition stage
+             */
+            WithCreate withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify OutboundRules.
+         */
+        interface WithOutboundRules {
+            /**
+             * Specifies outboundRules.
+             * @param outboundRules The outbound rules
+             * @return the next definition stage
+             */
+            WithCreate withOutboundRules(List<OutboundRuleInner> outboundRules);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify Probes.
+         */
+        interface WithProbes {
+            /**
+             * Specifies probes.
+             * @param probes Collection of probe objects used in the load balancer
+             * @return the next definition stage
+             */
+            WithCreate withProbes(List<ProbeInner> probes);
+        }
+
+        /**
+         * The stage of the loadbalancer definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The load balancer SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(LoadBalancerSku 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<LoadBalancer>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBackendAddressPools, DefinitionStages.WithFrontendIPConfigurations, DefinitionStages.WithInboundNatPools, DefinitionStages.WithInboundNatRules, DefinitionStages.WithLoadBalancingRules, DefinitionStages.WithOutboundRules, DefinitionStages.WithProbes, DefinitionStages.WithSku {
+        }
+    }
+    /**
+     * The template for a LoadBalancer update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<LoadBalancer>, Resource.UpdateWithTags<Update>, UpdateStages.WithBackendAddressPools, UpdateStages.WithFrontendIPConfigurations, UpdateStages.WithInboundNatPools, UpdateStages.WithInboundNatRules, UpdateStages.WithLoadBalancingRules, UpdateStages.WithOutboundRules, UpdateStages.WithProbes, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of LoadBalancer update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
+         */
+        interface WithBackendAddressPools {
+            /**
+             * Specifies backendAddressPools.
+             * @param backendAddressPools Collection of backend address pools used by a load balancer
+             * @return the next update stage
+             */
+            Update withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
+         */
+        interface WithFrontendIPConfigurations {
+            /**
+             * Specifies frontendIPConfigurations.
+             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
+             * @return the next update stage
+             */
+            Update withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify InboundNatPools.
+         */
+        interface WithInboundNatPools {
+            /**
+             * Specifies inboundNatPools.
+             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
+             * @return the next update stage
+             */
+            Update withInboundNatPools(List<InboundNatPool> inboundNatPools);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify InboundNatRules.
+         */
+        interface WithInboundNatRules {
+            /**
+             * Specifies inboundNatRules.
+             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
+             * @return the next update stage
+             */
+            Update withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
+         */
+        interface WithLoadBalancingRules {
+            /**
+             * Specifies loadBalancingRules.
+             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
+             * @return the next update stage
+             */
+            Update withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify OutboundRules.
+         */
+        interface WithOutboundRules {
+            /**
+             * Specifies outboundRules.
+             * @param outboundRules The outbound rules
+             * @return the next update stage
+             */
+            Update withOutboundRules(List<OutboundRuleInner> outboundRules);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify Probes.
+         */
+        interface WithProbes {
+            /**
+             * Specifies probes.
+             * @param probes Collection of probe objects used in the load balancer
+             * @return the next update stage
+             */
+            Update withProbes(List<ProbeInner> probes);
+        }
+
+        /**
+         * The stage of the loadbalancer update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The load balancer SKU
+             * @return the next update stage
+             */
+            Update withSku(LoadBalancerSku sku);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java
new file mode 100644
index 000000000000..6f7aa9e7a1b7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Load balancer backend addresses.
+ */
+@JsonFlatten
+public class LoadBalancerBackendAddress {
+    /**
+     * Reference to an existing virtual network.
+     */
+    @JsonProperty(value = "properties.virtualNetwork")
+    private VirtualNetworkInner virtualNetwork;
+
+    /**
+     * IP Address belonging to the referenced virtual network.
+     */
+    @JsonProperty(value = "properties.ipAddress")
+    private String ipAddress;
+
+    /**
+     * Reference to IP address defined in network interfaces.
+     */
+    @JsonProperty(value = "properties.networkInterfaceIPConfiguration")
+    private NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration;
+
+    /**
+     * Name of the backend address.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Get reference to an existing virtual network.
+     *
+     * @return the virtualNetwork value
+     */
+    public VirtualNetworkInner virtualNetwork() {
+        return this.virtualNetwork;
+    }
+
+    /**
+     * Set reference to an existing virtual network.
+     *
+     * @param virtualNetwork the virtualNetwork value to set
+     * @return the LoadBalancerBackendAddress object itself.
+     */
+    public LoadBalancerBackendAddress withVirtualNetwork(VirtualNetworkInner virtualNetwork) {
+        this.virtualNetwork = virtualNetwork;
+        return this;
+    }
+
+    /**
+     * Get iP Address belonging to the referenced virtual network.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set iP Address belonging to the referenced virtual network.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the LoadBalancerBackendAddress object itself.
+     */
+    public LoadBalancerBackendAddress withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * Get reference to IP address defined in network interfaces.
+     *
+     * @return the networkInterfaceIPConfiguration value
+     */
+    public NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration() {
+        return this.networkInterfaceIPConfiguration;
+    }
+
+    /**
+     * Set reference to IP address defined in network interfaces.
+     *
+     * @param networkInterfaceIPConfiguration the networkInterfaceIPConfiguration value to set
+     * @return the LoadBalancerBackendAddress object itself.
+     */
+    public LoadBalancerBackendAddress withNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration) {
+        this.networkInterfaceIPConfiguration = networkInterfaceIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get name of the backend address.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the backend address.
+     *
+     * @param name the name value to set
+     * @return the LoadBalancerBackendAddress object itself.
+     */
+    public LoadBalancerBackendAddress withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddressPools.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddressPools.java
new file mode 100644
index 000000000000..5aef41dca2cd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddressPools.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerBackendAddressPoolsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerBackendAddressPools.
+ */
+public interface LoadBalancerBackendAddressPools extends SupportsCreating<BackendAddressPool.DefinitionStages.Blank>, HasInner<LoadBalancerBackendAddressPoolsInner> {
+    /**
+     * Gets load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<BackendAddressPool> getAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName);
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<BackendAddressPool> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerFrontendIPConfigurations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerFrontendIPConfigurations.java
new file mode 100644
index 000000000000..1d00e114b504
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerFrontendIPConfigurations.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerFrontendIPConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerFrontendIPConfigurations.
+ */
+public interface LoadBalancerFrontendIPConfigurations extends HasInner<LoadBalancerFrontendIPConfigurationsInner> {
+    /**
+     * Gets load balancer frontend IP configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param frontendIPConfigurationName The name of the frontend IP configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FrontendIPConfiguration> getAsync(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName);
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FrontendIPConfiguration> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerLoadBalancingRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerLoadBalancingRules.java
new file mode 100644
index 000000000000..f3a93bb089dc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerLoadBalancingRules.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerLoadBalancingRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerLoadBalancingRules.
+ */
+public interface LoadBalancerLoadBalancingRules extends HasInner<LoadBalancerLoadBalancingRulesInner> {
+    /**
+     * Gets the specified load balancer load balancing rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param loadBalancingRuleName The name of the load balancing rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancingRule> getAsync(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName);
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancingRule> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterface.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterface.java
new file mode 100644
index 000000000000..5cd564197f25
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterface.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import java.util.Map;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing LoadBalancerNetworkInterface.
+ */
+public interface LoadBalancerNetworkInterface extends HasInner<NetworkInterfaceInner>, HasManager<NetworkManager> {
+    /**
+     * @return the dnsSettings value.
+     */
+    NetworkInterfaceDnsSettings dnsSettings();
+
+    /**
+     * @return the enableAcceleratedNetworking value.
+     */
+    Boolean enableAcceleratedNetworking();
+
+    /**
+     * @return the enableIPForwarding value.
+     */
+    Boolean enableIPForwarding();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the hostedWorkloads value.
+     */
+    List<String> hostedWorkloads();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> ipConfigurations();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the macAddress value.
+     */
+    String macAddress();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the networkSecurityGroup value.
+     */
+    NetworkSecurityGroup networkSecurityGroup();
+
+    /**
+     * @return the primary value.
+     */
+    Boolean primary();
+
+    /**
+     * @return the privateEndpoint value.
+     */
+    PrivateEndpoint privateEndpoint();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the tapConfigurations value.
+     */
+    List<NetworkInterfaceTapConfiguration> tapConfigurations();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the virtualMachine value.
+     */
+    SubResource virtualMachine();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterfaces.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterfaces.java
new file mode 100644
index 000000000000..260bd02f6432
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerNetworkInterfaces.java
@@ -0,0 +1,29 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerNetworkInterfacesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerNetworkInterfaces.
+ */
+public interface LoadBalancerNetworkInterfaces extends HasInner<LoadBalancerNetworkInterfacesInner> {
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancerNetworkInterface> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRuleProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRuleProtocol.java
new file mode 100644
index 000000000000..e6f9959c898a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRuleProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for LoadBalancerOutboundRuleProtocol.
+ */
+public final class LoadBalancerOutboundRuleProtocol extends ExpandableStringEnum<LoadBalancerOutboundRuleProtocol> {
+    /** Static value Tcp for LoadBalancerOutboundRuleProtocol. */
+    public static final LoadBalancerOutboundRuleProtocol TCP = fromString("Tcp");
+
+    /** Static value Udp for LoadBalancerOutboundRuleProtocol. */
+    public static final LoadBalancerOutboundRuleProtocol UDP = fromString("Udp");
+
+    /** Static value All for LoadBalancerOutboundRuleProtocol. */
+    public static final LoadBalancerOutboundRuleProtocol ALL = fromString("All");
+
+    /**
+     * Creates or finds a LoadBalancerOutboundRuleProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding LoadBalancerOutboundRuleProtocol
+     */
+    @JsonCreator
+    public static LoadBalancerOutboundRuleProtocol fromString(String name) {
+        return fromString(name, LoadBalancerOutboundRuleProtocol.class);
+    }
+
+    /**
+     * @return known LoadBalancerOutboundRuleProtocol values
+     */
+    public static Collection<LoadBalancerOutboundRuleProtocol> values() {
+        return values(LoadBalancerOutboundRuleProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRules.java
new file mode 100644
index 000000000000..e5962ec81ce2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerOutboundRules.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerOutboundRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerOutboundRules.
+ */
+public interface LoadBalancerOutboundRules extends HasInner<LoadBalancerOutboundRulesInner> {
+    /**
+     * Gets the specified load balancer outbound rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param outboundRuleName The name of the outbound rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OutboundRule> getAsync(String resourceGroupName, String loadBalancerName, String outboundRuleName);
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OutboundRule> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerProbes.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerProbes.java
new file mode 100644
index 000000000000..bffc9982551c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerProbes.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerProbesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancerProbes.
+ */
+public interface LoadBalancerProbes extends HasInner<LoadBalancerProbesInner> {
+    /**
+     * Gets load balancer probe.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param probeName The name of the probe.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Probe> getAsync(String resourceGroupName, String loadBalancerName, String probeName);
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Probe> listAsync(final String resourceGroupName, final String loadBalancerName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSku.java
new file mode 100644
index 000000000000..6b2f9ecc489b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of a load balancer.
+ */
+public class LoadBalancerSku {
+    /**
+     * Name of a load balancer SKU. Possible values include: 'Basic',
+     * 'Standard'.
+     */
+    @JsonProperty(value = "name")
+    private LoadBalancerSkuName name;
+
+    /**
+     * Get name of a load balancer SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the name value
+     */
+    public LoadBalancerSkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of a load balancer SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the LoadBalancerSku object itself.
+     */
+    public LoadBalancerSku withName(LoadBalancerSkuName name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSkuName.java
new file mode 100644
index 000000000000..c4ed6785a0e2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerSkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for LoadBalancerSkuName.
+ */
+public final class LoadBalancerSkuName extends ExpandableStringEnum<LoadBalancerSkuName> {
+    /** Static value Basic for LoadBalancerSkuName. */
+    public static final LoadBalancerSkuName BASIC = fromString("Basic");
+
+    /** Static value Standard for LoadBalancerSkuName. */
+    public static final LoadBalancerSkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a LoadBalancerSkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding LoadBalancerSkuName
+     */
+    @JsonCreator
+    public static LoadBalancerSkuName fromString(String name) {
+        return fromString(name, LoadBalancerSkuName.class);
+    }
+
+    /**
+     * @return known LoadBalancerSkuName values
+     */
+    public static Collection<LoadBalancerSkuName> values() {
+        return values(LoadBalancerSkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancers.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancers.java
new file mode 100644
index 000000000000..87d38d67744e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancers.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.LoadBalancersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LoadBalancers.
+ */
+public interface LoadBalancers extends SupportsCreating<LoadBalancer.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<LoadBalancer>, SupportsListingByResourceGroup<LoadBalancer>, SupportsListing<LoadBalancer>, HasInner<LoadBalancersInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancingRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancingRule.java
new file mode 100644
index 000000000000..73bdcc794184
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancingRule.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancingRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing LoadBalancingRule.
+ */
+public interface LoadBalancingRule extends HasInner<LoadBalancingRuleInner>, Indexable, Refreshable<LoadBalancingRule>, HasManager<NetworkManager> {
+    /**
+     * @return the backendAddressPool value.
+     */
+    SubResource backendAddressPool();
+
+    /**
+     * @return the backendPort value.
+     */
+    Integer backendPort();
+
+    /**
+     * @return the disableOutboundSnat value.
+     */
+    Boolean disableOutboundSnat();
+
+    /**
+     * @return the enableFloatingIP value.
+     */
+    Boolean enableFloatingIP();
+
+    /**
+     * @return the enableTcpReset value.
+     */
+    Boolean enableTcpReset();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the frontendIPConfiguration value.
+     */
+    SubResource frontendIPConfiguration();
+
+    /**
+     * @return the frontendPort value.
+     */
+    int frontendPort();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the idleTimeoutInMinutes value.
+     */
+    Integer idleTimeoutInMinutes();
+
+    /**
+     * @return the loadDistribution value.
+     */
+    LoadDistribution loadDistribution();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the probe value.
+     */
+    SubResource probe();
+
+    /**
+     * @return the protocol value.
+     */
+    TransportProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadDistribution.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadDistribution.java
new file mode 100644
index 000000000000..de2bd8f28bd8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadDistribution.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for LoadDistribution.
+ */
+public final class LoadDistribution extends ExpandableStringEnum<LoadDistribution> {
+    /** Static value Default for LoadDistribution. */
+    public static final LoadDistribution DEFAULT = fromString("Default");
+
+    /** Static value SourceIP for LoadDistribution. */
+    public static final LoadDistribution SOURCE_IP = fromString("SourceIP");
+
+    /** Static value SourceIPProtocol for LoadDistribution. */
+    public static final LoadDistribution SOURCE_IPPROTOCOL = fromString("SourceIPProtocol");
+
+    /**
+     * Creates or finds a LoadDistribution from its string representation.
+     * @param name a name to look for
+     * @return the corresponding LoadDistribution
+     */
+    @JsonCreator
+    public static LoadDistribution fromString(String name) {
+        return fromString(name, LoadDistribution.class);
+    }
+
+    /**
+     * @return known LoadDistribution values
+     */
+    public static Collection<LoadDistribution> values() {
+        return values(LoadDistribution.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateway.java
new file mode 100644
index 000000000000..bf84afd4e322
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateway.java
@@ -0,0 +1,199 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LocalNetworkGatewayInner;
+
+/**
+ * Type representing LocalNetworkGateway.
+ */
+public interface LocalNetworkGateway extends HasInner<LocalNetworkGatewayInner>, Resource, GroupableResourceCore<NetworkManager, LocalNetworkGatewayInner>, HasResourceGroup, Refreshable<LocalNetworkGateway>, Updatable<LocalNetworkGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the bgpSettings value.
+     */
+    BgpSettings bgpSettings();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the fqdn value.
+     */
+    String fqdn();
+
+    /**
+     * @return the gatewayIpAddress value.
+     */
+    String gatewayIpAddress();
+
+    /**
+     * @return the localNetworkAddressSpace value.
+     */
+    AddressSpace localNetworkAddressSpace();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the LocalNetworkGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of LocalNetworkGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a LocalNetworkGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the LocalNetworkGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the localnetworkgateway definition allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Local network gateway's BGP speaker settings
+             * @return the next definition stage
+             */
+            WithCreate withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the localnetworkgateway definition allowing to specify Fqdn.
+         */
+        interface WithFqdn {
+            /**
+             * Specifies fqdn.
+             * @param fqdn FQDN of local network gateway
+             * @return the next definition stage
+             */
+            WithCreate withFqdn(String fqdn);
+        }
+
+        /**
+         * The stage of the localnetworkgateway definition allowing to specify GatewayIpAddress.
+         */
+        interface WithGatewayIpAddress {
+            /**
+             * Specifies gatewayIpAddress.
+             * @param gatewayIpAddress IP address of local network gateway
+             * @return the next definition stage
+             */
+            WithCreate withGatewayIpAddress(String gatewayIpAddress);
+        }
+
+        /**
+         * The stage of the localnetworkgateway definition allowing to specify LocalNetworkAddressSpace.
+         */
+        interface WithLocalNetworkAddressSpace {
+            /**
+             * Specifies localNetworkAddressSpace.
+             * @param localNetworkAddressSpace Local network site address space
+             * @return the next definition stage
+             */
+            WithCreate withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
+        }
+
+        /**
+         * 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<LocalNetworkGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBgpSettings, DefinitionStages.WithFqdn, DefinitionStages.WithGatewayIpAddress, DefinitionStages.WithLocalNetworkAddressSpace {
+        }
+    }
+    /**
+     * The template for a LocalNetworkGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<LocalNetworkGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithBgpSettings, UpdateStages.WithFqdn, UpdateStages.WithGatewayIpAddress, UpdateStages.WithLocalNetworkAddressSpace {
+    }
+
+    /**
+     * Grouping of LocalNetworkGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Local network gateway's BGP speaker settings
+             * @return the next update stage
+             */
+            Update withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the localnetworkgateway update allowing to specify Fqdn.
+         */
+        interface WithFqdn {
+            /**
+             * Specifies fqdn.
+             * @param fqdn FQDN of local network gateway
+             * @return the next update stage
+             */
+            Update withFqdn(String fqdn);
+        }
+
+        /**
+         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
+         */
+        interface WithGatewayIpAddress {
+            /**
+             * Specifies gatewayIpAddress.
+             * @param gatewayIpAddress IP address of local network gateway
+             * @return the next update stage
+             */
+            Update withGatewayIpAddress(String gatewayIpAddress);
+        }
+
+        /**
+         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
+         */
+        interface WithLocalNetworkAddressSpace {
+            /**
+             * Specifies localNetworkAddressSpace.
+             * @param localNetworkAddressSpace Local network site address space
+             * @return the next update stage
+             */
+            Update withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateways.java
new file mode 100644
index 000000000000..9c3dbc9d3fb2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocalNetworkGateways.java
@@ -0,0 +1,24 @@
+/**
+ * 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.network.v2020_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.management.network.v2020_04_01.implementation.LocalNetworkGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing LocalNetworkGateways.
+ */
+public interface LocalNetworkGateways extends SupportsCreating<LocalNetworkGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<LocalNetworkGateway>, SupportsListingByResourceGroup<LocalNetworkGateway>, HasInner<LocalNetworkGatewaysInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegation.java
new file mode 100644
index 000000000000..8eedf8f1f3c1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegation.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableDelegationInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing LocationAvailableDelegation.
+ */
+public interface LocationAvailableDelegation extends HasInner<AvailableDelegationInner>, HasManager<NetworkManager> {
+    /**
+     * @return the actions value.
+     */
+    List<String> actions();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the serviceName value.
+     */
+    String serviceName();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegationModel.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegationModel.java
new file mode 100644
index 000000000000..17ab4d48982b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LocationAvailableDelegationModel.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.AvailableDelegationInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing LocationAvailableDelegationModel.
+ */
+public interface LocationAvailableDelegationModel extends HasInner<AvailableDelegationInner>, HasManager<NetworkManager> {
+    /**
+     * @return the actions value.
+     */
+    List<String> actions();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the serviceName value.
+     */
+    String serviceName();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LogSpecification.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LogSpecification.java
new file mode 100644
index 000000000000..63ea5e4a3a5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LogSpecification.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Description of logging specification.
+ */
+public class LogSpecification {
+    /**
+     * The name of the specification.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The display name of the specification.
+     */
+    @JsonProperty(value = "displayName")
+    private String displayName;
+
+    /**
+     * Duration of the blob.
+     */
+    @JsonProperty(value = "blobDuration")
+    private String blobDuration;
+
+    /**
+     * Get the name of the specification.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the specification.
+     *
+     * @param name the name value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the display name of the specification.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the specification.
+     *
+     * @param displayName the displayName value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get duration of the blob.
+     *
+     * @return the blobDuration value
+     */
+    public String blobDuration() {
+        return this.blobDuration;
+    }
+
+    /**
+     * Set duration of the blob.
+     *
+     * @param blobDuration the blobDuration value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withBlobDuration(String blobDuration) {
+        this.blobDuration = blobDuration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleEnabledState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleEnabledState.java
new file mode 100644
index 000000000000..06208b903d94
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleEnabledState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ManagedRuleEnabledState.
+ */
+public final class ManagedRuleEnabledState extends ExpandableStringEnum<ManagedRuleEnabledState> {
+    /** Static value Disabled for ManagedRuleEnabledState. */
+    public static final ManagedRuleEnabledState DISABLED = fromString("Disabled");
+
+    /**
+     * Creates or finds a ManagedRuleEnabledState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ManagedRuleEnabledState
+     */
+    @JsonCreator
+    public static ManagedRuleEnabledState fromString(String name) {
+        return fromString(name, ManagedRuleEnabledState.class);
+    }
+
+    /**
+     * @return known ManagedRuleEnabledState values
+     */
+    public static Collection<ManagedRuleEnabledState> values() {
+        return values(ManagedRuleEnabledState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleGroupOverride.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleGroupOverride.java
new file mode 100644
index 000000000000..1a348bb13c24
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleGroupOverride.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines a managed rule group override setting.
+ */
+public class ManagedRuleGroupOverride {
+    /**
+     * The managed rule group to override.
+     */
+    @JsonProperty(value = "ruleGroupName", required = true)
+    private String ruleGroupName;
+
+    /**
+     * List of rules that will be disabled. If none specified, all rules in the
+     * group will be disabled.
+     */
+    @JsonProperty(value = "rules")
+    private List<ManagedRuleOverride> rules;
+
+    /**
+     * Get the managed rule group to override.
+     *
+     * @return the ruleGroupName value
+     */
+    public String ruleGroupName() {
+        return this.ruleGroupName;
+    }
+
+    /**
+     * Set the managed rule group to override.
+     *
+     * @param ruleGroupName the ruleGroupName value to set
+     * @return the ManagedRuleGroupOverride object itself.
+     */
+    public ManagedRuleGroupOverride withRuleGroupName(String ruleGroupName) {
+        this.ruleGroupName = ruleGroupName;
+        return this;
+    }
+
+    /**
+     * Get list of rules that will be disabled. If none specified, all rules in the group will be disabled.
+     *
+     * @return the rules value
+     */
+    public List<ManagedRuleOverride> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set list of rules that will be disabled. If none specified, all rules in the group will be disabled.
+     *
+     * @param rules the rules value to set
+     * @return the ManagedRuleGroupOverride object itself.
+     */
+    public ManagedRuleGroupOverride withRules(List<ManagedRuleOverride> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleOverride.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleOverride.java
new file mode 100644
index 000000000000..9fc7734d3402
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleOverride.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines a managed rule group override setting.
+ */
+public class ManagedRuleOverride {
+    /**
+     * Identifier for the managed rule.
+     */
+    @JsonProperty(value = "ruleId", required = true)
+    private String ruleId;
+
+    /**
+     * The state of the managed rule. Defaults to Disabled if not specified.
+     * Possible values include: 'Disabled'.
+     */
+    @JsonProperty(value = "state")
+    private ManagedRuleEnabledState state;
+
+    /**
+     * Get identifier for the managed rule.
+     *
+     * @return the ruleId value
+     */
+    public String ruleId() {
+        return this.ruleId;
+    }
+
+    /**
+     * Set identifier for the managed rule.
+     *
+     * @param ruleId the ruleId value to set
+     * @return the ManagedRuleOverride object itself.
+     */
+    public ManagedRuleOverride withRuleId(String ruleId) {
+        this.ruleId = ruleId;
+        return this;
+    }
+
+    /**
+     * Get the state of the managed rule. Defaults to Disabled if not specified. Possible values include: 'Disabled'.
+     *
+     * @return the state value
+     */
+    public ManagedRuleEnabledState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the state of the managed rule. Defaults to Disabled if not specified. Possible values include: 'Disabled'.
+     *
+     * @param state the state value to set
+     * @return the ManagedRuleOverride object itself.
+     */
+    public ManagedRuleOverride withState(ManagedRuleEnabledState state) {
+        this.state = state;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleSet.java
new file mode 100644
index 000000000000..3a06741cf750
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRuleSet.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines a managed rule set.
+ */
+public class ManagedRuleSet {
+    /**
+     * Defines the rule set type to use.
+     */
+    @JsonProperty(value = "ruleSetType", required = true)
+    private String ruleSetType;
+
+    /**
+     * Defines the version of the rule set to use.
+     */
+    @JsonProperty(value = "ruleSetVersion", required = true)
+    private String ruleSetVersion;
+
+    /**
+     * Defines the rule group overrides to apply to the rule set.
+     */
+    @JsonProperty(value = "ruleGroupOverrides")
+    private List<ManagedRuleGroupOverride> ruleGroupOverrides;
+
+    /**
+     * Get defines the rule set type to use.
+     *
+     * @return the ruleSetType value
+     */
+    public String ruleSetType() {
+        return this.ruleSetType;
+    }
+
+    /**
+     * Set defines the rule set type to use.
+     *
+     * @param ruleSetType the ruleSetType value to set
+     * @return the ManagedRuleSet object itself.
+     */
+    public ManagedRuleSet withRuleSetType(String ruleSetType) {
+        this.ruleSetType = ruleSetType;
+        return this;
+    }
+
+    /**
+     * Get defines the version of the rule set to use.
+     *
+     * @return the ruleSetVersion value
+     */
+    public String ruleSetVersion() {
+        return this.ruleSetVersion;
+    }
+
+    /**
+     * Set defines the version of the rule set to use.
+     *
+     * @param ruleSetVersion the ruleSetVersion value to set
+     * @return the ManagedRuleSet object itself.
+     */
+    public ManagedRuleSet withRuleSetVersion(String ruleSetVersion) {
+        this.ruleSetVersion = ruleSetVersion;
+        return this;
+    }
+
+    /**
+     * Get defines the rule group overrides to apply to the rule set.
+     *
+     * @return the ruleGroupOverrides value
+     */
+    public List<ManagedRuleGroupOverride> ruleGroupOverrides() {
+        return this.ruleGroupOverrides;
+    }
+
+    /**
+     * Set defines the rule group overrides to apply to the rule set.
+     *
+     * @param ruleGroupOverrides the ruleGroupOverrides value to set
+     * @return the ManagedRuleSet object itself.
+     */
+    public ManagedRuleSet withRuleGroupOverrides(List<ManagedRuleGroupOverride> ruleGroupOverrides) {
+        this.ruleGroupOverrides = ruleGroupOverrides;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRulesDefinition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRulesDefinition.java
new file mode 100644
index 000000000000..821428991a5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedRulesDefinition.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Allow to exclude some variable satisfy the condition for the WAF check.
+ */
+public class ManagedRulesDefinition {
+    /**
+     * The Exclusions that are applied on the policy.
+     */
+    @JsonProperty(value = "exclusions")
+    private List<OwaspCrsExclusionEntry> exclusions;
+
+    /**
+     * The managed rule sets that are associated with the policy.
+     */
+    @JsonProperty(value = "managedRuleSets", required = true)
+    private List<ManagedRuleSet> managedRuleSets;
+
+    /**
+     * Get the Exclusions that are applied on the policy.
+     *
+     * @return the exclusions value
+     */
+    public List<OwaspCrsExclusionEntry> exclusions() {
+        return this.exclusions;
+    }
+
+    /**
+     * Set the Exclusions that are applied on the policy.
+     *
+     * @param exclusions the exclusions value to set
+     * @return the ManagedRulesDefinition object itself.
+     */
+    public ManagedRulesDefinition withExclusions(List<OwaspCrsExclusionEntry> exclusions) {
+        this.exclusions = exclusions;
+        return this;
+    }
+
+    /**
+     * Get the managed rule sets that are associated with the policy.
+     *
+     * @return the managedRuleSets value
+     */
+    public List<ManagedRuleSet> managedRuleSets() {
+        return this.managedRuleSets;
+    }
+
+    /**
+     * Set the managed rule sets that are associated with the policy.
+     *
+     * @param managedRuleSets the managedRuleSets value to set
+     * @return the ManagedRulesDefinition object itself.
+     */
+    public ManagedRulesDefinition withManagedRuleSets(List<ManagedRuleSet> managedRuleSets) {
+        this.managedRuleSets = managedRuleSets;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentity.java
new file mode 100644
index 000000000000..fe7b905353cf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentity.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.network.v2020_04_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Identity for the resource.
+ */
+public class ManagedServiceIdentity {
+    /**
+     * The principal id of the system assigned identity. This property will
+     * only be provided for a system assigned identity.
+     */
+    @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+    private String principalId;
+
+    /**
+     * The tenant id of the system assigned identity. This property will only
+     * be provided for a system assigned identity.
+     */
+    @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
+    private String tenantId;
+
+    /**
+     * The type of identity used for the resource. The type 'SystemAssigned,
+     * UserAssigned' includes both an implicitly created identity and a set of
+     * user assigned identities. The type 'None' will remove any identities
+     * from the virtual machine. Possible values include: 'SystemAssigned',
+     * 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
+     */
+    @JsonProperty(value = "type")
+    private ResourceIdentityType type;
+
+    /**
+     * The list of user identities associated with resource. The user identity
+     * dictionary key references will be ARM resource ids in the form:
+     * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+     */
+    @JsonProperty(value = "userAssignedIdentities")
+    private Map<String, ManagedServiceIdentityUserAssignedIdentitiesValue> userAssignedIdentities;
+
+    /**
+     * Get the principal id of the system assigned identity. This property will only be provided for a system assigned identity.
+     *
+     * @return the principalId value
+     */
+    public String principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Get the tenant id of the system assigned identity. This property will only be provided for a system assigned identity.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Get the type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
+     *
+     * @return the type value
+     */
+    public ResourceIdentityType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
+     *
+     * @param type the type value to set
+     * @return the ManagedServiceIdentity object itself.
+     */
+    public ManagedServiceIdentity withType(ResourceIdentityType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the list of user identities associated with resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+     *
+     * @return the userAssignedIdentities value
+     */
+    public Map<String, ManagedServiceIdentityUserAssignedIdentitiesValue> userAssignedIdentities() {
+        return this.userAssignedIdentities;
+    }
+
+    /**
+     * Set the list of user identities associated with resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+     *
+     * @param userAssignedIdentities the userAssignedIdentities value to set
+     * @return the ManagedServiceIdentity object itself.
+     */
+    public ManagedServiceIdentity withUserAssignedIdentities(Map<String, ManagedServiceIdentityUserAssignedIdentitiesValue> userAssignedIdentities) {
+        this.userAssignedIdentities = userAssignedIdentities;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentityUserAssignedIdentitiesValue.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentityUserAssignedIdentitiesValue.java
new file mode 100644
index 000000000000..f9e82b569eae
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ManagedServiceIdentityUserAssignedIdentitiesValue.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ManagedServiceIdentityUserAssignedIdentitiesValue model.
+ */
+public class ManagedServiceIdentityUserAssignedIdentitiesValue {
+    /**
+     * The principal id of user assigned identity.
+     */
+    @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+    private String principalId;
+
+    /**
+     * The client id of user assigned identity.
+     */
+    @JsonProperty(value = "clientId", access = JsonProperty.Access.WRITE_ONLY)
+    private String clientId;
+
+    /**
+     * Get the principal id of user assigned identity.
+     *
+     * @return the principalId value
+     */
+    public String principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Get the client id of user assigned identity.
+     *
+     * @return the clientId value
+     */
+    public String clientId() {
+        return this.clientId;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchCondition.java
new file mode 100644
index 000000000000..f2ed67277797
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchCondition.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Define match conditions.
+ */
+public class MatchCondition {
+    /**
+     * List of match variables.
+     */
+    @JsonProperty(value = "matchVariables", required = true)
+    private List<MatchVariable> matchVariables;
+
+    /**
+     * The operator to be matched. Possible values include: 'IPMatch', 'Equal',
+     * 'Contains', 'LessThan', 'GreaterThan', 'LessThanOrEqual',
+     * 'GreaterThanOrEqual', 'BeginsWith', 'EndsWith', 'Regex', 'GeoMatch'.
+     */
+    @JsonProperty(value = "operator", required = true)
+    private WebApplicationFirewallOperator operator;
+
+    /**
+     * Whether this is negate condition or not.
+     */
+    @JsonProperty(value = "negationConditon")
+    private Boolean negationConditon;
+
+    /**
+     * Match value.
+     */
+    @JsonProperty(value = "matchValues", required = true)
+    private List<String> matchValues;
+
+    /**
+     * List of transforms.
+     */
+    @JsonProperty(value = "transforms")
+    private List<WebApplicationFirewallTransform> transforms;
+
+    /**
+     * Get list of match variables.
+     *
+     * @return the matchVariables value
+     */
+    public List<MatchVariable> matchVariables() {
+        return this.matchVariables;
+    }
+
+    /**
+     * Set list of match variables.
+     *
+     * @param matchVariables the matchVariables value to set
+     * @return the MatchCondition object itself.
+     */
+    public MatchCondition withMatchVariables(List<MatchVariable> matchVariables) {
+        this.matchVariables = matchVariables;
+        return this;
+    }
+
+    /**
+     * Get the operator to be matched. Possible values include: 'IPMatch', 'Equal', 'Contains', 'LessThan', 'GreaterThan', 'LessThanOrEqual', 'GreaterThanOrEqual', 'BeginsWith', 'EndsWith', 'Regex', 'GeoMatch'.
+     *
+     * @return the operator value
+     */
+    public WebApplicationFirewallOperator operator() {
+        return this.operator;
+    }
+
+    /**
+     * Set the operator to be matched. Possible values include: 'IPMatch', 'Equal', 'Contains', 'LessThan', 'GreaterThan', 'LessThanOrEqual', 'GreaterThanOrEqual', 'BeginsWith', 'EndsWith', 'Regex', 'GeoMatch'.
+     *
+     * @param operator the operator value to set
+     * @return the MatchCondition object itself.
+     */
+    public MatchCondition withOperator(WebApplicationFirewallOperator operator) {
+        this.operator = operator;
+        return this;
+    }
+
+    /**
+     * Get whether this is negate condition or not.
+     *
+     * @return the negationConditon value
+     */
+    public Boolean negationConditon() {
+        return this.negationConditon;
+    }
+
+    /**
+     * Set whether this is negate condition or not.
+     *
+     * @param negationConditon the negationConditon value to set
+     * @return the MatchCondition object itself.
+     */
+    public MatchCondition withNegationConditon(Boolean negationConditon) {
+        this.negationConditon = negationConditon;
+        return this;
+    }
+
+    /**
+     * Get match value.
+     *
+     * @return the matchValues value
+     */
+    public List<String> matchValues() {
+        return this.matchValues;
+    }
+
+    /**
+     * Set match value.
+     *
+     * @param matchValues the matchValues value to set
+     * @return the MatchCondition object itself.
+     */
+    public MatchCondition withMatchValues(List<String> matchValues) {
+        this.matchValues = matchValues;
+        return this;
+    }
+
+    /**
+     * Get list of transforms.
+     *
+     * @return the transforms value
+     */
+    public List<WebApplicationFirewallTransform> transforms() {
+        return this.transforms;
+    }
+
+    /**
+     * Set list of transforms.
+     *
+     * @param transforms the transforms value to set
+     * @return the MatchCondition object itself.
+     */
+    public MatchCondition withTransforms(List<WebApplicationFirewallTransform> transforms) {
+        this.transforms = transforms;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchVariable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchVariable.java
new file mode 100644
index 000000000000..5945e9c28e3b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchVariable.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Define match variables.
+ */
+public class MatchVariable {
+    /**
+     * Match Variable. Possible values include: 'RemoteAddr', 'RequestMethod',
+     * 'QueryString', 'PostArgs', 'RequestUri', 'RequestHeaders',
+     * 'RequestBody', 'RequestCookies'.
+     */
+    @JsonProperty(value = "variableName", required = true)
+    private WebApplicationFirewallMatchVariable variableName;
+
+    /**
+     * The selector of match variable.
+     */
+    @JsonProperty(value = "selector")
+    private String selector;
+
+    /**
+     * Get match Variable. Possible values include: 'RemoteAddr', 'RequestMethod', 'QueryString', 'PostArgs', 'RequestUri', 'RequestHeaders', 'RequestBody', 'RequestCookies'.
+     *
+     * @return the variableName value
+     */
+    public WebApplicationFirewallMatchVariable variableName() {
+        return this.variableName;
+    }
+
+    /**
+     * Set match Variable. Possible values include: 'RemoteAddr', 'RequestMethod', 'QueryString', 'PostArgs', 'RequestUri', 'RequestHeaders', 'RequestBody', 'RequestCookies'.
+     *
+     * @param variableName the variableName value to set
+     * @return the MatchVariable object itself.
+     */
+    public MatchVariable withVariableName(WebApplicationFirewallMatchVariable variableName) {
+        this.variableName = variableName;
+        return this;
+    }
+
+    /**
+     * Get the selector of match variable.
+     *
+     * @return the selector value
+     */
+    public String selector() {
+        return this.selector;
+    }
+
+    /**
+     * Set the selector of match variable.
+     *
+     * @param selector the selector value to set
+     * @return the MatchVariable object itself.
+     */
+    public MatchVariable withSelector(String selector) {
+        this.selector = selector;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchedRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchedRule.java
new file mode 100644
index 000000000000..a53e485c3ec0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MatchedRule.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Matched rule.
+ */
+public class MatchedRule {
+    /**
+     * Name of the matched network security rule.
+     */
+    @JsonProperty(value = "ruleName")
+    private String ruleName;
+
+    /**
+     * The network traffic is allowed or denied. Possible values are 'Allow'
+     * and 'Deny'.
+     */
+    @JsonProperty(value = "action")
+    private String action;
+
+    /**
+     * Get name of the matched network security rule.
+     *
+     * @return the ruleName value
+     */
+    public String ruleName() {
+        return this.ruleName;
+    }
+
+    /**
+     * Set name of the matched network security rule.
+     *
+     * @param ruleName the ruleName value to set
+     * @return the MatchedRule object itself.
+     */
+    public MatchedRule withRuleName(String ruleName) {
+        this.ruleName = ruleName;
+        return this;
+    }
+
+    /**
+     * Get the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'.
+     *
+     * @return the action value
+     */
+    public String action() {
+        return this.action;
+    }
+
+    /**
+     * Set the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'.
+     *
+     * @param action the action value to set
+     * @return the MatchedRule object itself.
+     */
+    public MatchedRule withAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MetricSpecification.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MetricSpecification.java
new file mode 100644
index 000000000000..5d5574d2eb9c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/MetricSpecification.java
@@ -0,0 +1,382 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Description of metrics specification.
+ */
+public class MetricSpecification {
+    /**
+     * The name of the metric.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The display name of the metric.
+     */
+    @JsonProperty(value = "displayName")
+    private String displayName;
+
+    /**
+     * The description of the metric.
+     */
+    @JsonProperty(value = "displayDescription")
+    private String displayDescription;
+
+    /**
+     * Units the metric to be displayed in.
+     */
+    @JsonProperty(value = "unit")
+    private String unit;
+
+    /**
+     * The aggregation type.
+     */
+    @JsonProperty(value = "aggregationType")
+    private String aggregationType;
+
+    /**
+     * List of availability.
+     */
+    @JsonProperty(value = "availabilities")
+    private List<Availability> availabilities;
+
+    /**
+     * Whether regional MDM account enabled.
+     */
+    @JsonProperty(value = "enableRegionalMdmAccount")
+    private Boolean enableRegionalMdmAccount;
+
+    /**
+     * Whether gaps would be filled with zeros.
+     */
+    @JsonProperty(value = "fillGapWithZero")
+    private Boolean fillGapWithZero;
+
+    /**
+     * Pattern for the filter of the metric.
+     */
+    @JsonProperty(value = "metricFilterPattern")
+    private String metricFilterPattern;
+
+    /**
+     * List of dimensions.
+     */
+    @JsonProperty(value = "dimensions")
+    private List<Dimension> dimensions;
+
+    /**
+     * Whether the metric is internal.
+     */
+    @JsonProperty(value = "isInternal")
+    private Boolean isInternal;
+
+    /**
+     * The source MDM account.
+     */
+    @JsonProperty(value = "sourceMdmAccount")
+    private String sourceMdmAccount;
+
+    /**
+     * The source MDM namespace.
+     */
+    @JsonProperty(value = "sourceMdmNamespace")
+    private String sourceMdmNamespace;
+
+    /**
+     * The resource Id dimension name override.
+     */
+    @JsonProperty(value = "resourceIdDimensionNameOverride")
+    private String resourceIdDimensionNameOverride;
+
+    /**
+     * Get the name of the metric.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the metric.
+     *
+     * @param name the name value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the display name of the metric.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the metric.
+     *
+     * @param displayName the displayName value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the description of the metric.
+     *
+     * @return the displayDescription value
+     */
+    public String displayDescription() {
+        return this.displayDescription;
+    }
+
+    /**
+     * Set the description of the metric.
+     *
+     * @param displayDescription the displayDescription value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withDisplayDescription(String displayDescription) {
+        this.displayDescription = displayDescription;
+        return this;
+    }
+
+    /**
+     * Get units the metric to be displayed in.
+     *
+     * @return the unit value
+     */
+    public String unit() {
+        return this.unit;
+    }
+
+    /**
+     * Set units the metric to be displayed in.
+     *
+     * @param unit the unit value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withUnit(String unit) {
+        this.unit = unit;
+        return this;
+    }
+
+    /**
+     * Get the aggregation type.
+     *
+     * @return the aggregationType value
+     */
+    public String aggregationType() {
+        return this.aggregationType;
+    }
+
+    /**
+     * Set the aggregation type.
+     *
+     * @param aggregationType the aggregationType value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withAggregationType(String aggregationType) {
+        this.aggregationType = aggregationType;
+        return this;
+    }
+
+    /**
+     * Get list of availability.
+     *
+     * @return the availabilities value
+     */
+    public List<Availability> availabilities() {
+        return this.availabilities;
+    }
+
+    /**
+     * Set list of availability.
+     *
+     * @param availabilities the availabilities value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withAvailabilities(List<Availability> availabilities) {
+        this.availabilities = availabilities;
+        return this;
+    }
+
+    /**
+     * Get whether regional MDM account enabled.
+     *
+     * @return the enableRegionalMdmAccount value
+     */
+    public Boolean enableRegionalMdmAccount() {
+        return this.enableRegionalMdmAccount;
+    }
+
+    /**
+     * Set whether regional MDM account enabled.
+     *
+     * @param enableRegionalMdmAccount the enableRegionalMdmAccount value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withEnableRegionalMdmAccount(Boolean enableRegionalMdmAccount) {
+        this.enableRegionalMdmAccount = enableRegionalMdmAccount;
+        return this;
+    }
+
+    /**
+     * Get whether gaps would be filled with zeros.
+     *
+     * @return the fillGapWithZero value
+     */
+    public Boolean fillGapWithZero() {
+        return this.fillGapWithZero;
+    }
+
+    /**
+     * Set whether gaps would be filled with zeros.
+     *
+     * @param fillGapWithZero the fillGapWithZero value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withFillGapWithZero(Boolean fillGapWithZero) {
+        this.fillGapWithZero = fillGapWithZero;
+        return this;
+    }
+
+    /**
+     * Get pattern for the filter of the metric.
+     *
+     * @return the metricFilterPattern value
+     */
+    public String metricFilterPattern() {
+        return this.metricFilterPattern;
+    }
+
+    /**
+     * Set pattern for the filter of the metric.
+     *
+     * @param metricFilterPattern the metricFilterPattern value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withMetricFilterPattern(String metricFilterPattern) {
+        this.metricFilterPattern = metricFilterPattern;
+        return this;
+    }
+
+    /**
+     * Get list of dimensions.
+     *
+     * @return the dimensions value
+     */
+    public List<Dimension> dimensions() {
+        return this.dimensions;
+    }
+
+    /**
+     * Set list of dimensions.
+     *
+     * @param dimensions the dimensions value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withDimensions(List<Dimension> dimensions) {
+        this.dimensions = dimensions;
+        return this;
+    }
+
+    /**
+     * Get whether the metric is internal.
+     *
+     * @return the isInternal value
+     */
+    public Boolean isInternal() {
+        return this.isInternal;
+    }
+
+    /**
+     * Set whether the metric is internal.
+     *
+     * @param isInternal the isInternal value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withIsInternal(Boolean isInternal) {
+        this.isInternal = isInternal;
+        return this;
+    }
+
+    /**
+     * Get the source MDM account.
+     *
+     * @return the sourceMdmAccount value
+     */
+    public String sourceMdmAccount() {
+        return this.sourceMdmAccount;
+    }
+
+    /**
+     * Set the source MDM account.
+     *
+     * @param sourceMdmAccount the sourceMdmAccount value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withSourceMdmAccount(String sourceMdmAccount) {
+        this.sourceMdmAccount = sourceMdmAccount;
+        return this;
+    }
+
+    /**
+     * Get the source MDM namespace.
+     *
+     * @return the sourceMdmNamespace value
+     */
+    public String sourceMdmNamespace() {
+        return this.sourceMdmNamespace;
+    }
+
+    /**
+     * Set the source MDM namespace.
+     *
+     * @param sourceMdmNamespace the sourceMdmNamespace value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withSourceMdmNamespace(String sourceMdmNamespace) {
+        this.sourceMdmNamespace = sourceMdmNamespace;
+        return this;
+    }
+
+    /**
+     * Get the resource Id dimension name override.
+     *
+     * @return the resourceIdDimensionNameOverride value
+     */
+    public String resourceIdDimensionNameOverride() {
+        return this.resourceIdDimensionNameOverride;
+    }
+
+    /**
+     * Set the resource Id dimension name override.
+     *
+     * @param resourceIdDimensionNameOverride the resourceIdDimensionNameOverride value to set
+     * @return the MetricSpecification object itself.
+     */
+    public MetricSpecification withResourceIdDimensionNameOverride(String resourceIdDimensionNameOverride) {
+        this.resourceIdDimensionNameOverride = resourceIdDimensionNameOverride;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateway.java
new file mode 100644
index 000000000000..63b7ae512dde
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateway.java
@@ -0,0 +1,235 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NatGatewayInner;
+
+/**
+ * Type representing NatGateway.
+ */
+public interface NatGateway extends HasInner<NatGatewayInner>, Resource, GroupableResourceCore<NetworkManager, NatGatewayInner>, HasResourceGroup, Refreshable<NatGateway>, Updatable<NatGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the idleTimeoutInMinutes value.
+     */
+    Integer idleTimeoutInMinutes();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIpAddresses value.
+     */
+    List<SubResource> publicIpAddresses();
+
+    /**
+     * @return the publicIpPrefixes value.
+     */
+    List<SubResource> publicIpPrefixes();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    NatGatewaySku sku();
+
+    /**
+     * @return the subnets value.
+     */
+    List<SubResource> subnets();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * The entirety of the NatGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NatGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NatGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NatGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the natgateway definition allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The idle timeout of the nat gateway
+             * @return the next definition stage
+             */
+            WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the natgateway definition allowing to specify PublicIpAddresses.
+         */
+        interface WithPublicIpAddresses {
+            /**
+             * Specifies publicIpAddresses.
+             * @param publicIpAddresses An array of public ip addresses associated with the nat gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withPublicIpAddresses(List<SubResource> publicIpAddresses);
+        }
+
+        /**
+         * The stage of the natgateway definition allowing to specify PublicIpPrefixes.
+         */
+        interface WithPublicIpPrefixes {
+            /**
+             * Specifies publicIpPrefixes.
+             * @param publicIpPrefixes An array of public ip prefixes associated with the nat gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withPublicIpPrefixes(List<SubResource> publicIpPrefixes);
+        }
+
+        /**
+         * The stage of the natgateway definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The nat gateway SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(NatGatewaySku sku);
+        }
+
+        /**
+         * The stage of the natgateway definition allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the zone in which Nat Gateway should be deployed
+             * @return the next definition stage
+             */
+            WithCreate withZones(List<String> zones);
+        }
+
+        /**
+         * 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<NatGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithIdleTimeoutInMinutes, DefinitionStages.WithPublicIpAddresses, DefinitionStages.WithPublicIpPrefixes, DefinitionStages.WithSku, DefinitionStages.WithZones {
+        }
+    }
+    /**
+     * The template for a NatGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NatGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithIdleTimeoutInMinutes, UpdateStages.WithPublicIpAddresses, UpdateStages.WithPublicIpPrefixes, UpdateStages.WithSku, UpdateStages.WithZones {
+    }
+
+    /**
+     * Grouping of NatGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the natgateway update allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The idle timeout of the nat gateway
+             * @return the next update stage
+             */
+            Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the natgateway update allowing to specify PublicIpAddresses.
+         */
+        interface WithPublicIpAddresses {
+            /**
+             * Specifies publicIpAddresses.
+             * @param publicIpAddresses An array of public ip addresses associated with the nat gateway resource
+             * @return the next update stage
+             */
+            Update withPublicIpAddresses(List<SubResource> publicIpAddresses);
+        }
+
+        /**
+         * The stage of the natgateway update allowing to specify PublicIpPrefixes.
+         */
+        interface WithPublicIpPrefixes {
+            /**
+             * Specifies publicIpPrefixes.
+             * @param publicIpPrefixes An array of public ip prefixes associated with the nat gateway resource
+             * @return the next update stage
+             */
+            Update withPublicIpPrefixes(List<SubResource> publicIpPrefixes);
+        }
+
+        /**
+         * The stage of the natgateway update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The nat gateway SKU
+             * @return the next update stage
+             */
+            Update withSku(NatGatewaySku sku);
+        }
+
+        /**
+         * The stage of the natgateway update allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the zone in which Nat Gateway should be deployed
+             * @return the next update stage
+             */
+            Update withZones(List<String> zones);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySku.java
new file mode 100644
index 000000000000..8a7f4c9b74de
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of nat gateway.
+ */
+public class NatGatewaySku {
+    /**
+     * Name of Nat Gateway SKU. Possible values include: 'Standard'.
+     */
+    @JsonProperty(value = "name")
+    private NatGatewaySkuName name;
+
+    /**
+     * Get name of Nat Gateway SKU. Possible values include: 'Standard'.
+     *
+     * @return the name value
+     */
+    public NatGatewaySkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of Nat Gateway SKU. Possible values include: 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the NatGatewaySku object itself.
+     */
+    public NatGatewaySku withName(NatGatewaySkuName name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySkuName.java
new file mode 100644
index 000000000000..b4e93d3da723
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGatewaySkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NatGatewaySkuName.
+ */
+public final class NatGatewaySkuName extends ExpandableStringEnum<NatGatewaySkuName> {
+    /** Static value Standard for NatGatewaySkuName. */
+    public static final NatGatewaySkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a NatGatewaySkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NatGatewaySkuName
+     */
+    @JsonCreator
+    public static NatGatewaySkuName fromString(String name) {
+        return fromString(name, NatGatewaySkuName.class);
+    }
+
+    /**
+     * @return known NatGatewaySkuName values
+     */
+    public static Collection<NatGatewaySkuName> values() {
+        return values(NatGatewaySkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateways.java
new file mode 100644
index 000000000000..882d9063b7cd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatGateways.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NatGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NatGateways.
+ */
+public interface NatGateways extends SupportsCreating<NatGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NatGateway>, SupportsListingByResourceGroup<NatGateway>, SupportsListing<NatGateway>, HasInner<NatGatewaysInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
new file mode 100644
index 000000000000..d71d81827aa4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Rule condition of type nat.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleConditionType", defaultImpl = NatRuleCondition.class)
+@JsonTypeName("NatRuleCondition")
+public class NatRuleCondition extends FirewallPolicyRuleCondition {
+    /**
+     * Array of FirewallPolicyRuleConditionNetworkProtocols.
+     */
+    @JsonProperty(value = "ipProtocols")
+    private List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols;
+
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * List of destination IP addresses or Service Tags.
+     */
+    @JsonProperty(value = "destinationAddresses")
+    private List<String> destinationAddresses;
+
+    /**
+     * List of destination ports.
+     */
+    @JsonProperty(value = "destinationPorts")
+    private List<String> destinationPorts;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * Terminate TLS connections for this rule.
+     */
+    @JsonProperty(value = "terminateTLS")
+    private Boolean terminateTLS;
+
+    /**
+     * Get array of FirewallPolicyRuleConditionNetworkProtocols.
+     *
+     * @return the ipProtocols value
+     */
+    public List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols() {
+        return this.ipProtocols;
+    }
+
+    /**
+     * Set array of FirewallPolicyRuleConditionNetworkProtocols.
+     *
+     * @param ipProtocols the ipProtocols value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withIpProtocols(List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols) {
+        this.ipProtocols = ipProtocols;
+        return this;
+    }
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination IP addresses or Service Tags.
+     *
+     * @return the destinationAddresses value
+     */
+    public List<String> destinationAddresses() {
+        return this.destinationAddresses;
+    }
+
+    /**
+     * Set list of destination IP addresses or Service Tags.
+     *
+     * @param destinationAddresses the destinationAddresses value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withDestinationAddresses(List<String> destinationAddresses) {
+        this.destinationAddresses = destinationAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination ports.
+     *
+     * @return the destinationPorts value
+     */
+    public List<String> destinationPorts() {
+        return this.destinationPorts;
+    }
+
+    /**
+     * Set list of destination ports.
+     *
+     * @param destinationPorts the destinationPorts value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withDestinationPorts(List<String> destinationPorts) {
+        this.destinationPorts = destinationPorts;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+    /**
+     * Get terminate TLS connections for this rule.
+     *
+     * @return the terminateTLS value
+     */
+    public Boolean terminateTLS() {
+        return this.terminateTLS;
+    }
+
+    /**
+     * Set terminate TLS connections for this rule.
+     *
+     * @param terminateTLS the terminateTLS value to set
+     * @return the NatRuleCondition object itself.
+     */
+    public NatRuleCondition withTerminateTLS(Boolean terminateTLS) {
+        this.terminateTLS = terminateTLS;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticParameters.java
new file mode 100644
index 000000000000..77d4d6246957
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticParameters.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters to get network configuration diagnostic.
+ */
+public class NetworkConfigurationDiagnosticParameters {
+    /**
+     * The ID of the target resource to perform network configuration
+     * diagnostic. Valid options are VM, NetworkInterface,
+     * VMSS/NetworkInterface and Application Gateway.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * Verbosity level. Possible values include: 'Normal', 'Minimum', 'Full'.
+     */
+    @JsonProperty(value = "verbosityLevel")
+    private VerbosityLevel verbosityLevel;
+
+    /**
+     * List of network configuration diagnostic profiles.
+     */
+    @JsonProperty(value = "profiles", required = true)
+    private List<NetworkConfigurationDiagnosticProfile> profiles;
+
+    /**
+     * Get the ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the NetworkConfigurationDiagnosticParameters object itself.
+     */
+    public NetworkConfigurationDiagnosticParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get verbosity level. Possible values include: 'Normal', 'Minimum', 'Full'.
+     *
+     * @return the verbosityLevel value
+     */
+    public VerbosityLevel verbosityLevel() {
+        return this.verbosityLevel;
+    }
+
+    /**
+     * Set verbosity level. Possible values include: 'Normal', 'Minimum', 'Full'.
+     *
+     * @param verbosityLevel the verbosityLevel value to set
+     * @return the NetworkConfigurationDiagnosticParameters object itself.
+     */
+    public NetworkConfigurationDiagnosticParameters withVerbosityLevel(VerbosityLevel verbosityLevel) {
+        this.verbosityLevel = verbosityLevel;
+        return this;
+    }
+
+    /**
+     * Get list of network configuration diagnostic profiles.
+     *
+     * @return the profiles value
+     */
+    public List<NetworkConfigurationDiagnosticProfile> profiles() {
+        return this.profiles;
+    }
+
+    /**
+     * Set list of network configuration diagnostic profiles.
+     *
+     * @param profiles the profiles value to set
+     * @return the NetworkConfigurationDiagnosticParameters object itself.
+     */
+    public NetworkConfigurationDiagnosticParameters withProfiles(List<NetworkConfigurationDiagnosticProfile> profiles) {
+        this.profiles = profiles;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticProfile.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticProfile.java
new file mode 100644
index 000000000000..ec421883e3a2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticProfile.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters to compare with network configuration.
+ */
+public class NetworkConfigurationDiagnosticProfile {
+    /**
+     * The direction of the traffic. Possible values include: 'Inbound',
+     * 'Outbound'.
+     */
+    @JsonProperty(value = "direction", required = true)
+    private Direction direction;
+
+    /**
+     * Protocol to be verified on. Accepted values are '*', TCP, UDP.
+     */
+    @JsonProperty(value = "protocol", required = true)
+    private String protocol;
+
+    /**
+     * Traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     */
+    @JsonProperty(value = "source", required = true)
+    private String source;
+
+    /**
+     * Traffic destination. Accepted values are: '*', IP Address/CIDR, Service
+     * Tag.
+     */
+    @JsonProperty(value = "destination", required = true)
+    private String destination;
+
+    /**
+     * Traffic destination port. Accepted values are '*' and a single port in
+     * the range (0 - 65535).
+     */
+    @JsonProperty(value = "destinationPort", required = true)
+    private String destinationPort;
+
+    /**
+     * Get the direction of the traffic. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @return the direction value
+     */
+    public Direction direction() {
+        return this.direction;
+    }
+
+    /**
+     * Set the direction of the traffic. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @param direction the direction value to set
+     * @return the NetworkConfigurationDiagnosticProfile object itself.
+     */
+    public NetworkConfigurationDiagnosticProfile withDirection(Direction direction) {
+        this.direction = direction;
+        return this;
+    }
+
+    /**
+     * Get protocol to be verified on. Accepted values are '*', TCP, UDP.
+     *
+     * @return the protocol value
+     */
+    public String protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set protocol to be verified on. Accepted values are '*', TCP, UDP.
+     *
+     * @param protocol the protocol value to set
+     * @return the NetworkConfigurationDiagnosticProfile object itself.
+     */
+    public NetworkConfigurationDiagnosticProfile withProtocol(String protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     *
+     * @return the source value
+     */
+    public String source() {
+        return this.source;
+    }
+
+    /**
+     * Set traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     *
+     * @param source the source value to set
+     * @return the NetworkConfigurationDiagnosticProfile object itself.
+     */
+    public NetworkConfigurationDiagnosticProfile withSource(String source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get traffic destination. Accepted values are: '*', IP Address/CIDR, Service Tag.
+     *
+     * @return the destination value
+     */
+    public String destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set traffic destination. Accepted values are: '*', IP Address/CIDR, Service Tag.
+     *
+     * @param destination the destination value to set
+     * @return the NetworkConfigurationDiagnosticProfile object itself.
+     */
+    public NetworkConfigurationDiagnosticProfile withDestination(String destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get traffic destination port. Accepted values are '*' and a single port in the range (0 - 65535).
+     *
+     * @return the destinationPort value
+     */
+    public String destinationPort() {
+        return this.destinationPort;
+    }
+
+    /**
+     * Set traffic destination port. Accepted values are '*' and a single port in the range (0 - 65535).
+     *
+     * @param destinationPort the destinationPort value to set
+     * @return the NetworkConfigurationDiagnosticProfile object itself.
+     */
+    public NetworkConfigurationDiagnosticProfile withDestinationPort(String destinationPort) {
+        this.destinationPort = destinationPort;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResponse.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResponse.java
new file mode 100644
index 000000000000..a1634dc7f520
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResponse.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkConfigurationDiagnosticResponseInner;
+import java.util.List;
+
+/**
+ * Type representing NetworkConfigurationDiagnosticResponse.
+ */
+public interface NetworkConfigurationDiagnosticResponse extends HasInner<NetworkConfigurationDiagnosticResponseInner>, HasManager<NetworkManager> {
+    /**
+     * @return the results value.
+     */
+    List<NetworkConfigurationDiagnosticResult> results();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResult.java
new file mode 100644
index 000000000000..22c3e4ad4310
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkConfigurationDiagnosticResult.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network configuration diagnostic result corresponded to provided traffic
+ * query.
+ */
+public class NetworkConfigurationDiagnosticResult {
+    /**
+     * Network configuration diagnostic profile.
+     */
+    @JsonProperty(value = "profile")
+    private NetworkConfigurationDiagnosticProfile profile;
+
+    /**
+     * Network security group result.
+     */
+    @JsonProperty(value = "networkSecurityGroupResult")
+    private NetworkSecurityGroupResult networkSecurityGroupResult;
+
+    /**
+     * Get network configuration diagnostic profile.
+     *
+     * @return the profile value
+     */
+    public NetworkConfigurationDiagnosticProfile profile() {
+        return this.profile;
+    }
+
+    /**
+     * Set network configuration diagnostic profile.
+     *
+     * @param profile the profile value to set
+     * @return the NetworkConfigurationDiagnosticResult object itself.
+     */
+    public NetworkConfigurationDiagnosticResult withProfile(NetworkConfigurationDiagnosticProfile profile) {
+        this.profile = profile;
+        return this;
+    }
+
+    /**
+     * Get network security group result.
+     *
+     * @return the networkSecurityGroupResult value
+     */
+    public NetworkSecurityGroupResult networkSecurityGroupResult() {
+        return this.networkSecurityGroupResult;
+    }
+
+    /**
+     * Set network security group result.
+     *
+     * @param networkSecurityGroupResult the networkSecurityGroupResult value to set
+     * @return the NetworkConfigurationDiagnosticResult object itself.
+     */
+    public NetworkConfigurationDiagnosticResult withNetworkSecurityGroupResult(NetworkSecurityGroupResult networkSecurityGroupResult) {
+        this.networkSecurityGroupResult = networkSecurityGroupResult;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicy.java
new file mode 100644
index 000000000000..8c1e15a3a71f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicy.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Network Intent Policy resource.
+ */
+@SkipParentValidation
+public class NetworkIntentPolicy extends Resource {
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkIntentPolicy object itself.
+     */
+    public NetworkIntentPolicy withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicyConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicyConfiguration.java
new file mode 100644
index 000000000000..b571d3f3b226
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkIntentPolicyConfiguration.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Details of NetworkIntentPolicyConfiguration for
+ * PrepareNetworkPoliciesRequest.
+ */
+public class NetworkIntentPolicyConfiguration {
+    /**
+     * The name of the Network Intent Policy for storing in target
+     * subscription.
+     */
+    @JsonProperty(value = "networkIntentPolicyName")
+    private String networkIntentPolicyName;
+
+    /**
+     * Source network intent policy.
+     */
+    @JsonProperty(value = "sourceNetworkIntentPolicy")
+    private NetworkIntentPolicy sourceNetworkIntentPolicy;
+
+    /**
+     * Get the name of the Network Intent Policy for storing in target subscription.
+     *
+     * @return the networkIntentPolicyName value
+     */
+    public String networkIntentPolicyName() {
+        return this.networkIntentPolicyName;
+    }
+
+    /**
+     * Set the name of the Network Intent Policy for storing in target subscription.
+     *
+     * @param networkIntentPolicyName the networkIntentPolicyName value to set
+     * @return the NetworkIntentPolicyConfiguration object itself.
+     */
+    public NetworkIntentPolicyConfiguration withNetworkIntentPolicyName(String networkIntentPolicyName) {
+        this.networkIntentPolicyName = networkIntentPolicyName;
+        return this;
+    }
+
+    /**
+     * Get source network intent policy.
+     *
+     * @return the sourceNetworkIntentPolicy value
+     */
+    public NetworkIntentPolicy sourceNetworkIntentPolicy() {
+        return this.sourceNetworkIntentPolicy;
+    }
+
+    /**
+     * Set source network intent policy.
+     *
+     * @param sourceNetworkIntentPolicy the sourceNetworkIntentPolicy value to set
+     * @return the NetworkIntentPolicyConfiguration object itself.
+     */
+    public NetworkIntentPolicyConfiguration withSourceNetworkIntentPolicy(NetworkIntentPolicy sourceNetworkIntentPolicy) {
+        this.sourceNetworkIntentPolicy = sourceNetworkIntentPolicy;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterface.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterface.java
new file mode 100644
index 000000000000..44a725038c81
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterface.java
@@ -0,0 +1,262 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkSecurityGroupInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceInner;
+
+/**
+ * Type representing NetworkInterface.
+ */
+public interface NetworkInterface extends HasInner<NetworkInterfaceInner>, Resource, GroupableResourceCore<NetworkManager, NetworkInterfaceInner>, HasResourceGroup, Refreshable<NetworkInterface>, Updatable<NetworkInterface.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the dnsSettings value.
+     */
+    NetworkInterfaceDnsSettings dnsSettings();
+
+    /**
+     * @return the enableAcceleratedNetworking value.
+     */
+    Boolean enableAcceleratedNetworking();
+
+    /**
+     * @return the enableIPForwarding value.
+     */
+    Boolean enableIPForwarding();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the hostedWorkloads value.
+     */
+    List<String> hostedWorkloads();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> ipConfigurations();
+
+    /**
+     * @return the macAddress value.
+     */
+    String macAddress();
+
+    /**
+     * @return the networkSecurityGroup value.
+     */
+    NetworkSecurityGroup networkSecurityGroup();
+
+    /**
+     * @return the primary value.
+     */
+    Boolean primary();
+
+    /**
+     * @return the privateEndpoint value.
+     */
+    PrivateEndpoint privateEndpoint();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the tapConfigurations value.
+     */
+    List<NetworkInterfaceTapConfiguration> tapConfigurations();
+
+    /**
+     * @return the virtualMachine value.
+     */
+    SubResource virtualMachine();
+
+    /**
+     * The entirety of the NetworkInterface definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkInterface definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkInterface definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NetworkInterface definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the networkinterface definition allowing to specify DnsSettings.
+         */
+        interface WithDnsSettings {
+            /**
+             * Specifies dnsSettings.
+             * @param dnsSettings The DNS settings in network interface
+             * @return the next definition stage
+             */
+            WithCreate withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
+        }
+
+        /**
+         * The stage of the networkinterface definition allowing to specify EnableAcceleratedNetworking.
+         */
+        interface WithEnableAcceleratedNetworking {
+            /**
+             * Specifies enableAcceleratedNetworking.
+             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
+             * @return the next definition stage
+             */
+            WithCreate withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
+        }
+
+        /**
+         * The stage of the networkinterface definition allowing to specify EnableIPForwarding.
+         */
+        interface WithEnableIPForwarding {
+            /**
+             * Specifies enableIPForwarding.
+             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
+             * @return the next definition stage
+             */
+            WithCreate withEnableIPForwarding(Boolean enableIPForwarding);
+        }
+
+        /**
+         * The stage of the networkinterface definition allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations A list of IPConfigurations of the network interface
+             * @return the next definition stage
+             */
+            WithCreate withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
+        }
+
+        /**
+         * The stage of the networkinterface definition allowing to specify NetworkSecurityGroup.
+         */
+        interface WithNetworkSecurityGroup {
+            /**
+             * Specifies networkSecurityGroup.
+             * @param networkSecurityGroup The reference to the NetworkSecurityGroup resource
+             * @return the next definition stage
+             */
+            WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
+        }
+
+        /**
+         * 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<NetworkInterface>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithDnsSettings, DefinitionStages.WithEnableAcceleratedNetworking, DefinitionStages.WithEnableIPForwarding, DefinitionStages.WithIpConfigurations, DefinitionStages.WithNetworkSecurityGroup {
+        }
+    }
+    /**
+     * The template for a NetworkInterface update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkInterface>, Resource.UpdateWithTags<Update>, UpdateStages.WithDnsSettings, UpdateStages.WithEnableAcceleratedNetworking, UpdateStages.WithEnableIPForwarding, UpdateStages.WithIpConfigurations, UpdateStages.WithNetworkSecurityGroup {
+    }
+
+    /**
+     * Grouping of NetworkInterface update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networkinterface update allowing to specify DnsSettings.
+         */
+        interface WithDnsSettings {
+            /**
+             * Specifies dnsSettings.
+             * @param dnsSettings The DNS settings in network interface
+             * @return the next update stage
+             */
+            Update withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
+        }
+
+        /**
+         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
+         */
+        interface WithEnableAcceleratedNetworking {
+            /**
+             * Specifies enableAcceleratedNetworking.
+             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
+             * @return the next update stage
+             */
+            Update withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
+        }
+
+        /**
+         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
+         */
+        interface WithEnableIPForwarding {
+            /**
+             * Specifies enableIPForwarding.
+             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
+             * @return the next update stage
+             */
+            Update withEnableIPForwarding(Boolean enableIPForwarding);
+        }
+
+        /**
+         * The stage of the networkinterface update allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations A list of IPConfigurations of the network interface
+             * @return the next update stage
+             */
+            Update withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
+        }
+
+        /**
+         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
+         */
+        interface WithNetworkSecurityGroup {
+            /**
+             * Specifies networkSecurityGroup.
+             * @param networkSecurityGroup The reference to the NetworkSecurityGroup resource
+             * @return the next update stage
+             */
+            Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceAssociation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceAssociation.java
new file mode 100644
index 000000000000..8098c1b44760
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceAssociation.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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network interface and its custom security rules.
+ */
+public class NetworkInterfaceAssociation {
+    /**
+     * Network interface ID.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Collection of custom security rules.
+     */
+    @JsonProperty(value = "securityRules")
+    private List<SecurityRuleInner> securityRules;
+
+    /**
+     * Get network interface ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get collection of custom security rules.
+     *
+     * @return the securityRules value
+     */
+    public List<SecurityRuleInner> securityRules() {
+        return this.securityRules;
+    }
+
+    /**
+     * Set collection of custom security rules.
+     *
+     * @param securityRules the securityRules value to set
+     * @return the NetworkInterfaceAssociation object itself.
+     */
+    public NetworkInterfaceAssociation withSecurityRules(List<SecurityRuleInner> securityRules) {
+        this.securityRules = securityRules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceDnsSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceDnsSettings.java
new file mode 100644
index 000000000000..7477bf0fcf0d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceDnsSettings.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DNS settings of a network interface.
+ */
+public class NetworkInterfaceDnsSettings {
+    /**
+     * List of DNS servers IP addresses. Use 'AzureProvidedDNS' to switch to
+     * azure provided DNS resolution. 'AzureProvidedDNS' value cannot be
+     * combined with other IPs, it must be the only value in dnsServers
+     * collection.
+     */
+    @JsonProperty(value = "dnsServers")
+    private List<String> dnsServers;
+
+    /**
+     * If the VM that uses this NIC is part of an Availability Set, then this
+     * list will have the union of all DNS servers from all NICs that are part
+     * of the Availability Set. This property is what is configured on each of
+     * those VMs.
+     */
+    @JsonProperty(value = "appliedDnsServers", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> appliedDnsServers;
+
+    /**
+     * Relative DNS name for this NIC used for internal communications between
+     * VMs in the same virtual network.
+     */
+    @JsonProperty(value = "internalDnsNameLabel")
+    private String internalDnsNameLabel;
+
+    /**
+     * Fully qualified DNS name supporting internal communications between VMs
+     * in the same virtual network.
+     */
+    @JsonProperty(value = "internalFqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String internalFqdn;
+
+    /**
+     * Even if internalDnsNameLabel is not specified, a DNS entry is created
+     * for the primary NIC of the VM. This DNS name can be constructed by
+     * concatenating the VM name with the value of internalDomainNameSuffix.
+     */
+    @JsonProperty(value = "internalDomainNameSuffix", access = JsonProperty.Access.WRITE_ONLY)
+    private String internalDomainNameSuffix;
+
+    /**
+     * Get list of DNS servers IP addresses. Use 'AzureProvidedDNS' to switch to azure provided DNS resolution. 'AzureProvidedDNS' value cannot be combined with other IPs, it must be the only value in dnsServers collection.
+     *
+     * @return the dnsServers value
+     */
+    public List<String> dnsServers() {
+        return this.dnsServers;
+    }
+
+    /**
+     * Set list of DNS servers IP addresses. Use 'AzureProvidedDNS' to switch to azure provided DNS resolution. 'AzureProvidedDNS' value cannot be combined with other IPs, it must be the only value in dnsServers collection.
+     *
+     * @param dnsServers the dnsServers value to set
+     * @return the NetworkInterfaceDnsSettings object itself.
+     */
+    public NetworkInterfaceDnsSettings withDnsServers(List<String> dnsServers) {
+        this.dnsServers = dnsServers;
+        return this;
+    }
+
+    /**
+     * Get if the VM that uses this NIC is part of an Availability Set, then this list will have the union of all DNS servers from all NICs that are part of the Availability Set. This property is what is configured on each of those VMs.
+     *
+     * @return the appliedDnsServers value
+     */
+    public List<String> appliedDnsServers() {
+        return this.appliedDnsServers;
+    }
+
+    /**
+     * Get relative DNS name for this NIC used for internal communications between VMs in the same virtual network.
+     *
+     * @return the internalDnsNameLabel value
+     */
+    public String internalDnsNameLabel() {
+        return this.internalDnsNameLabel;
+    }
+
+    /**
+     * Set relative DNS name for this NIC used for internal communications between VMs in the same virtual network.
+     *
+     * @param internalDnsNameLabel the internalDnsNameLabel value to set
+     * @return the NetworkInterfaceDnsSettings object itself.
+     */
+    public NetworkInterfaceDnsSettings withInternalDnsNameLabel(String internalDnsNameLabel) {
+        this.internalDnsNameLabel = internalDnsNameLabel;
+        return this;
+    }
+
+    /**
+     * Get fully qualified DNS name supporting internal communications between VMs in the same virtual network.
+     *
+     * @return the internalFqdn value
+     */
+    public String internalFqdn() {
+        return this.internalFqdn;
+    }
+
+    /**
+     * Get even if internalDnsNameLabel is not specified, a DNS entry is created for the primary NIC of the VM. This DNS name can be constructed by concatenating the VM name with the value of internalDomainNameSuffix.
+     *
+     * @return the internalDomainNameSuffix value
+     */
+    public String internalDomainNameSuffix() {
+        return this.internalDomainNameSuffix;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties.java
new file mode 100644
index 000000000000..7947e43f7364
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties.java
@@ -0,0 +1,63 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * PrivateLinkConnection properties for the network interface.
+ */
+public class NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties {
+    /**
+     * The group ID for current private link connection.
+     */
+    @JsonProperty(value = "groupId", access = JsonProperty.Access.WRITE_ONLY)
+    private String groupId;
+
+    /**
+     * The required member name for current private link connection.
+     */
+    @JsonProperty(value = "requiredMemberName", access = JsonProperty.Access.WRITE_ONLY)
+    private String requiredMemberName;
+
+    /**
+     * List of FQDNs for current private link connection.
+     */
+    @JsonProperty(value = "fqdns", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> fqdns;
+
+    /**
+     * Get the group ID for current private link connection.
+     *
+     * @return the groupId value
+     */
+    public String groupId() {
+        return this.groupId;
+    }
+
+    /**
+     * Get the required member name for current private link connection.
+     *
+     * @return the requiredMemberName value
+     */
+    public String requiredMemberName() {
+        return this.requiredMemberName;
+    }
+
+    /**
+     * Get list of FQDNs for current private link connection.
+     *
+     * @return the fqdns value
+     */
+    public List<String> fqdns() {
+        return this.fqdns;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurations.java
new file mode 100644
index 000000000000..979ff129f12e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceIPConfigurations.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkInterfaceIPConfigurations.
+ */
+public interface NetworkInterfaceIPConfigurations extends HasInner<NetworkInterfaceIPConfigurationsInner> {
+    /**
+     * Gets the specified network interface ip configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterfaceNetworkInterfaceIPConfiguration> getAsync(String resourceGroupName, String networkInterfaceName, String ipConfigurationName);
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterfaceNetworkInterfaceIPConfiguration> listAsync(final String resourceGroupName, final String networkInterfaceName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancer.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancer.java
new file mode 100644
index 000000000000..55d6bda8b70f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancer.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LoadBalancerInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Type representing NetworkInterfaceLoadBalancer.
+ */
+public interface NetworkInterfaceLoadBalancer extends HasInner<LoadBalancerInner>, HasManager<NetworkManager> {
+    /**
+     * @return the backendAddressPools value.
+     */
+    List<BackendAddressPool> backendAddressPools();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the frontendIPConfigurations value.
+     */
+    List<FrontendIPConfiguration> frontendIPConfigurations();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the inboundNatPools value.
+     */
+    List<InboundNatPool> inboundNatPools();
+
+    /**
+     * @return the inboundNatRules value.
+     */
+    List<InboundNatRule> inboundNatRules();
+
+    /**
+     * @return the loadBalancingRules value.
+     */
+    List<LoadBalancingRule> loadBalancingRules();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the outboundRules value.
+     */
+    List<OutboundRule> outboundRules();
+
+    /**
+     * @return the probes value.
+     */
+    List<Probe> probes();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    LoadBalancerSku sku();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancers.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancers.java
new file mode 100644
index 000000000000..aa621961b453
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceLoadBalancers.java
@@ -0,0 +1,29 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceLoadBalancersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkInterfaceLoadBalancers.
+ */
+public interface NetworkInterfaceLoadBalancers extends HasInner<NetworkInterfaceLoadBalancersInner> {
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterfaceLoadBalancer> listAsync(final String resourceGroupName, final String networkInterfaceName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceNetworkInterfaceIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceNetworkInterfaceIPConfiguration.java
new file mode 100644
index 000000000000..595cdd45e099
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceNetworkInterfaceIPConfiguration.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing NetworkInterfaceNetworkInterfaceIPConfiguration.
+ */
+public interface NetworkInterfaceNetworkInterfaceIPConfiguration extends HasInner<NetworkInterfaceIPConfigurationInner>, Indexable, Refreshable<NetworkInterfaceNetworkInterfaceIPConfiguration>, HasManager<NetworkManager> {
+    /**
+     * @return the applicationGatewayBackendAddressPools value.
+     */
+    List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools();
+
+    /**
+     * @return the applicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> applicationSecurityGroups();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the loadBalancerBackendAddressPools value.
+     */
+    List<BackendAddressPool> loadBalancerBackendAddressPools();
+
+    /**
+     * @return the loadBalancerInboundNatRules value.
+     */
+    List<InboundNatRule> loadBalancerInboundNatRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the primary value.
+     */
+    Boolean primary();
+
+    /**
+     * @return the privateIPAddress value.
+     */
+    String privateIPAddress();
+
+    /**
+     * @return the privateIPAddressVersion value.
+     */
+    IPVersion privateIPAddressVersion();
+
+    /**
+     * @return the privateIPAllocationMethod value.
+     */
+    IPAllocationMethod privateIPAllocationMethod();
+
+    /**
+     * @return the privateLinkConnectionProperties value.
+     */
+    NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddress value.
+     */
+    PublicIPAddress publicIPAddress();
+
+    /**
+     * @return the subnet value.
+     */
+    Subnet subnet();
+
+    /**
+     * @return the virtualNetworkTaps value.
+     */
+    List<VirtualNetworkTap> virtualNetworkTaps();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfiguration.java
new file mode 100644
index 000000000000..7bdfcb816df5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfiguration.java
@@ -0,0 +1,176 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceTapConfigurationInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkTapInner;
+
+/**
+ * Type representing NetworkInterfaceTapConfiguration.
+ */
+public interface NetworkInterfaceTapConfiguration extends HasInner<NetworkInterfaceTapConfigurationInner>, Indexable, Refreshable<NetworkInterfaceTapConfiguration>, Updatable<NetworkInterfaceTapConfiguration.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the virtualNetworkTap value.
+     */
+    VirtualNetworkTap virtualNetworkTap();
+
+    /**
+     * The entirety of the NetworkInterfaceTapConfiguration definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetworkInterface, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkInterfaceTapConfiguration definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkInterfaceTapConfiguration definition.
+         */
+        interface Blank extends WithNetworkInterface {
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration definition allowing to specify NetworkInterface.
+         */
+        interface WithNetworkInterface {
+           /**
+            * Specifies resourceGroupName, networkInterfaceName.
+            * @param resourceGroupName The name of the resource group
+            * @param networkInterfaceName The name of the network interface
+            * @return the next definition stage
+            */
+            WithCreate withExistingNetworkInterface(String resourceGroupName, String networkInterfaceName);
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration definition allowing to specify VirtualNetworkTap.
+         */
+        interface WithVirtualNetworkTap {
+            /**
+             * Specifies virtualNetworkTap.
+             * @param virtualNetworkTap The reference to the Virtual Network Tap resource
+             * @return the next definition stage
+             */
+            WithCreate withVirtualNetworkTap(VirtualNetworkTapInner virtualNetworkTap);
+        }
+
+        /**
+         * 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<NetworkInterfaceTapConfiguration>, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithVirtualNetworkTap {
+        }
+    }
+    /**
+     * The template for a NetworkInterfaceTapConfiguration update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkInterfaceTapConfiguration>, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithVirtualNetworkTap {
+    }
+
+    /**
+     * Grouping of NetworkInterfaceTapConfiguration update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networkinterfacetapconfiguration update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the networkinterfacetapconfiguration update allowing to specify VirtualNetworkTap.
+         */
+        interface WithVirtualNetworkTap {
+            /**
+             * Specifies virtualNetworkTap.
+             * @param virtualNetworkTap The reference to the Virtual Network Tap resource
+             * @return the next update stage
+             */
+            Update withVirtualNetworkTap(VirtualNetworkTapInner virtualNetworkTap);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfigurations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfigurations.java
new file mode 100644
index 000000000000..6c7bd44d1dbd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaceTapConfigurations.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceTapConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkInterfaceTapConfigurations.
+ */
+public interface NetworkInterfaceTapConfigurations extends SupportsCreating<NetworkInterfaceTapConfiguration.DefinitionStages.Blank>, HasInner<NetworkInterfaceTapConfigurationsInner> {
+    /**
+     * Get the specified tap configuration on a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterfaceTapConfiguration> getAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName);
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterfaceTapConfiguration> listAsync(final String resourceGroupName, final String networkInterfaceName);
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaces.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaces.java
new file mode 100644
index 000000000000..69b4cd303f50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkInterfaces.java
@@ -0,0 +1,142 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+
+/**
+ * Type representing NetworkInterfaces.
+ */
+public interface NetworkInterfaces {
+    /**
+     * Begins definition for a new NetworkInterface resource.
+     * @param name resource name.
+     * @return the first stage of the new NetworkInterface definition.
+     */
+    NetworkInterface.DefinitionStages.Blank defineNetworkInterface(String name);
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName resource group name
+     * @param name resource name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterface> getByResourceGroupAsync(String resourceGroupName, String name);
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+     * @param resourceGroupName resource group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterface> listByResourceGroupAsync(String resourceGroupName);
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkInterface> listAsync();
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName resource group name
+     * @param name resource name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String name);
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EffectiveRouteListResult> getEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName);
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EffectiveNetworkSecurityGroupListResult> listEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName);
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancerNetworkInterface> listVirtualMachineScaleSetVMNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex);
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancerNetworkInterface> listVirtualMachineScaleSetNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName);
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<LoadBalancerNetworkInterface> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName);
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName);
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkOperationStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkOperationStatus.java
new file mode 100644
index 000000000000..0640ac5be764
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkOperationStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NetworkOperationStatus.
+ */
+public final class NetworkOperationStatus extends ExpandableStringEnum<NetworkOperationStatus> {
+    /** Static value InProgress for NetworkOperationStatus. */
+    public static final NetworkOperationStatus IN_PROGRESS = fromString("InProgress");
+
+    /** Static value Succeeded for NetworkOperationStatus. */
+    public static final NetworkOperationStatus SUCCEEDED = fromString("Succeeded");
+
+    /** Static value Failed for NetworkOperationStatus. */
+    public static final NetworkOperationStatus FAILED = fromString("Failed");
+
+    /**
+     * Creates or finds a NetworkOperationStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NetworkOperationStatus
+     */
+    @JsonCreator
+    public static NetworkOperationStatus fromString(String name) {
+        return fromString(name, NetworkOperationStatus.class);
+    }
+
+    /**
+     * @return known NetworkOperationStatus values
+     */
+    public static Collection<NetworkOperationStatus> values() {
+        return values(NetworkOperationStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfile.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfile.java
new file mode 100644
index 000000000000..9cd45e3d709e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfile.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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkProfileInner;
+
+/**
+ * Type representing NetworkProfile.
+ */
+public interface NetworkProfile extends HasInner<NetworkProfileInner>, Resource, GroupableResourceCore<NetworkManager, NetworkProfileInner>, HasResourceGroup, Refreshable<NetworkProfile>, Updatable<NetworkProfile.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the containerNetworkInterfaceConfigurations value.
+     */
+    List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations();
+
+    /**
+     * @return the containerNetworkInterfaces value.
+     */
+    List<ContainerNetworkInterface> containerNetworkInterfaces();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the NetworkProfile definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkProfile definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkProfile definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NetworkProfile definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the networkprofile definition allowing to specify ContainerNetworkInterfaceConfigurations.
+         */
+        interface WithContainerNetworkInterfaceConfigurations {
+            /**
+             * Specifies containerNetworkInterfaceConfigurations.
+             * @param containerNetworkInterfaceConfigurations List of chid container network interface configurations
+             * @return the next definition stage
+             */
+            WithCreate withContainerNetworkInterfaceConfigurations(List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations);
+        }
+
+        /**
+         * 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<NetworkProfile>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithContainerNetworkInterfaceConfigurations {
+        }
+    }
+    /**
+     * The template for a NetworkProfile update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkProfile>, Resource.UpdateWithTags<Update>, UpdateStages.WithContainerNetworkInterfaceConfigurations {
+    }
+
+    /**
+     * Grouping of NetworkProfile update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networkprofile update allowing to specify ContainerNetworkInterfaceConfigurations.
+         */
+        interface WithContainerNetworkInterfaceConfigurations {
+            /**
+             * Specifies containerNetworkInterfaceConfigurations.
+             * @param containerNetworkInterfaceConfigurations List of chid container network interface configurations
+             * @return the next update stage
+             */
+            Update withContainerNetworkInterfaceConfigurations(List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfiles.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfiles.java
new file mode 100644
index 000000000000..6c144ef14765
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkProfiles.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkProfilesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkProfiles.
+ */
+public interface NetworkProfiles extends SupportsCreating<NetworkProfile.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NetworkProfile>, SupportsListingByResourceGroup<NetworkProfile>, SupportsListing<NetworkProfile>, HasInner<NetworkProfilesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkRuleCondition.java
new file mode 100644
index 000000000000..5db336100663
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkRuleCondition.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Rule condition of type network.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "ruleConditionType", defaultImpl = NetworkRuleCondition.class)
+@JsonTypeName("NetworkRuleCondition")
+public class NetworkRuleCondition extends FirewallPolicyRuleCondition {
+    /**
+     * Array of FirewallPolicyRuleConditionNetworkProtocols.
+     */
+    @JsonProperty(value = "ipProtocols")
+    private List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols;
+
+    /**
+     * List of source IP addresses for this rule.
+     */
+    @JsonProperty(value = "sourceAddresses")
+    private List<String> sourceAddresses;
+
+    /**
+     * List of destination IP addresses or Service Tags.
+     */
+    @JsonProperty(value = "destinationAddresses")
+    private List<String> destinationAddresses;
+
+    /**
+     * List of destination ports.
+     */
+    @JsonProperty(value = "destinationPorts")
+    private List<String> destinationPorts;
+
+    /**
+     * List of source IpGroups for this rule.
+     */
+    @JsonProperty(value = "sourceIpGroups")
+    private List<String> sourceIpGroups;
+
+    /**
+     * List of destination IpGroups for this rule.
+     */
+    @JsonProperty(value = "destinationIpGroups")
+    private List<String> destinationIpGroups;
+
+    /**
+     * Get array of FirewallPolicyRuleConditionNetworkProtocols.
+     *
+     * @return the ipProtocols value
+     */
+    public List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols() {
+        return this.ipProtocols;
+    }
+
+    /**
+     * Set array of FirewallPolicyRuleConditionNetworkProtocols.
+     *
+     * @param ipProtocols the ipProtocols value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withIpProtocols(List<FirewallPolicyRuleConditionNetworkProtocol> ipProtocols) {
+        this.ipProtocols = ipProtocols;
+        return this;
+    }
+
+    /**
+     * Get list of source IP addresses for this rule.
+     *
+     * @return the sourceAddresses value
+     */
+    public List<String> sourceAddresses() {
+        return this.sourceAddresses;
+    }
+
+    /**
+     * Set list of source IP addresses for this rule.
+     *
+     * @param sourceAddresses the sourceAddresses value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withSourceAddresses(List<String> sourceAddresses) {
+        this.sourceAddresses = sourceAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination IP addresses or Service Tags.
+     *
+     * @return the destinationAddresses value
+     */
+    public List<String> destinationAddresses() {
+        return this.destinationAddresses;
+    }
+
+    /**
+     * Set list of destination IP addresses or Service Tags.
+     *
+     * @param destinationAddresses the destinationAddresses value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withDestinationAddresses(List<String> destinationAddresses) {
+        this.destinationAddresses = destinationAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of destination ports.
+     *
+     * @return the destinationPorts value
+     */
+    public List<String> destinationPorts() {
+        return this.destinationPorts;
+    }
+
+    /**
+     * Set list of destination ports.
+     *
+     * @param destinationPorts the destinationPorts value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withDestinationPorts(List<String> destinationPorts) {
+        this.destinationPorts = destinationPorts;
+        return this;
+    }
+
+    /**
+     * Get list of source IpGroups for this rule.
+     *
+     * @return the sourceIpGroups value
+     */
+    public List<String> sourceIpGroups() {
+        return this.sourceIpGroups;
+    }
+
+    /**
+     * Set list of source IpGroups for this rule.
+     *
+     * @param sourceIpGroups the sourceIpGroups value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
+        this.sourceIpGroups = sourceIpGroups;
+        return this;
+    }
+
+    /**
+     * Get list of destination IpGroups for this rule.
+     *
+     * @return the destinationIpGroups value
+     */
+    public List<String> destinationIpGroups() {
+        return this.destinationIpGroups;
+    }
+
+    /**
+     * Set list of destination IpGroups for this rule.
+     *
+     * @param destinationIpGroups the destinationIpGroups value to set
+     * @return the NetworkRuleCondition object itself.
+     */
+    public NetworkRuleCondition withDestinationIpGroups(List<String> destinationIpGroups) {
+        this.destinationIpGroups = destinationIpGroups;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroup.java
new file mode 100644
index 000000000000..078eacce96f6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroup.java
@@ -0,0 +1,134 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkSecurityGroupInner;
+
+/**
+ * Type representing NetworkSecurityGroup.
+ */
+public interface NetworkSecurityGroup extends HasInner<NetworkSecurityGroupInner>, Resource, GroupableResourceCore<NetworkManager, NetworkSecurityGroupInner>, HasResourceGroup, Refreshable<NetworkSecurityGroup>, Updatable<NetworkSecurityGroup.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the defaultSecurityRules value.
+     */
+    List<NetworkSecurityGroupSecurityRule> defaultSecurityRules();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the flowLogs value.
+     */
+    List<FlowLog> flowLogs();
+
+    /**
+     * @return the networkInterfaces value.
+     */
+    List<NetworkInterface> networkInterfaces();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the securityRules value.
+     */
+    List<NetworkSecurityGroupSecurityRule> securityRules();
+
+    /**
+     * @return the subnets value.
+     */
+    List<Subnet> subnets();
+
+    /**
+     * The entirety of the NetworkSecurityGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkSecurityGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkSecurityGroup definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NetworkSecurityGroup definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the networksecuritygroup definition allowing to specify SecurityRules.
+         */
+        interface WithSecurityRules {
+            /**
+             * Specifies securityRules.
+             * @param securityRules A collection of security rules of the network security group
+             * @return the next definition stage
+             */
+            WithCreate withSecurityRules(List<SecurityRuleInner> securityRules);
+        }
+
+        /**
+         * 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<NetworkSecurityGroup>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithSecurityRules {
+        }
+    }
+    /**
+     * The template for a NetworkSecurityGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkSecurityGroup>, Resource.UpdateWithTags<Update>, UpdateStages.WithSecurityRules {
+    }
+
+    /**
+     * Grouping of NetworkSecurityGroup update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
+         */
+        interface WithSecurityRules {
+            /**
+             * Specifies securityRules.
+             * @param securityRules A collection of security rules of the network security group
+             * @return the next update stage
+             */
+            Update withSecurityRules(List<SecurityRuleInner> securityRules);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupResult.java
new file mode 100644
index 000000000000..0c8764109fc2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupResult.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network configuration diagnostic result corresponded provided traffic query.
+ */
+public class NetworkSecurityGroupResult {
+    /**
+     * The network traffic is allowed or denied. Possible values include:
+     * 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "securityRuleAccessResult")
+    private SecurityRuleAccess securityRuleAccessResult;
+
+    /**
+     * List of results network security groups diagnostic.
+     */
+    @JsonProperty(value = "evaluatedNetworkSecurityGroups", access = JsonProperty.Access.WRITE_ONLY)
+    private List<EvaluatedNetworkSecurityGroup> evaluatedNetworkSecurityGroups;
+
+    /**
+     * Get the network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the securityRuleAccessResult value
+     */
+    public SecurityRuleAccess securityRuleAccessResult() {
+        return this.securityRuleAccessResult;
+    }
+
+    /**
+     * Set the network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param securityRuleAccessResult the securityRuleAccessResult value to set
+     * @return the NetworkSecurityGroupResult object itself.
+     */
+    public NetworkSecurityGroupResult withSecurityRuleAccessResult(SecurityRuleAccess securityRuleAccessResult) {
+        this.securityRuleAccessResult = securityRuleAccessResult;
+        return this;
+    }
+
+    /**
+     * Get list of results network security groups diagnostic.
+     *
+     * @return the evaluatedNetworkSecurityGroups value
+     */
+    public List<EvaluatedNetworkSecurityGroup> evaluatedNetworkSecurityGroups() {
+        return this.evaluatedNetworkSecurityGroups;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRule.java
new file mode 100644
index 000000000000..5efa21b436a7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRule.java
@@ -0,0 +1,542 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ApplicationSecurityGroupInner;
+
+/**
+ * Type representing NetworkSecurityGroupSecurityRule.
+ */
+public interface NetworkSecurityGroupSecurityRule extends HasInner<SecurityRuleInner>, Indexable, Refreshable<NetworkSecurityGroupSecurityRule>, Updatable<NetworkSecurityGroupSecurityRule.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the access value.
+     */
+    SecurityRuleAccess access();
+
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the destinationAddressPrefix value.
+     */
+    String destinationAddressPrefix();
+
+    /**
+     * @return the destinationAddressPrefixes value.
+     */
+    List<String> destinationAddressPrefixes();
+
+    /**
+     * @return the destinationApplicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> destinationApplicationSecurityGroups();
+
+    /**
+     * @return the destinationPortRange value.
+     */
+    String destinationPortRange();
+
+    /**
+     * @return the destinationPortRanges value.
+     */
+    List<String> destinationPortRanges();
+
+    /**
+     * @return the direction value.
+     */
+    SecurityRuleDirection direction();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the priority value.
+     */
+    Integer priority();
+
+    /**
+     * @return the protocol value.
+     */
+    SecurityRuleProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the sourceAddressPrefix value.
+     */
+    String sourceAddressPrefix();
+
+    /**
+     * @return the sourceAddressPrefixes value.
+     */
+    List<String> sourceAddressPrefixes();
+
+    /**
+     * @return the sourceApplicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> sourceApplicationSecurityGroups();
+
+    /**
+     * @return the sourcePortRange value.
+     */
+    String sourcePortRange();
+
+    /**
+     * @return the sourcePortRanges value.
+     */
+    List<String> sourcePortRanges();
+
+    /**
+     * The entirety of the NetworkSecurityGroupSecurityRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetworkSecurityGroup, DefinitionStages.WithAccess, DefinitionStages.WithDirection, DefinitionStages.WithProtocol, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkSecurityGroupSecurityRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkSecurityGroupSecurityRule definition.
+         */
+        interface Blank extends WithNetworkSecurityGroup {
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify NetworkSecurityGroup.
+         */
+        interface WithNetworkSecurityGroup {
+           /**
+            * Specifies resourceGroupName, networkSecurityGroupName.
+            * @param resourceGroupName The name of the resource group
+            * @param networkSecurityGroupName The name of the network security group
+            * @return the next definition stage
+            */
+            WithAccess withExistingNetworkSecurityGroup(String resourceGroupName, String networkSecurityGroupName);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Access.
+         */
+        interface WithAccess {
+           /**
+            * Specifies access.
+            * @param access The network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'
+            * @return the next definition stage
+            */
+            WithDirection withAccess(SecurityRuleAccess access);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Direction.
+         */
+        interface WithDirection {
+           /**
+            * Specifies direction.
+            * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values include: 'Inbound', 'Outbound'
+            * @return the next definition stage
+            */
+            WithProtocol withDirection(SecurityRuleDirection direction);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Protocol.
+         */
+        interface WithProtocol {
+           /**
+            * Specifies protocol.
+            * @param protocol Network protocol this rule applies to. Possible values include: 'Tcp', 'Udp', 'Icmp', 'Esp', '*', 'Ah'
+            * @return the next definition stage
+            */
+            WithCreate withProtocol(SecurityRuleProtocol protocol);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             * @param description A description for this rule. Restricted to 140 chars
+             * @return the next definition stage
+             */
+            WithCreate withDescription(String description);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify DestinationAddressPrefix.
+         */
+        interface WithDestinationAddressPrefix {
+            /**
+             * Specifies destinationAddressPrefix.
+             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
+             * @return the next definition stage
+             */
+            WithCreate withDestinationAddressPrefix(String destinationAddressPrefix);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify DestinationAddressPrefixes.
+         */
+        interface WithDestinationAddressPrefixes {
+            /**
+             * Specifies destinationAddressPrefixes.
+             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
+             * @return the next definition stage
+             */
+            WithCreate withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify DestinationApplicationSecurityGroups.
+         */
+        interface WithDestinationApplicationSecurityGroups {
+            /**
+             * Specifies destinationApplicationSecurityGroups.
+             * @param destinationApplicationSecurityGroups The application security group specified as destination
+             * @return the next definition stage
+             */
+            WithCreate withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify DestinationPortRange.
+         */
+        interface WithDestinationPortRange {
+            /**
+             * Specifies destinationPortRange.
+             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports
+             * @return the next definition stage
+             */
+            WithCreate withDestinationPortRange(String destinationPortRange);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify DestinationPortRanges.
+         */
+        interface WithDestinationPortRanges {
+            /**
+             * Specifies destinationPortRanges.
+             * @param destinationPortRanges The destination port ranges
+             * @return the next definition stage
+             */
+            WithCreate withDestinationPortRanges(List<String> destinationPortRanges);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify Priority.
+         */
+        interface WithPriority {
+            /**
+             * Specifies priority.
+             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
+             * @return the next definition stage
+             */
+            WithCreate withPriority(Integer priority);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify SourceAddressPrefix.
+         */
+        interface WithSourceAddressPrefix {
+            /**
+             * Specifies sourceAddressPrefix.
+             * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
+             * @return the next definition stage
+             */
+            WithCreate withSourceAddressPrefix(String sourceAddressPrefix);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify SourceAddressPrefixes.
+         */
+        interface WithSourceAddressPrefixes {
+            /**
+             * Specifies sourceAddressPrefixes.
+             * @param sourceAddressPrefixes The CIDR or source IP ranges
+             * @return the next definition stage
+             */
+            WithCreate withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify SourceApplicationSecurityGroups.
+         */
+        interface WithSourceApplicationSecurityGroups {
+            /**
+             * Specifies sourceApplicationSecurityGroups.
+             * @param sourceApplicationSecurityGroups The application security group specified as source
+             * @return the next definition stage
+             */
+            WithCreate withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify SourcePortRange.
+         */
+        interface WithSourcePortRange {
+            /**
+             * Specifies sourcePortRange.
+             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports
+             * @return the next definition stage
+             */
+            WithCreate withSourcePortRange(String sourcePortRange);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule definition allowing to specify SourcePortRanges.
+         */
+        interface WithSourcePortRanges {
+            /**
+             * Specifies sourcePortRanges.
+             * @param sourcePortRanges The source port ranges
+             * @return the next definition stage
+             */
+            WithCreate withSourcePortRanges(List<String> sourcePortRanges);
+        }
+
+        /**
+         * 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<NetworkSecurityGroupSecurityRule>, DefinitionStages.WithDescription, DefinitionStages.WithDestinationAddressPrefix, DefinitionStages.WithDestinationAddressPrefixes, DefinitionStages.WithDestinationApplicationSecurityGroups, DefinitionStages.WithDestinationPortRange, DefinitionStages.WithDestinationPortRanges, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithPriority, DefinitionStages.WithSourceAddressPrefix, DefinitionStages.WithSourceAddressPrefixes, DefinitionStages.WithSourceApplicationSecurityGroups, DefinitionStages.WithSourcePortRange, DefinitionStages.WithSourcePortRanges {
+        }
+    }
+    /**
+     * The template for a NetworkSecurityGroupSecurityRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkSecurityGroupSecurityRule>, UpdateStages.WithDescription, UpdateStages.WithDestinationAddressPrefix, UpdateStages.WithDestinationAddressPrefixes, UpdateStages.WithDestinationApplicationSecurityGroups, UpdateStages.WithDestinationPortRange, UpdateStages.WithDestinationPortRanges, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPriority, UpdateStages.WithSourceAddressPrefix, UpdateStages.WithSourceAddressPrefixes, UpdateStages.WithSourceApplicationSecurityGroups, UpdateStages.WithSourcePortRange, UpdateStages.WithSourcePortRanges {
+    }
+
+    /**
+     * Grouping of NetworkSecurityGroupSecurityRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             * @param description A description for this rule. Restricted to 140 chars
+             * @return the next update stage
+             */
+            Update withDescription(String description);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify DestinationAddressPrefix.
+         */
+        interface WithDestinationAddressPrefix {
+            /**
+             * Specifies destinationAddressPrefix.
+             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
+             * @return the next update stage
+             */
+            Update withDestinationAddressPrefix(String destinationAddressPrefix);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify DestinationAddressPrefixes.
+         */
+        interface WithDestinationAddressPrefixes {
+            /**
+             * Specifies destinationAddressPrefixes.
+             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
+             * @return the next update stage
+             */
+            Update withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify DestinationApplicationSecurityGroups.
+         */
+        interface WithDestinationApplicationSecurityGroups {
+            /**
+             * Specifies destinationApplicationSecurityGroups.
+             * @param destinationApplicationSecurityGroups The application security group specified as destination
+             * @return the next update stage
+             */
+            Update withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify DestinationPortRange.
+         */
+        interface WithDestinationPortRange {
+            /**
+             * Specifies destinationPortRange.
+             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports
+             * @return the next update stage
+             */
+            Update withDestinationPortRange(String destinationPortRange);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify DestinationPortRanges.
+         */
+        interface WithDestinationPortRanges {
+            /**
+             * Specifies destinationPortRanges.
+             * @param destinationPortRanges The destination port ranges
+             * @return the next update stage
+             */
+            Update withDestinationPortRanges(List<String> destinationPortRanges);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify Priority.
+         */
+        interface WithPriority {
+            /**
+             * Specifies priority.
+             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
+             * @return the next update stage
+             */
+            Update withPriority(Integer priority);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify SourceAddressPrefix.
+         */
+        interface WithSourceAddressPrefix {
+            /**
+             * Specifies sourceAddressPrefix.
+             * @param sourceAddressPrefix The CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
+             * @return the next update stage
+             */
+            Update withSourceAddressPrefix(String sourceAddressPrefix);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify SourceAddressPrefixes.
+         */
+        interface WithSourceAddressPrefixes {
+            /**
+             * Specifies sourceAddressPrefixes.
+             * @param sourceAddressPrefixes The CIDR or source IP ranges
+             * @return the next update stage
+             */
+            Update withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify SourceApplicationSecurityGroups.
+         */
+        interface WithSourceApplicationSecurityGroups {
+            /**
+             * Specifies sourceApplicationSecurityGroups.
+             * @param sourceApplicationSecurityGroups The application security group specified as source
+             * @return the next update stage
+             */
+            Update withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify SourcePortRange.
+         */
+        interface WithSourcePortRange {
+            /**
+             * Specifies sourcePortRange.
+             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports
+             * @return the next update stage
+             */
+            Update withSourcePortRange(String sourcePortRange);
+        }
+
+        /**
+         * The stage of the networksecuritygroupsecurityrule update allowing to specify SourcePortRanges.
+         */
+        interface WithSourcePortRanges {
+            /**
+             * Specifies sourcePortRanges.
+             * @param sourcePortRanges The source port ranges
+             * @return the next update stage
+             */
+            Update withSourcePortRanges(List<String> sourcePortRanges);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRuleModel.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRuleModel.java
new file mode 100644
index 000000000000..ed3be9c17346
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroupSecurityRuleModel.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing NetworkSecurityGroupSecurityRuleModel.
+ */
+public interface NetworkSecurityGroupSecurityRuleModel extends HasInner<SecurityRuleInner>, Indexable, Refreshable<NetworkSecurityGroupSecurityRuleModel>, HasManager<NetworkManager> {
+    /**
+     * @return the access value.
+     */
+    SecurityRuleAccess access();
+
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the destinationAddressPrefix value.
+     */
+    String destinationAddressPrefix();
+
+    /**
+     * @return the destinationAddressPrefixes value.
+     */
+    List<String> destinationAddressPrefixes();
+
+    /**
+     * @return the destinationApplicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> destinationApplicationSecurityGroups();
+
+    /**
+     * @return the destinationPortRange value.
+     */
+    String destinationPortRange();
+
+    /**
+     * @return the destinationPortRanges value.
+     */
+    List<String> destinationPortRanges();
+
+    /**
+     * @return the direction value.
+     */
+    SecurityRuleDirection direction();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the priority value.
+     */
+    Integer priority();
+
+    /**
+     * @return the protocol value.
+     */
+    SecurityRuleProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the sourceAddressPrefix value.
+     */
+    String sourceAddressPrefix();
+
+    /**
+     * @return the sourceAddressPrefixes value.
+     */
+    List<String> sourceAddressPrefixes();
+
+    /**
+     * @return the sourceApplicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> sourceApplicationSecurityGroups();
+
+    /**
+     * @return the sourcePortRange value.
+     */
+    String sourcePortRange();
+
+    /**
+     * @return the sourcePortRanges value.
+     */
+    List<String> sourcePortRanges();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroups.java
new file mode 100644
index 000000000000..e693c8ff4cb0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityGroups.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkSecurityGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkSecurityGroups.
+ */
+public interface NetworkSecurityGroups extends SupportsCreating<NetworkSecurityGroup.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NetworkSecurityGroup>, SupportsListingByResourceGroup<NetworkSecurityGroup>, SupportsListing<NetworkSecurityGroup>, HasInner<NetworkSecurityGroupsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityRulesEvaluationResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityRulesEvaluationResult.java
new file mode 100644
index 000000000000..1ec115d31dd9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkSecurityRulesEvaluationResult.java
@@ -0,0 +1,173 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network security rules evaluation result.
+ */
+public class NetworkSecurityRulesEvaluationResult {
+    /**
+     * Name of the network security rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Value indicating whether protocol is matched.
+     */
+    @JsonProperty(value = "protocolMatched")
+    private Boolean protocolMatched;
+
+    /**
+     * Value indicating whether source is matched.
+     */
+    @JsonProperty(value = "sourceMatched")
+    private Boolean sourceMatched;
+
+    /**
+     * Value indicating whether source port is matched.
+     */
+    @JsonProperty(value = "sourcePortMatched")
+    private Boolean sourcePortMatched;
+
+    /**
+     * Value indicating whether destination is matched.
+     */
+    @JsonProperty(value = "destinationMatched")
+    private Boolean destinationMatched;
+
+    /**
+     * Value indicating whether destination port is matched.
+     */
+    @JsonProperty(value = "destinationPortMatched")
+    private Boolean destinationPortMatched;
+
+    /**
+     * Get name of the network security rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the network security rule.
+     *
+     * @param name the name value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether protocol is matched.
+     *
+     * @return the protocolMatched value
+     */
+    public Boolean protocolMatched() {
+        return this.protocolMatched;
+    }
+
+    /**
+     * Set value indicating whether protocol is matched.
+     *
+     * @param protocolMatched the protocolMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withProtocolMatched(Boolean protocolMatched) {
+        this.protocolMatched = protocolMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether source is matched.
+     *
+     * @return the sourceMatched value
+     */
+    public Boolean sourceMatched() {
+        return this.sourceMatched;
+    }
+
+    /**
+     * Set value indicating whether source is matched.
+     *
+     * @param sourceMatched the sourceMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withSourceMatched(Boolean sourceMatched) {
+        this.sourceMatched = sourceMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether source port is matched.
+     *
+     * @return the sourcePortMatched value
+     */
+    public Boolean sourcePortMatched() {
+        return this.sourcePortMatched;
+    }
+
+    /**
+     * Set value indicating whether source port is matched.
+     *
+     * @param sourcePortMatched the sourcePortMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withSourcePortMatched(Boolean sourcePortMatched) {
+        this.sourcePortMatched = sourcePortMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether destination is matched.
+     *
+     * @return the destinationMatched value
+     */
+    public Boolean destinationMatched() {
+        return this.destinationMatched;
+    }
+
+    /**
+     * Set value indicating whether destination is matched.
+     *
+     * @param destinationMatched the destinationMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withDestinationMatched(Boolean destinationMatched) {
+        this.destinationMatched = destinationMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether destination port is matched.
+     *
+     * @return the destinationPortMatched value
+     */
+    public Boolean destinationPortMatched() {
+        return this.destinationPortMatched;
+    }
+
+    /**
+     * Set value indicating whether destination port is matched.
+     *
+     * @param destinationPortMatched the destinationPortMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withDestinationPortMatched(Boolean destinationPortMatched) {
+        this.destinationPortMatched = destinationPortMatched;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliance.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliance.java
new file mode 100644
index 000000000000..aa718452041e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliance.java
@@ -0,0 +1,259 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkVirtualApplianceInner;
+
+/**
+ * Type representing NetworkVirtualAppliance.
+ */
+public interface NetworkVirtualAppliance extends HasInner<NetworkVirtualApplianceInner>, Resource, GroupableResourceCore<NetworkManager, NetworkVirtualApplianceInner>, HasResourceGroup, Refreshable<NetworkVirtualAppliance>, Updatable<NetworkVirtualAppliance.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the bootStrapConfigurationBlob value.
+     */
+    List<String> bootStrapConfigurationBlob();
+
+    /**
+     * @return the cloudInitConfigurationBlob value.
+     */
+    List<String> cloudInitConfigurationBlob();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the identity value.
+     */
+    ManagedServiceIdentity identity();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the sku value.
+     */
+    VirtualApplianceSkuProperties sku();
+
+    /**
+     * @return the virtualApplianceAsn value.
+     */
+    Long virtualApplianceAsn();
+
+    /**
+     * @return the virtualApplianceNics value.
+     */
+    List<VirtualApplianceNicProperties> virtualApplianceNics();
+
+    /**
+     * @return the virtualHub value.
+     */
+    SubResource virtualHub();
+
+    /**
+     * The entirety of the NetworkVirtualAppliance definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkVirtualAppliance definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkVirtualAppliance definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NetworkVirtualAppliance definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify BootStrapConfigurationBlob.
+         */
+        interface WithBootStrapConfigurationBlob {
+            /**
+             * Specifies bootStrapConfigurationBlob.
+             * @param bootStrapConfigurationBlob BootStrapConfigurationBlob storage URLs
+             * @return the next definition stage
+             */
+            WithCreate withBootStrapConfigurationBlob(List<String> bootStrapConfigurationBlob);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify CloudInitConfigurationBlob.
+         */
+        interface WithCloudInitConfigurationBlob {
+            /**
+             * Specifies cloudInitConfigurationBlob.
+             * @param cloudInitConfigurationBlob CloudInitConfigurationBlob storage URLs
+             * @return the next definition stage
+             */
+            WithCreate withCloudInitConfigurationBlob(List<String> cloudInitConfigurationBlob);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The service principal that has read access to cloud-init and config blob
+             * @return the next definition stage
+             */
+            WithCreate withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku Network Virtual Appliance SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(VirtualApplianceSkuProperties sku);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify VirtualApplianceAsn.
+         */
+        interface WithVirtualApplianceAsn {
+            /**
+             * Specifies virtualApplianceAsn.
+             * @param virtualApplianceAsn VirtualAppliance ASN
+             * @return the next definition stage
+             */
+            WithCreate withVirtualApplianceAsn(Long virtualApplianceAsn);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The Virtual Hub where Network Virtual Appliance is being deployed
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * 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<NetworkVirtualAppliance>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBootStrapConfigurationBlob, DefinitionStages.WithCloudInitConfigurationBlob, DefinitionStages.WithIdentity, DefinitionStages.WithSku, DefinitionStages.WithVirtualApplianceAsn, DefinitionStages.WithVirtualHub {
+        }
+    }
+    /**
+     * The template for a NetworkVirtualAppliance update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkVirtualAppliance>, Resource.UpdateWithTags<Update>, UpdateStages.WithBootStrapConfigurationBlob, UpdateStages.WithCloudInitConfigurationBlob, UpdateStages.WithIdentity, UpdateStages.WithSku, UpdateStages.WithVirtualApplianceAsn, UpdateStages.WithVirtualHub {
+    }
+
+    /**
+     * Grouping of NetworkVirtualAppliance update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify BootStrapConfigurationBlob.
+         */
+        interface WithBootStrapConfigurationBlob {
+            /**
+             * Specifies bootStrapConfigurationBlob.
+             * @param bootStrapConfigurationBlob BootStrapConfigurationBlob storage URLs
+             * @return the next update stage
+             */
+            Update withBootStrapConfigurationBlob(List<String> bootStrapConfigurationBlob);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify CloudInitConfigurationBlob.
+         */
+        interface WithCloudInitConfigurationBlob {
+            /**
+             * Specifies cloudInitConfigurationBlob.
+             * @param cloudInitConfigurationBlob CloudInitConfigurationBlob storage URLs
+             * @return the next update stage
+             */
+            Update withCloudInitConfigurationBlob(List<String> cloudInitConfigurationBlob);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The service principal that has read access to cloud-init and config blob
+             * @return the next update stage
+             */
+            Update withIdentity(ManagedServiceIdentity identity);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku Network Virtual Appliance SKU
+             * @return the next update stage
+             */
+            Update withSku(VirtualApplianceSkuProperties sku);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify VirtualApplianceAsn.
+         */
+        interface WithVirtualApplianceAsn {
+            /**
+             * Specifies virtualApplianceAsn.
+             * @param virtualApplianceAsn VirtualAppliance ASN
+             * @return the next update stage
+             */
+            Update withVirtualApplianceAsn(Long virtualApplianceAsn);
+        }
+
+        /**
+         * The stage of the networkvirtualappliance update allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The Virtual Hub where Network Virtual Appliance is being deployed
+             * @return the next update stage
+             */
+            Update withVirtualHub(SubResource virtualHub);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliances.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliances.java
new file mode 100644
index 000000000000..7651b92d96b7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkVirtualAppliances.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkVirtualAppliancesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkVirtualAppliances.
+ */
+public interface NetworkVirtualAppliances extends SupportsCreating<NetworkVirtualAppliance.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NetworkVirtualAppliance>, SupportsListingByResourceGroup<NetworkVirtualAppliance>, SupportsListing<NetworkVirtualAppliance>, HasInner<NetworkVirtualAppliancesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatcher.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatcher.java
new file mode 100644
index 000000000000..270337bae95d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatcher.java
@@ -0,0 +1,78 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkWatcherInner;
+
+/**
+ * Type representing NetworkWatcher.
+ */
+public interface NetworkWatcher extends HasInner<NetworkWatcherInner>, Resource, GroupableResourceCore<NetworkManager, NetworkWatcherInner>, HasResourceGroup, Refreshable<NetworkWatcher>, Updatable<NetworkWatcher.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * The entirety of the NetworkWatcher definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NetworkWatcher definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NetworkWatcher definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NetworkWatcher definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * 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<NetworkWatcher>, Resource.DefinitionWithTags<WithCreate> {
+        }
+    }
+    /**
+     * The template for a NetworkWatcher update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NetworkWatcher>, Resource.UpdateWithTags<Update> {
+    }
+
+    /**
+     * Grouping of NetworkWatcher update stages.
+     */
+    interface UpdateStages {
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatchers.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatchers.java
new file mode 100644
index 000000000000..5f0bf3dac09d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NetworkWatchers.java
@@ -0,0 +1,158 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.FlowLogInformationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkWatchersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing NetworkWatchers.
+ */
+public interface NetworkWatchers extends SupportsCreating<NetworkWatcher.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NetworkWatcher>, SupportsListingByResourceGroup<NetworkWatcher>, SupportsListing<NetworkWatcher>, HasInner<NetworkWatchersInner> {
+    /**
+     * Gets the current network topology by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the representation of topology.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Topology> getTopologyAsync(String resourceGroupName, String networkWatcherName, TopologyParameters parameters);
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VerificationIPFlowResult> verifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters);
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NextHopResult> getNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters);
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SecurityGroupViewResult> getVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId);
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<TroubleshootingResult> getTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters);
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<TroubleshootingResult> getTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId);
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FlowLogInformation> setFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters);
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<FlowLogInformation> getFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId);
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectivityInformation> checkConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters);
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AzureReachabilityReport> getAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters);
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailableProvidersList> listAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters);
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkConfigurationDiagnosticResponse> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopParameters.java
new file mode 100644
index 000000000000..a5d701e6a514
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopParameters.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the source and destination endpoint.
+ */
+public class NextHopParameters {
+    /**
+     * The resource identifier of the target resource against which the action
+     * is to be performed.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * The source IP address.
+     */
+    @JsonProperty(value = "sourceIPAddress", required = true)
+    private String sourceIPAddress;
+
+    /**
+     * The destination IP address.
+     */
+    @JsonProperty(value = "destinationIPAddress", required = true)
+    private String destinationIPAddress;
+
+    /**
+     * The NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any
+     * of the nics, then this parameter must be specified. Otherwise optional).
+     */
+    @JsonProperty(value = "targetNicResourceId")
+    private String targetNicResourceId;
+
+    /**
+     * Get the resource identifier of the target resource against which the action is to be performed.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the resource identifier of the target resource against which the action is to be performed.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the NextHopParameters object itself.
+     */
+    public NextHopParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get the source IP address.
+     *
+     * @return the sourceIPAddress value
+     */
+    public String sourceIPAddress() {
+        return this.sourceIPAddress;
+    }
+
+    /**
+     * Set the source IP address.
+     *
+     * @param sourceIPAddress the sourceIPAddress value to set
+     * @return the NextHopParameters object itself.
+     */
+    public NextHopParameters withSourceIPAddress(String sourceIPAddress) {
+        this.sourceIPAddress = sourceIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the destination IP address.
+     *
+     * @return the destinationIPAddress value
+     */
+    public String destinationIPAddress() {
+        return this.destinationIPAddress;
+    }
+
+    /**
+     * Set the destination IP address.
+     *
+     * @param destinationIPAddress the destinationIPAddress value to set
+     * @return the NextHopParameters object itself.
+     */
+    public NextHopParameters withDestinationIPAddress(String destinationIPAddress) {
+        this.destinationIPAddress = destinationIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any of the nics, then this parameter must be specified. Otherwise optional).
+     *
+     * @return the targetNicResourceId value
+     */
+    public String targetNicResourceId() {
+        return this.targetNicResourceId;
+    }
+
+    /**
+     * Set the NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any of the nics, then this parameter must be specified. Otherwise optional).
+     *
+     * @param targetNicResourceId the targetNicResourceId value to set
+     * @return the NextHopParameters object itself.
+     */
+    public NextHopParameters withTargetNicResourceId(String targetNicResourceId) {
+        this.targetNicResourceId = targetNicResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopResult.java
new file mode 100644
index 000000000000..87d91c4d3ab0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NextHopResultInner;
+
+/**
+ * Type representing NextHopResult.
+ */
+public interface NextHopResult extends HasInner<NextHopResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextHopIpAddress value.
+     */
+    String nextHopIpAddress();
+
+    /**
+     * @return the nextHopType value.
+     */
+    NextHopType nextHopType();
+
+    /**
+     * @return the routeTableId value.
+     */
+    String routeTableId();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopType.java
new file mode 100644
index 000000000000..510eaa050046
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NextHopType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NextHopType.
+ */
+public final class NextHopType extends ExpandableStringEnum<NextHopType> {
+    /** Static value Internet for NextHopType. */
+    public static final NextHopType INTERNET = fromString("Internet");
+
+    /** Static value VirtualAppliance for NextHopType. */
+    public static final NextHopType VIRTUAL_APPLIANCE = fromString("VirtualAppliance");
+
+    /** Static value VirtualNetworkGateway for NextHopType. */
+    public static final NextHopType VIRTUAL_NETWORK_GATEWAY = fromString("VirtualNetworkGateway");
+
+    /** Static value VnetLocal for NextHopType. */
+    public static final NextHopType VNET_LOCAL = fromString("VnetLocal");
+
+    /** Static value HyperNetGateway for NextHopType. */
+    public static final NextHopType HYPER_NET_GATEWAY = fromString("HyperNetGateway");
+
+    /** Static value None for NextHopType. */
+    public static final NextHopType NONE = fromString("None");
+
+    /**
+     * Creates or finds a NextHopType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NextHopType
+     */
+    @JsonCreator
+    public static NextHopType fromString(String name) {
+        return fromString(name, NextHopType.class);
+    }
+
+    /**
+     * @return known NextHopType values
+     */
+    public static Collection<NextHopType> values() {
+        return values(NextHopType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OfficeTrafficCategory.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OfficeTrafficCategory.java
new file mode 100644
index 000000000000..25766a171f84
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OfficeTrafficCategory.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OfficeTrafficCategory.
+ */
+public final class OfficeTrafficCategory extends ExpandableStringEnum<OfficeTrafficCategory> {
+    /** Static value Optimize for OfficeTrafficCategory. */
+    public static final OfficeTrafficCategory OPTIMIZE = fromString("Optimize");
+
+    /** Static value OptimizeAndAllow for OfficeTrafficCategory. */
+    public static final OfficeTrafficCategory OPTIMIZE_AND_ALLOW = fromString("OptimizeAndAllow");
+
+    /** Static value All for OfficeTrafficCategory. */
+    public static final OfficeTrafficCategory ALL = fromString("All");
+
+    /** Static value None for OfficeTrafficCategory. */
+    public static final OfficeTrafficCategory NONE = fromString("None");
+
+    /**
+     * Creates or finds a OfficeTrafficCategory from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OfficeTrafficCategory
+     */
+    @JsonCreator
+    public static OfficeTrafficCategory fromString(String name) {
+        return fromString(name, OfficeTrafficCategory.class);
+    }
+
+    /**
+     * @return known OfficeTrafficCategory values
+     */
+    public static Collection<OfficeTrafficCategory> values() {
+        return values(OfficeTrafficCategory.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operation.java
new file mode 100644
index 000000000000..f074e4670623
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operation.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.OperationInner;
+
+/**
+ * Type representing Operation.
+ */
+public interface Operation extends HasInner<OperationInner>, HasManager<NetworkManager> {
+    /**
+     * @return the display value.
+     */
+    OperationDisplay display();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the origin value.
+     */
+    String origin();
+
+    /**
+     * @return the serviceSpecification value.
+     */
+    OperationPropertiesFormatServiceSpecification serviceSpecification();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationDisplay.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationDisplay.java
new file mode 100644
index 000000000000..04a624770dff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationDisplay.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Display metadata associated with the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft Network.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Type of the operation: get, read, delete, etc.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Description of the operation.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Get service provider: Microsoft Network.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set service provider: Microsoft Network.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get resource on which the operation is performed.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set resource on which the operation is performed.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    /**
+     * Get type of the operation: get, read, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set type of the operation: get, read, delete, etc.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    /**
+     * Get description of the operation.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the operation.
+     *
+     * @param description the description value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationPropertiesFormatServiceSpecification.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationPropertiesFormatServiceSpecification.java
new file mode 100644
index 000000000000..427efd44eff5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OperationPropertiesFormatServiceSpecification.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Specification of the service.
+ */
+public class OperationPropertiesFormatServiceSpecification {
+    /**
+     * Operation service specification.
+     */
+    @JsonProperty(value = "metricSpecifications")
+    private List<MetricSpecification> metricSpecifications;
+
+    /**
+     * Operation log specification.
+     */
+    @JsonProperty(value = "logSpecifications")
+    private List<LogSpecification> logSpecifications;
+
+    /**
+     * Get operation service specification.
+     *
+     * @return the metricSpecifications value
+     */
+    public List<MetricSpecification> metricSpecifications() {
+        return this.metricSpecifications;
+    }
+
+    /**
+     * Set operation service specification.
+     *
+     * @param metricSpecifications the metricSpecifications value to set
+     * @return the OperationPropertiesFormatServiceSpecification object itself.
+     */
+    public OperationPropertiesFormatServiceSpecification withMetricSpecifications(List<MetricSpecification> metricSpecifications) {
+        this.metricSpecifications = metricSpecifications;
+        return this;
+    }
+
+    /**
+     * Get operation log specification.
+     *
+     * @return the logSpecifications value
+     */
+    public List<LogSpecification> logSpecifications() {
+        return this.logSpecifications;
+    }
+
+    /**
+     * Set operation log specification.
+     *
+     * @param logSpecifications the logSpecifications value to set
+     * @return the OperationPropertiesFormatServiceSpecification object itself.
+     */
+    public OperationPropertiesFormatServiceSpecification withLogSpecifications(List<LogSpecification> logSpecifications) {
+        this.logSpecifications = logSpecifications;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Operations.java
new file mode 100644
index 000000000000..41cefa4c183b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_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 Network Rest API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Operation> listAsync();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Origin.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Origin.java
new file mode 100644
index 000000000000..95e120459085
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Origin.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Origin.
+ */
+public final class Origin extends ExpandableStringEnum<Origin> {
+    /** Static value Local for Origin. */
+    public static final Origin LOCAL = fromString("Local");
+
+    /** Static value Inbound for Origin. */
+    public static final Origin INBOUND = fromString("Inbound");
+
+    /** Static value Outbound for Origin. */
+    public static final Origin OUTBOUND = fromString("Outbound");
+
+    /**
+     * Creates or finds a Origin from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Origin
+     */
+    @JsonCreator
+    public static Origin fromString(String name) {
+        return fromString(name, Origin.class);
+    }
+
+    /**
+     * @return known Origin values
+     */
+    public static Collection<Origin> values() {
+        return values(Origin.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutboundRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutboundRule.java
new file mode 100644
index 000000000000..524a33d0e840
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutboundRule.java
@@ -0,0 +1,79 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.OutboundRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+
+/**
+ * Type representing OutboundRule.
+ */
+public interface OutboundRule extends HasInner<OutboundRuleInner>, Indexable, Refreshable<OutboundRule>, HasManager<NetworkManager> {
+    /**
+     * @return the allocatedOutboundPorts value.
+     */
+    Integer allocatedOutboundPorts();
+
+    /**
+     * @return the backendAddressPool value.
+     */
+    SubResource backendAddressPool();
+
+    /**
+     * @return the enableTcpReset value.
+     */
+    Boolean enableTcpReset();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the frontendIPConfigurations value.
+     */
+    List<SubResource> frontendIPConfigurations();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the idleTimeoutInMinutes value.
+     */
+    Integer idleTimeoutInMinutes();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the protocol value.
+     */
+    LoadBalancerOutboundRuleProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutputType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutputType.java
new file mode 100644
index 000000000000..abbb5724ed35
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OutputType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OutputType.
+ */
+public final class OutputType extends ExpandableStringEnum<OutputType> {
+    /** Static value Workspace for OutputType. */
+    public static final OutputType WORKSPACE = fromString("Workspace");
+
+    /**
+     * Creates or finds a OutputType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OutputType
+     */
+    @JsonCreator
+    public static OutputType fromString(String name) {
+        return fromString(name, OutputType.class);
+    }
+
+    /**
+     * @return known OutputType values
+     */
+    public static Collection<OutputType> values() {
+        return values(OutputType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntry.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntry.java
new file mode 100644
index 000000000000..c45aee01bb5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntry.java
@@ -0,0 +1,100 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Allow to exclude some variable satisfy the condition for the WAF check.
+ */
+public class OwaspCrsExclusionEntry {
+    /**
+     * The variable to be excluded. Possible values include:
+     * 'RequestHeaderNames', 'RequestCookieNames', 'RequestArgNames'.
+     */
+    @JsonProperty(value = "matchVariable", required = true)
+    private OwaspCrsExclusionEntryMatchVariable matchVariable;
+
+    /**
+     * When matchVariable is a collection, operate on the selector to specify
+     * which elements in the collection this exclusion applies to. Possible
+     * values include: 'Equals', 'Contains', 'StartsWith', 'EndsWith',
+     * 'EqualsAny'.
+     */
+    @JsonProperty(value = "selectorMatchOperator", required = true)
+    private OwaspCrsExclusionEntrySelectorMatchOperator selectorMatchOperator;
+
+    /**
+     * When matchVariable is a collection, operator used to specify which
+     * elements in the collection this exclusion applies to.
+     */
+    @JsonProperty(value = "selector", required = true)
+    private String selector;
+
+    /**
+     * Get the variable to be excluded. Possible values include: 'RequestHeaderNames', 'RequestCookieNames', 'RequestArgNames'.
+     *
+     * @return the matchVariable value
+     */
+    public OwaspCrsExclusionEntryMatchVariable matchVariable() {
+        return this.matchVariable;
+    }
+
+    /**
+     * Set the variable to be excluded. Possible values include: 'RequestHeaderNames', 'RequestCookieNames', 'RequestArgNames'.
+     *
+     * @param matchVariable the matchVariable value to set
+     * @return the OwaspCrsExclusionEntry object itself.
+     */
+    public OwaspCrsExclusionEntry withMatchVariable(OwaspCrsExclusionEntryMatchVariable matchVariable) {
+        this.matchVariable = matchVariable;
+        return this;
+    }
+
+    /**
+     * Get when matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to. Possible values include: 'Equals', 'Contains', 'StartsWith', 'EndsWith', 'EqualsAny'.
+     *
+     * @return the selectorMatchOperator value
+     */
+    public OwaspCrsExclusionEntrySelectorMatchOperator selectorMatchOperator() {
+        return this.selectorMatchOperator;
+    }
+
+    /**
+     * Set when matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to. Possible values include: 'Equals', 'Contains', 'StartsWith', 'EndsWith', 'EqualsAny'.
+     *
+     * @param selectorMatchOperator the selectorMatchOperator value to set
+     * @return the OwaspCrsExclusionEntry object itself.
+     */
+    public OwaspCrsExclusionEntry withSelectorMatchOperator(OwaspCrsExclusionEntrySelectorMatchOperator selectorMatchOperator) {
+        this.selectorMatchOperator = selectorMatchOperator;
+        return this;
+    }
+
+    /**
+     * Get when matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to.
+     *
+     * @return the selector value
+     */
+    public String selector() {
+        return this.selector;
+    }
+
+    /**
+     * Set when matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to.
+     *
+     * @param selector the selector value to set
+     * @return the OwaspCrsExclusionEntry object itself.
+     */
+    public OwaspCrsExclusionEntry withSelector(String selector) {
+        this.selector = selector;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntryMatchVariable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntryMatchVariable.java
new file mode 100644
index 000000000000..217718d9ea32
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntryMatchVariable.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OwaspCrsExclusionEntryMatchVariable.
+ */
+public final class OwaspCrsExclusionEntryMatchVariable extends ExpandableStringEnum<OwaspCrsExclusionEntryMatchVariable> {
+    /** Static value RequestHeaderNames for OwaspCrsExclusionEntryMatchVariable. */
+    public static final OwaspCrsExclusionEntryMatchVariable REQUEST_HEADER_NAMES = fromString("RequestHeaderNames");
+
+    /** Static value RequestCookieNames for OwaspCrsExclusionEntryMatchVariable. */
+    public static final OwaspCrsExclusionEntryMatchVariable REQUEST_COOKIE_NAMES = fromString("RequestCookieNames");
+
+    /** Static value RequestArgNames for OwaspCrsExclusionEntryMatchVariable. */
+    public static final OwaspCrsExclusionEntryMatchVariable REQUEST_ARG_NAMES = fromString("RequestArgNames");
+
+    /**
+     * Creates or finds a OwaspCrsExclusionEntryMatchVariable from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OwaspCrsExclusionEntryMatchVariable
+     */
+    @JsonCreator
+    public static OwaspCrsExclusionEntryMatchVariable fromString(String name) {
+        return fromString(name, OwaspCrsExclusionEntryMatchVariable.class);
+    }
+
+    /**
+     * @return known OwaspCrsExclusionEntryMatchVariable values
+     */
+    public static Collection<OwaspCrsExclusionEntryMatchVariable> values() {
+        return values(OwaspCrsExclusionEntryMatchVariable.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntrySelectorMatchOperator.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntrySelectorMatchOperator.java
new file mode 100644
index 000000000000..14cadbb69d75
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/OwaspCrsExclusionEntrySelectorMatchOperator.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OwaspCrsExclusionEntrySelectorMatchOperator.
+ */
+public final class OwaspCrsExclusionEntrySelectorMatchOperator extends ExpandableStringEnum<OwaspCrsExclusionEntrySelectorMatchOperator> {
+    /** Static value Equals for OwaspCrsExclusionEntrySelectorMatchOperator. */
+    public static final OwaspCrsExclusionEntrySelectorMatchOperator EQUALS = fromString("Equals");
+
+    /** Static value Contains for OwaspCrsExclusionEntrySelectorMatchOperator. */
+    public static final OwaspCrsExclusionEntrySelectorMatchOperator CONTAINS = fromString("Contains");
+
+    /** Static value StartsWith for OwaspCrsExclusionEntrySelectorMatchOperator. */
+    public static final OwaspCrsExclusionEntrySelectorMatchOperator STARTS_WITH = fromString("StartsWith");
+
+    /** Static value EndsWith for OwaspCrsExclusionEntrySelectorMatchOperator. */
+    public static final OwaspCrsExclusionEntrySelectorMatchOperator ENDS_WITH = fromString("EndsWith");
+
+    /** Static value EqualsAny for OwaspCrsExclusionEntrySelectorMatchOperator. */
+    public static final OwaspCrsExclusionEntrySelectorMatchOperator EQUALS_ANY = fromString("EqualsAny");
+
+    /**
+     * Creates or finds a OwaspCrsExclusionEntrySelectorMatchOperator from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OwaspCrsExclusionEntrySelectorMatchOperator
+     */
+    @JsonCreator
+    public static OwaspCrsExclusionEntrySelectorMatchOperator fromString(String name) {
+        return fromString(name, OwaspCrsExclusionEntrySelectorMatchOperator.class);
+    }
+
+    /**
+     * @return known OwaspCrsExclusionEntrySelectorMatchOperator values
+     */
+    public static Collection<OwaspCrsExclusionEntrySelectorMatchOperator> values() {
+        return values(OwaspCrsExclusionEntrySelectorMatchOperator.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SConnectionConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SConnectionConfiguration.java
new file mode 100644
index 000000000000..d86b60e2097e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SConnectionConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * P2SConnectionConfiguration Resource.
+ */
+@JsonFlatten
+public class P2SConnectionConfiguration extends SubResource {
+    /**
+     * The reference to the address space resource which represents Address
+     * space for P2S VpnClient.
+     */
+    @JsonProperty(value = "properties.vpnClientAddressPool")
+    private AddressSpace vpnClientAddressPool;
+
+    /**
+     * The Routing Configuration indicating the associated and propagated route
+     * tables on this connection.
+     */
+    @JsonProperty(value = "properties.routingConfiguration")
+    private RoutingConfiguration routingConfiguration;
+
+    /**
+     * The provisioning state of the P2SConnectionConfiguration resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the reference to the address space resource which represents Address space for P2S VpnClient.
+     *
+     * @return the vpnClientAddressPool value
+     */
+    public AddressSpace vpnClientAddressPool() {
+        return this.vpnClientAddressPool;
+    }
+
+    /**
+     * Set the reference to the address space resource which represents Address space for P2S VpnClient.
+     *
+     * @param vpnClientAddressPool the vpnClientAddressPool value to set
+     * @return the P2SConnectionConfiguration object itself.
+     */
+    public P2SConnectionConfiguration withVpnClientAddressPool(AddressSpace vpnClientAddressPool) {
+        this.vpnClientAddressPool = vpnClientAddressPool;
+        return this;
+    }
+
+    /**
+     * Get the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @return the routingConfiguration value
+     */
+    public RoutingConfiguration routingConfiguration() {
+        return this.routingConfiguration;
+    }
+
+    /**
+     * Set the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @param routingConfiguration the routingConfiguration value to set
+     * @return the P2SConnectionConfiguration object itself.
+     */
+    public P2SConnectionConfiguration withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.routingConfiguration = routingConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the P2SConnectionConfiguration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the P2SConnectionConfiguration object itself.
+     */
+    public P2SConnectionConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealth.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealth.java
new file mode 100644
index 000000000000..dfade66099da
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealth.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.P2SVpnConnectionHealthInner;
+
+/**
+ * Type representing P2SVpnConnectionHealth.
+ */
+public interface P2SVpnConnectionHealth extends HasInner<P2SVpnConnectionHealthInner>, HasManager<NetworkManager> {
+    /**
+     * @return the sasUrl value.
+     */
+    String sasUrl();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealthRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealthRequest.java
new file mode 100644
index 000000000000..7c313723f686
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionHealthRequest.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of P2S Vpn connection health request.
+ */
+public class P2SVpnConnectionHealthRequest {
+    /**
+     * The list of p2s vpn user names whose p2s vpn connection detailed health
+     * to retrieve for.
+     */
+    @JsonProperty(value = "vpnUserNamesFilter")
+    private List<String> vpnUserNamesFilter;
+
+    /**
+     * The sas-url to download the P2S Vpn connection health detail.
+     */
+    @JsonProperty(value = "outputBlobSasUrl")
+    private String outputBlobSasUrl;
+
+    /**
+     * Get the list of p2s vpn user names whose p2s vpn connection detailed health to retrieve for.
+     *
+     * @return the vpnUserNamesFilter value
+     */
+    public List<String> vpnUserNamesFilter() {
+        return this.vpnUserNamesFilter;
+    }
+
+    /**
+     * Set the list of p2s vpn user names whose p2s vpn connection detailed health to retrieve for.
+     *
+     * @param vpnUserNamesFilter the vpnUserNamesFilter value to set
+     * @return the P2SVpnConnectionHealthRequest object itself.
+     */
+    public P2SVpnConnectionHealthRequest withVpnUserNamesFilter(List<String> vpnUserNamesFilter) {
+        this.vpnUserNamesFilter = vpnUserNamesFilter;
+        return this;
+    }
+
+    /**
+     * Get the sas-url to download the P2S Vpn connection health detail.
+     *
+     * @return the outputBlobSasUrl value
+     */
+    public String outputBlobSasUrl() {
+        return this.outputBlobSasUrl;
+    }
+
+    /**
+     * Set the sas-url to download the P2S Vpn connection health detail.
+     *
+     * @param outputBlobSasUrl the outputBlobSasUrl value to set
+     * @return the P2SVpnConnectionHealthRequest object itself.
+     */
+    public P2SVpnConnectionHealthRequest withOutputBlobSasUrl(String outputBlobSasUrl) {
+        this.outputBlobSasUrl = outputBlobSasUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionRequest.java
new file mode 100644
index 000000000000..4e410e283aaa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnConnectionRequest.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of p2s vpn connections to be disconnected.
+ */
+public class P2SVpnConnectionRequest {
+    /**
+     * List of p2s vpn connection Ids.
+     */
+    @JsonProperty(value = "vpnConnectionIds")
+    private List<String> vpnConnectionIds;
+
+    /**
+     * Get list of p2s vpn connection Ids.
+     *
+     * @return the vpnConnectionIds value
+     */
+    public List<String> vpnConnectionIds() {
+        return this.vpnConnectionIds;
+    }
+
+    /**
+     * Set list of p2s vpn connection Ids.
+     *
+     * @param vpnConnectionIds the vpnConnectionIds value to set
+     * @return the P2SVpnConnectionRequest object itself.
+     */
+    public P2SVpnConnectionRequest withVpnConnectionIds(List<String> vpnConnectionIds) {
+        this.vpnConnectionIds = vpnConnectionIds;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnGateway.java
new file mode 100644
index 000000000000..df2de8cbc592
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnGateway.java
@@ -0,0 +1,230 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.P2SVpnGatewayInner;
+
+/**
+ * Type representing P2SVpnGateway.
+ */
+public interface P2SVpnGateway extends HasInner<P2SVpnGatewayInner>, Resource, GroupableResourceCore<NetworkManager, P2SVpnGatewayInner>, HasResourceGroup, Refreshable<P2SVpnGateway>, Updatable<P2SVpnGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the customDnsServers value.
+     */
+    List<String> customDnsServers();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the p2SConnectionConfigurations value.
+     */
+    List<P2SConnectionConfiguration> p2SConnectionConfigurations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the virtualHub value.
+     */
+    SubResource virtualHub();
+
+    /**
+     * @return the vpnClientConnectionHealth value.
+     */
+    VpnClientConnectionHealth vpnClientConnectionHealth();
+
+    /**
+     * @return the vpnGatewayScaleUnit value.
+     */
+    Integer vpnGatewayScaleUnit();
+
+    /**
+     * @return the vpnServerConfiguration value.
+     */
+    SubResource vpnServerConfiguration();
+
+    /**
+     * The entirety of the P2SVpnGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of P2SVpnGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a P2SVpnGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the P2SVpnGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the p2svpngateway definition allowing to specify CustomDnsServers.
+         */
+        interface WithCustomDnsServers {
+            /**
+             * Specifies customDnsServers.
+             * @param customDnsServers List of all customer specified DNS servers IP addresses
+             * @return the next definition stage
+             */
+            WithCreate withCustomDnsServers(List<String> customDnsServers);
+        }
+
+        /**
+         * The stage of the p2svpngateway definition allowing to specify P2SConnectionConfigurations.
+         */
+        interface WithP2SConnectionConfigurations {
+            /**
+             * Specifies p2SConnectionConfigurations.
+             * @param p2SConnectionConfigurations List of all p2s connection configurations of the gateway
+             * @return the next definition stage
+             */
+            WithCreate withP2SConnectionConfigurations(List<P2SConnectionConfiguration> p2SConnectionConfigurations);
+        }
+
+        /**
+         * The stage of the p2svpngateway definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The VirtualHub to which the gateway belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the p2svpngateway definition allowing to specify VpnGatewayScaleUnit.
+         */
+        interface WithVpnGatewayScaleUnit {
+            /**
+             * Specifies vpnGatewayScaleUnit.
+             * @param vpnGatewayScaleUnit The scale unit for this p2s vpn gateway
+             * @return the next definition stage
+             */
+            WithCreate withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit);
+        }
+
+        /**
+         * The stage of the p2svpngateway definition allowing to specify VpnServerConfiguration.
+         */
+        interface WithVpnServerConfiguration {
+            /**
+             * Specifies vpnServerConfiguration.
+             * @param vpnServerConfiguration The VpnServerConfiguration to which the p2sVpnGateway is attached to
+             * @return the next definition stage
+             */
+            WithCreate withVpnServerConfiguration(SubResource vpnServerConfiguration);
+        }
+
+        /**
+         * 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<P2SVpnGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCustomDnsServers, DefinitionStages.WithP2SConnectionConfigurations, DefinitionStages.WithVirtualHub, DefinitionStages.WithVpnGatewayScaleUnit, DefinitionStages.WithVpnServerConfiguration {
+        }
+    }
+    /**
+     * The template for a P2SVpnGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<P2SVpnGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithCustomDnsServers, UpdateStages.WithP2SConnectionConfigurations, UpdateStages.WithVirtualHub, UpdateStages.WithVpnGatewayScaleUnit, UpdateStages.WithVpnServerConfiguration {
+    }
+
+    /**
+     * Grouping of P2SVpnGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the p2svpngateway update allowing to specify CustomDnsServers.
+         */
+        interface WithCustomDnsServers {
+            /**
+             * Specifies customDnsServers.
+             * @param customDnsServers List of all customer specified DNS servers IP addresses
+             * @return the next update stage
+             */
+            Update withCustomDnsServers(List<String> customDnsServers);
+        }
+
+        /**
+         * The stage of the p2svpngateway update allowing to specify P2SConnectionConfigurations.
+         */
+        interface WithP2SConnectionConfigurations {
+            /**
+             * Specifies p2SConnectionConfigurations.
+             * @param p2SConnectionConfigurations List of all p2s connection configurations of the gateway
+             * @return the next update stage
+             */
+            Update withP2SConnectionConfigurations(List<P2SConnectionConfiguration> p2SConnectionConfigurations);
+        }
+
+        /**
+         * The stage of the p2svpngateway update allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The VirtualHub to which the gateway belongs
+             * @return the next update stage
+             */
+            Update withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the p2svpngateway update allowing to specify VpnGatewayScaleUnit.
+         */
+        interface WithVpnGatewayScaleUnit {
+            /**
+             * Specifies vpnGatewayScaleUnit.
+             * @param vpnGatewayScaleUnit The scale unit for this p2s vpn gateway
+             * @return the next update stage
+             */
+            Update withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit);
+        }
+
+        /**
+         * The stage of the p2svpngateway update allowing to specify VpnServerConfiguration.
+         */
+        interface WithVpnServerConfiguration {
+            /**
+             * Specifies vpnServerConfiguration.
+             * @param vpnServerConfiguration The VpnServerConfiguration to which the p2sVpnGateway is attached to
+             * @return the next update stage
+             */
+            Update withVpnServerConfiguration(SubResource vpnServerConfiguration);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnProfileParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnProfileParameters.java
new file mode 100644
index 000000000000..6c586a99fb2c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2SVpnProfileParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Vpn Client Parameters for package generation.
+ */
+public class P2SVpnProfileParameters {
+    /**
+     * VPN client authentication method. Possible values include: 'EAPTLS',
+     * 'EAPMSCHAPv2'.
+     */
+    @JsonProperty(value = "authenticationMethod")
+    private AuthenticationMethod authenticationMethod;
+
+    /**
+     * Get vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @return the authenticationMethod value
+     */
+    public AuthenticationMethod authenticationMethod() {
+        return this.authenticationMethod;
+    }
+
+    /**
+     * Set vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @param authenticationMethod the authenticationMethod value to set
+     * @return the P2SVpnProfileParameters object itself.
+     */
+    public P2SVpnProfileParameters withAuthenticationMethod(AuthenticationMethod authenticationMethod) {
+        this.authenticationMethod = authenticationMethod;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2sVpnGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2sVpnGateways.java
new file mode 100644
index 000000000000..5e0c5a6d8ed1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/P2sVpnGateways.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.network.v2020_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 rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.P2sVpnGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing P2sVpnGateways.
+ */
+public interface P2sVpnGateways extends SupportsCreating<P2SVpnGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<P2SVpnGateway>, SupportsListingByResourceGroup<P2SVpnGateway>, SupportsListing<P2SVpnGateway>, HasInner<P2sVpnGatewaysInner> {
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnProfileResponse> generateVpnProfileAsync(String resourceGroupName, String gatewayName);
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<P2SVpnGateway> getP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName);
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<P2SVpnConnectionHealth> getP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request);
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureFilter.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureFilter.java
new file mode 100644
index 000000000000..19443cd67a33
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureFilter.java
@@ -0,0 +1,161 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Filter that is applied to packet capture request. Multiple filters can be
+ * applied.
+ */
+public class PacketCaptureFilter {
+    /**
+     * Protocol to be filtered on. Possible values include: 'TCP', 'UDP',
+     * 'Any'.
+     */
+    @JsonProperty(value = "protocol")
+    private PcProtocol protocol;
+
+    /**
+     * Local IP Address to be filtered on. Notation: "127.0.0.1" for single
+     * address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5"?
+     * for multiple entries. Multiple ranges not currently supported. Mixing
+     * ranges with multiple entries not currently supported. Default = null.
+     */
+    @JsonProperty(value = "localIPAddress")
+    private String localIPAddress;
+
+    /**
+     * Local IP Address to be filtered on. Notation: "127.0.0.1" for single
+     * address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5;"
+     * for multiple entries. Multiple ranges not currently supported. Mixing
+     * ranges with multiple entries not currently supported. Default = null.
+     */
+    @JsonProperty(value = "remoteIPAddress")
+    private String remoteIPAddress;
+
+    /**
+     * Local port to be filtered on. Notation: "80" for single port
+     * entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges
+     * not currently supported. Mixing ranges with multiple entries not
+     * currently supported. Default = null.
+     */
+    @JsonProperty(value = "localPort")
+    private String localPort;
+
+    /**
+     * Remote port to be filtered on. Notation: "80" for single port
+     * entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges
+     * not currently supported. Mixing ranges with multiple entries not
+     * currently supported. Default = null.
+     */
+    @JsonProperty(value = "remotePort")
+    private String remotePort;
+
+    /**
+     * Get protocol to be filtered on. Possible values include: 'TCP', 'UDP', 'Any'.
+     *
+     * @return the protocol value
+     */
+    public PcProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set protocol to be filtered on. Possible values include: 'TCP', 'UDP', 'Any'.
+     *
+     * @param protocol the protocol value to set
+     * @return the PacketCaptureFilter object itself.
+     */
+    public PacketCaptureFilter withProtocol(PcProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get local IP Address to be filtered on. Notation: "127.0.0.1" for single address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5"? for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @return the localIPAddress value
+     */
+    public String localIPAddress() {
+        return this.localIPAddress;
+    }
+
+    /**
+     * Set local IP Address to be filtered on. Notation: "127.0.0.1" for single address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5"? for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @param localIPAddress the localIPAddress value to set
+     * @return the PacketCaptureFilter object itself.
+     */
+    public PacketCaptureFilter withLocalIPAddress(String localIPAddress) {
+        this.localIPAddress = localIPAddress;
+        return this;
+    }
+
+    /**
+     * Get local IP Address to be filtered on. Notation: "127.0.0.1" for single address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @return the remoteIPAddress value
+     */
+    public String remoteIPAddress() {
+        return this.remoteIPAddress;
+    }
+
+    /**
+     * Set local IP Address to be filtered on. Notation: "127.0.0.1" for single address entry. "127.0.0.1-127.0.0.255" for range. "127.0.0.1;127.0.0.5;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @param remoteIPAddress the remoteIPAddress value to set
+     * @return the PacketCaptureFilter object itself.
+     */
+    public PacketCaptureFilter withRemoteIPAddress(String remoteIPAddress) {
+        this.remoteIPAddress = remoteIPAddress;
+        return this;
+    }
+
+    /**
+     * Get local port to be filtered on. Notation: "80" for single port entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @return the localPort value
+     */
+    public String localPort() {
+        return this.localPort;
+    }
+
+    /**
+     * Set local port to be filtered on. Notation: "80" for single port entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @param localPort the localPort value to set
+     * @return the PacketCaptureFilter object itself.
+     */
+    public PacketCaptureFilter withLocalPort(String localPort) {
+        this.localPort = localPort;
+        return this;
+    }
+
+    /**
+     * Get remote port to be filtered on. Notation: "80" for single port entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @return the remotePort value
+     */
+    public String remotePort() {
+        return this.remotePort;
+    }
+
+    /**
+     * Set remote port to be filtered on. Notation: "80" for single port entry."80-85" for range. "80;443;" for multiple entries. Multiple ranges not currently supported. Mixing ranges with multiple entries not currently supported. Default = null.
+     *
+     * @param remotePort the remotePort value to set
+     * @return the PacketCaptureFilter object itself.
+     */
+    public PacketCaptureFilter withRemotePort(String remotePort) {
+        this.remotePort = remotePort;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureParameters.java
new file mode 100644
index 000000000000..ed12a7a77bbf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureParameters.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the create packet capture operation.
+ */
+public class PacketCaptureParameters {
+    /**
+     * The ID of the targeted resource, only VM is currently supported.
+     */
+    @JsonProperty(value = "target", required = true)
+    private String target;
+
+    /**
+     * Number of bytes captured per packet, the remaining bytes are truncated.
+     */
+    @JsonProperty(value = "bytesToCapturePerPacket")
+    private Integer bytesToCapturePerPacket;
+
+    /**
+     * Maximum size of the capture output.
+     */
+    @JsonProperty(value = "totalBytesPerSession")
+    private Integer totalBytesPerSession;
+
+    /**
+     * Maximum duration of the capture session in seconds.
+     */
+    @JsonProperty(value = "timeLimitInSeconds")
+    private Integer timeLimitInSeconds;
+
+    /**
+     * The storage location for a packet capture session.
+     */
+    @JsonProperty(value = "storageLocation", required = true)
+    private PacketCaptureStorageLocation storageLocation;
+
+    /**
+     * A list of packet capture filters.
+     */
+    @JsonProperty(value = "filters")
+    private List<PacketCaptureFilter> filters;
+
+    /**
+     * Get the ID of the targeted resource, only VM is currently supported.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set the ID of the targeted resource, only VM is currently supported.
+     *
+     * @param target the target value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @return the bytesToCapturePerPacket value
+     */
+    public Integer bytesToCapturePerPacket() {
+        return this.bytesToCapturePerPacket;
+    }
+
+    /**
+     * Set number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @param bytesToCapturePerPacket the bytesToCapturePerPacket value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withBytesToCapturePerPacket(Integer bytesToCapturePerPacket) {
+        this.bytesToCapturePerPacket = bytesToCapturePerPacket;
+        return this;
+    }
+
+    /**
+     * Get maximum size of the capture output.
+     *
+     * @return the totalBytesPerSession value
+     */
+    public Integer totalBytesPerSession() {
+        return this.totalBytesPerSession;
+    }
+
+    /**
+     * Set maximum size of the capture output.
+     *
+     * @param totalBytesPerSession the totalBytesPerSession value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withTotalBytesPerSession(Integer totalBytesPerSession) {
+        this.totalBytesPerSession = totalBytesPerSession;
+        return this;
+    }
+
+    /**
+     * Get maximum duration of the capture session in seconds.
+     *
+     * @return the timeLimitInSeconds value
+     */
+    public Integer timeLimitInSeconds() {
+        return this.timeLimitInSeconds;
+    }
+
+    /**
+     * Set maximum duration of the capture session in seconds.
+     *
+     * @param timeLimitInSeconds the timeLimitInSeconds value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withTimeLimitInSeconds(Integer timeLimitInSeconds) {
+        this.timeLimitInSeconds = timeLimitInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the storage location for a packet capture session.
+     *
+     * @return the storageLocation value
+     */
+    public PacketCaptureStorageLocation storageLocation() {
+        return this.storageLocation;
+    }
+
+    /**
+     * Set the storage location for a packet capture session.
+     *
+     * @param storageLocation the storageLocation value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withStorageLocation(PacketCaptureStorageLocation storageLocation) {
+        this.storageLocation = storageLocation;
+        return this;
+    }
+
+    /**
+     * Get a list of packet capture filters.
+     *
+     * @return the filters value
+     */
+    public List<PacketCaptureFilter> filters() {
+        return this.filters;
+    }
+
+    /**
+     * Set a list of packet capture filters.
+     *
+     * @param filters the filters value to set
+     * @return the PacketCaptureParameters object itself.
+     */
+    public PacketCaptureParameters withFilters(List<PacketCaptureFilter> filters) {
+        this.filters = filters;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureQueryStatusResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureQueryStatusResult.java
new file mode 100644
index 000000000000..4cea33138aed
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureQueryStatusResult.java
@@ -0,0 +1,52 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PacketCaptureQueryStatusResultInner;
+import org.joda.time.DateTime;
+import java.util.List;
+
+/**
+ * Type representing PacketCaptureQueryStatusResult.
+ */
+public interface PacketCaptureQueryStatusResult extends HasInner<PacketCaptureQueryStatusResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the captureStartTime value.
+     */
+    DateTime captureStartTime();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the packetCaptureError value.
+     */
+    List<PcError> packetCaptureError();
+
+    /**
+     * @return the packetCaptureStatus value.
+     */
+    PcStatus packetCaptureStatus();
+
+    /**
+     * @return the stopReason value.
+     */
+    String stopReason();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureResult.java
new file mode 100644
index 000000000000..3a95e423ade1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureResult.java
@@ -0,0 +1,244 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PacketCaptureResultInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing PacketCaptureResult.
+ */
+public interface PacketCaptureResult extends HasInner<PacketCaptureResultInner>, Indexable, Refreshable<PacketCaptureResult>, Updatable<PacketCaptureResult.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the bytesToCapturePerPacket value.
+     */
+    Integer bytesToCapturePerPacket();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the filters value.
+     */
+    List<PacketCaptureFilter> filters();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the storageLocation value.
+     */
+    PacketCaptureStorageLocation storageLocation();
+
+    /**
+     * @return the target value.
+     */
+    String target();
+
+    /**
+     * @return the timeLimitInSeconds value.
+     */
+    Integer timeLimitInSeconds();
+
+    /**
+     * @return the totalBytesPerSession value.
+     */
+    Integer totalBytesPerSession();
+
+    /**
+     * The entirety of the PacketCaptureResult definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetworkWatcher, DefinitionStages.WithStorageLocation, DefinitionStages.WithTarget, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PacketCaptureResult definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PacketCaptureResult definition.
+         */
+        interface Blank extends WithNetworkWatcher {
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify NetworkWatcher.
+         */
+        interface WithNetworkWatcher {
+           /**
+            * Specifies resourceGroupName, networkWatcherName.
+            * @param resourceGroupName The name of the resource group
+            * @param networkWatcherName The name of the network watcher
+            * @return the next definition stage
+            */
+            WithStorageLocation withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify StorageLocation.
+         */
+        interface WithStorageLocation {
+           /**
+            * Specifies storageLocation.
+            * @param storageLocation The storage location for a packet capture session
+            * @return the next definition stage
+            */
+            WithTarget withStorageLocation(PacketCaptureStorageLocation storageLocation);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify Target.
+         */
+        interface WithTarget {
+           /**
+            * Specifies target.
+            * @param target The ID of the targeted resource, only VM is currently supported
+            * @return the next definition stage
+            */
+            WithCreate withTarget(String target);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify BytesToCapturePerPacket.
+         */
+        interface WithBytesToCapturePerPacket {
+            /**
+             * Specifies bytesToCapturePerPacket.
+             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
+             * @return the next definition stage
+             */
+            WithCreate withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify Filters.
+         */
+        interface WithFilters {
+            /**
+             * Specifies filters.
+             * @param filters A list of packet capture filters
+             * @return the next definition stage
+             */
+            WithCreate withFilters(List<PacketCaptureFilter> filters);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify TimeLimitInSeconds.
+         */
+        interface WithTimeLimitInSeconds {
+            /**
+             * Specifies timeLimitInSeconds.
+             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
+             * @return the next definition stage
+             */
+            WithCreate withTimeLimitInSeconds(Integer timeLimitInSeconds);
+        }
+
+        /**
+         * The stage of the packetcaptureresult definition allowing to specify TotalBytesPerSession.
+         */
+        interface WithTotalBytesPerSession {
+            /**
+             * Specifies totalBytesPerSession.
+             * @param totalBytesPerSession Maximum size of the capture output
+             * @return the next definition stage
+             */
+            WithCreate withTotalBytesPerSession(Integer totalBytesPerSession);
+        }
+
+        /**
+         * 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<PacketCaptureResult>, DefinitionStages.WithBytesToCapturePerPacket, DefinitionStages.WithFilters, DefinitionStages.WithTimeLimitInSeconds, DefinitionStages.WithTotalBytesPerSession {
+        }
+    }
+    /**
+     * The template for a PacketCaptureResult update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PacketCaptureResult>, UpdateStages.WithBytesToCapturePerPacket, UpdateStages.WithFilters, UpdateStages.WithTimeLimitInSeconds, UpdateStages.WithTotalBytesPerSession {
+    }
+
+    /**
+     * Grouping of PacketCaptureResult update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the packetcaptureresult update allowing to specify BytesToCapturePerPacket.
+         */
+        interface WithBytesToCapturePerPacket {
+            /**
+             * Specifies bytesToCapturePerPacket.
+             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
+             * @return the next update stage
+             */
+            Update withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
+        }
+
+        /**
+         * The stage of the packetcaptureresult update allowing to specify Filters.
+         */
+        interface WithFilters {
+            /**
+             * Specifies filters.
+             * @param filters A list of packet capture filters
+             * @return the next update stage
+             */
+            Update withFilters(List<PacketCaptureFilter> filters);
+        }
+
+        /**
+         * The stage of the packetcaptureresult update allowing to specify TimeLimitInSeconds.
+         */
+        interface WithTimeLimitInSeconds {
+            /**
+             * Specifies timeLimitInSeconds.
+             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
+             * @return the next update stage
+             */
+            Update withTimeLimitInSeconds(Integer timeLimitInSeconds);
+        }
+
+        /**
+         * The stage of the packetcaptureresult update allowing to specify TotalBytesPerSession.
+         */
+        interface WithTotalBytesPerSession {
+            /**
+             * Specifies totalBytesPerSession.
+             * @param totalBytesPerSession Maximum size of the capture output
+             * @return the next update stage
+             */
+            Update withTotalBytesPerSession(Integer totalBytesPerSession);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureStorageLocation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureStorageLocation.java
new file mode 100644
index 000000000000..a7f8fef26a2b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptureStorageLocation.java
@@ -0,0 +1,100 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The storage location for a packet capture session.
+ */
+public class PacketCaptureStorageLocation {
+    /**
+     * The ID of the storage account to save the packet capture session.
+     * Required if no local file path is provided.
+     */
+    @JsonProperty(value = "storageId")
+    private String storageId;
+
+    /**
+     * The URI of the storage path to save the packet capture. Must be a
+     * well-formed URI describing the location to save the packet capture.
+     */
+    @JsonProperty(value = "storagePath")
+    private String storagePath;
+
+    /**
+     * A valid local path on the targeting VM. Must include the name of the
+     * capture file (*.cap). For linux virtual machine it must start with
+     * /var/captures. Required if no storage ID is provided, otherwise
+     * optional.
+     */
+    @JsonProperty(value = "filePath")
+    private String filePath;
+
+    /**
+     * Get the ID of the storage account to save the packet capture session. Required if no local file path is provided.
+     *
+     * @return the storageId value
+     */
+    public String storageId() {
+        return this.storageId;
+    }
+
+    /**
+     * Set the ID of the storage account to save the packet capture session. Required if no local file path is provided.
+     *
+     * @param storageId the storageId value to set
+     * @return the PacketCaptureStorageLocation object itself.
+     */
+    public PacketCaptureStorageLocation withStorageId(String storageId) {
+        this.storageId = storageId;
+        return this;
+    }
+
+    /**
+     * Get the URI of the storage path to save the packet capture. Must be a well-formed URI describing the location to save the packet capture.
+     *
+     * @return the storagePath value
+     */
+    public String storagePath() {
+        return this.storagePath;
+    }
+
+    /**
+     * Set the URI of the storage path to save the packet capture. Must be a well-formed URI describing the location to save the packet capture.
+     *
+     * @param storagePath the storagePath value to set
+     * @return the PacketCaptureStorageLocation object itself.
+     */
+    public PacketCaptureStorageLocation withStoragePath(String storagePath) {
+        this.storagePath = storagePath;
+        return this;
+    }
+
+    /**
+     * Get a valid local path on the targeting VM. Must include the name of the capture file (*.cap). For linux virtual machine it must start with /var/captures. Required if no storage ID is provided, otherwise optional.
+     *
+     * @return the filePath value
+     */
+    public String filePath() {
+        return this.filePath;
+    }
+
+    /**
+     * Set a valid local path on the targeting VM. Must include the name of the capture file (*.cap). For linux virtual machine it must start with /var/captures. Required if no storage ID is provided, otherwise optional.
+     *
+     * @param filePath the filePath value to set
+     * @return the PacketCaptureStorageLocation object itself.
+     */
+    public PacketCaptureStorageLocation withFilePath(String filePath) {
+        this.filePath = filePath;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptures.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptures.java
new file mode 100644
index 000000000000..5cdec7d9912f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PacketCaptures.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PacketCapturesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PacketCaptures.
+ */
+public interface PacketCaptures extends SupportsCreating<PacketCaptureResult.DefinitionStages.Blank>, HasInner<PacketCapturesInner> {
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable stopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName);
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PacketCaptureQueryStatusResult> getStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName);
+
+    /**
+     * Gets a packet capture session by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PacketCaptureResult> getAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName);
+
+    /**
+     * Lists all packet capture sessions within the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PacketCaptureResult> listAsync(String resourceGroupName, String networkWatcherName);
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilter.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilter.java
new file mode 100644
index 000000000000..28b9d8d67656
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilter.java
@@ -0,0 +1,168 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteFilterRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ExpressRouteCircuitPeeringInner;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Route Filter Resource.
+ */
+@JsonFlatten
+public class PatchRouteFilter extends SubResource {
+    /**
+     * Collection of RouteFilterRules contained within a route filter.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<RouteFilterRuleInner> rules;
+
+    /**
+     * A collection of references to express route circuit peerings.
+     */
+    @JsonProperty(value = "properties.peerings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ExpressRouteCircuitPeeringInner> peerings;
+
+    /**
+     * A collection of references to express route circuit ipv6 peerings.
+     */
+    @JsonProperty(value = "properties.ipv6Peerings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ExpressRouteCircuitPeeringInner> ipv6Peerings;
+
+    /**
+     * The provisioning state of the route filter resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Resource tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Get collection of RouteFilterRules contained within a route filter.
+     *
+     * @return the rules value
+     */
+    public List<RouteFilterRuleInner> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set collection of RouteFilterRules contained within a route filter.
+     *
+     * @param rules the rules value to set
+     * @return the PatchRouteFilter object itself.
+     */
+    public PatchRouteFilter withRules(List<RouteFilterRuleInner> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to express route circuit peerings.
+     *
+     * @return the peerings value
+     */
+    public List<ExpressRouteCircuitPeeringInner> peerings() {
+        return this.peerings;
+    }
+
+    /**
+     * Get a collection of references to express route circuit ipv6 peerings.
+     *
+     * @return the ipv6Peerings value
+     */
+    public List<ExpressRouteCircuitPeeringInner> ipv6Peerings() {
+        return this.ipv6Peerings;
+    }
+
+    /**
+     * Get the provisioning state of the route filter resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * 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 PatchRouteFilter object itself.
+     */
+    public PatchRouteFilter withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilterRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilterRule.java
new file mode 100644
index 000000000000..2ebbb3cb5182
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PatchRouteFilterRule.java
@@ -0,0 +1,156 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Route Filter Rule Resource.
+ */
+@JsonFlatten
+public class PatchRouteFilterRule extends SubResource {
+    /**
+     * The access type of the rule. Possible values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "properties.access", required = true)
+    private Access access;
+
+    /**
+     * The rule type of the rule.
+     */
+    @JsonProperty(value = "properties.routeFilterRuleType", required = true)
+    private String routeFilterRuleType;
+
+    /**
+     * The collection for bgp community values to filter on. e.g.
+     * ['12076:5010','12076:5020'].
+     */
+    @JsonProperty(value = "properties.communities", required = true)
+    private List<String> communities;
+
+    /**
+     * The provisioning state of the route filter rule resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Creates an instance of PatchRouteFilterRule class.
+     * @param access the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     * @param communities the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     */
+    public PatchRouteFilterRule() {
+        routeFilterRuleType = "Community";
+    }
+
+    /**
+     * Get the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the access value
+     */
+    public Access access() {
+        return this.access;
+    }
+
+    /**
+     * Set the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param access the access value to set
+     * @return the PatchRouteFilterRule object itself.
+     */
+    public PatchRouteFilterRule withAccess(Access access) {
+        this.access = access;
+        return this;
+    }
+
+    /**
+     * Get the rule type of the rule.
+     *
+     * @return the routeFilterRuleType value
+     */
+    public String routeFilterRuleType() {
+        return this.routeFilterRuleType;
+    }
+
+    /**
+     * Set the rule type of the rule.
+     *
+     * @param routeFilterRuleType the routeFilterRuleType value to set
+     * @return the PatchRouteFilterRule object itself.
+     */
+    public PatchRouteFilterRule withRouteFilterRuleType(String routeFilterRuleType) {
+        this.routeFilterRuleType = routeFilterRuleType;
+        return this;
+    }
+
+    /**
+     * Get the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     *
+     * @return the communities value
+     */
+    public List<String> communities() {
+        return this.communities;
+    }
+
+    /**
+     * Set the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     *
+     * @param communities the communities value to set
+     * @return the PatchRouteFilterRule object itself.
+     */
+    public PatchRouteFilterRule withCommunities(List<String> communities) {
+        this.communities = communities;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the route filter rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcError.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcError.java
new file mode 100644
index 000000000000..e9385c90e6b1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcError.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PcError.
+ */
+public final class PcError extends ExpandableStringEnum<PcError> {
+    /** Static value InternalError for PcError. */
+    public static final PcError INTERNAL_ERROR = fromString("InternalError");
+
+    /** Static value AgentStopped for PcError. */
+    public static final PcError AGENT_STOPPED = fromString("AgentStopped");
+
+    /** Static value CaptureFailed for PcError. */
+    public static final PcError CAPTURE_FAILED = fromString("CaptureFailed");
+
+    /** Static value LocalFileFailed for PcError. */
+    public static final PcError LOCAL_FILE_FAILED = fromString("LocalFileFailed");
+
+    /** Static value StorageFailed for PcError. */
+    public static final PcError STORAGE_FAILED = fromString("StorageFailed");
+
+    /**
+     * Creates or finds a PcError from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PcError
+     */
+    @JsonCreator
+    public static PcError fromString(String name) {
+        return fromString(name, PcError.class);
+    }
+
+    /**
+     * @return known PcError values
+     */
+    public static Collection<PcError> values() {
+        return values(PcError.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcProtocol.java
new file mode 100644
index 000000000000..f9211eae6359
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PcProtocol.
+ */
+public final class PcProtocol extends ExpandableStringEnum<PcProtocol> {
+    /** Static value TCP for PcProtocol. */
+    public static final PcProtocol TCP = fromString("TCP");
+
+    /** Static value UDP for PcProtocol. */
+    public static final PcProtocol UDP = fromString("UDP");
+
+    /** Static value Any for PcProtocol. */
+    public static final PcProtocol ANY = fromString("Any");
+
+    /**
+     * Creates or finds a PcProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PcProtocol
+     */
+    @JsonCreator
+    public static PcProtocol fromString(String name) {
+        return fromString(name, PcProtocol.class);
+    }
+
+    /**
+     * @return known PcProtocol values
+     */
+    public static Collection<PcProtocol> values() {
+        return values(PcProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcStatus.java
new file mode 100644
index 000000000000..b11ff28c24cc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PcStatus.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PcStatus.
+ */
+public final class PcStatus extends ExpandableStringEnum<PcStatus> {
+    /** Static value NotStarted for PcStatus. */
+    public static final PcStatus NOT_STARTED = fromString("NotStarted");
+
+    /** Static value Running for PcStatus. */
+    public static final PcStatus RUNNING = fromString("Running");
+
+    /** Static value Stopped for PcStatus. */
+    public static final PcStatus STOPPED = fromString("Stopped");
+
+    /** Static value Error for PcStatus. */
+    public static final PcStatus ERROR = fromString("Error");
+
+    /** Static value Unknown for PcStatus. */
+    public static final PcStatus UNKNOWN = fromString("Unknown");
+
+    /**
+     * Creates or finds a PcStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PcStatus
+     */
+    @JsonCreator
+    public static PcStatus fromString(String name) {
+        return fromString(name, PcStatus.class);
+    }
+
+    /**
+     * @return known PcStatus values
+     */
+    public static Collection<PcStatus> values() {
+        return values(PcStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnection.java
new file mode 100644
index 000000000000..55f15e0ca533
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnection.java
@@ -0,0 +1,78 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PeerExpressRouteCircuitConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing PeerExpressRouteCircuitConnection.
+ */
+public interface PeerExpressRouteCircuitConnection extends HasInner<PeerExpressRouteCircuitConnectionInner>, Indexable, Refreshable<PeerExpressRouteCircuitConnection>, HasManager<NetworkManager> {
+    /**
+     * @return the addressPrefix value.
+     */
+    String addressPrefix();
+
+    /**
+     * @return the authResourceGuid value.
+     */
+    String authResourceGuid();
+
+    /**
+     * @return the circuitConnectionStatus value.
+     */
+    CircuitConnectionStatus circuitConnectionStatus();
+
+    /**
+     * @return the connectionName value.
+     */
+    String connectionName();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteCircuitPeering value.
+     */
+    SubResource expressRouteCircuitPeering();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peerExpressRouteCircuitPeering value.
+     */
+    SubResource peerExpressRouteCircuitPeering();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnections.java
new file mode 100644
index 000000000000..d2af3b91219a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PeerExpressRouteCircuitConnections.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PeerExpressRouteCircuitConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PeerExpressRouteCircuitConnections.
+ */
+public interface PeerExpressRouteCircuitConnections extends HasInner<PeerExpressRouteCircuitConnectionsInner> {
+    /**
+     * Gets the specified Peer Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the peer express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PeerExpressRouteCircuitConnection> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName);
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PeerExpressRouteCircuitConnection> listAsync(final String resourceGroupName, final String circuitName, final String peeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PfsGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PfsGroup.java
new file mode 100644
index 000000000000..b403badae49a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PfsGroup.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PfsGroup.
+ */
+public final class PfsGroup extends ExpandableStringEnum<PfsGroup> {
+    /** Static value None for PfsGroup. */
+    public static final PfsGroup NONE = fromString("None");
+
+    /** Static value PFS1 for PfsGroup. */
+    public static final PfsGroup PFS1 = fromString("PFS1");
+
+    /** Static value PFS2 for PfsGroup. */
+    public static final PfsGroup PFS2 = fromString("PFS2");
+
+    /** Static value PFS2048 for PfsGroup. */
+    public static final PfsGroup PFS2048 = fromString("PFS2048");
+
+    /** Static value ECP256 for PfsGroup. */
+    public static final PfsGroup ECP256 = fromString("ECP256");
+
+    /** Static value ECP384 for PfsGroup. */
+    public static final PfsGroup ECP384 = fromString("ECP384");
+
+    /** Static value PFS24 for PfsGroup. */
+    public static final PfsGroup PFS24 = fromString("PFS24");
+
+    /** Static value PFS14 for PfsGroup. */
+    public static final PfsGroup PFS14 = fromString("PFS14");
+
+    /** Static value PFSMM for PfsGroup. */
+    public static final PfsGroup PFSMM = fromString("PFSMM");
+
+    /**
+     * Creates or finds a PfsGroup from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PfsGroup
+     */
+    @JsonCreator
+    public static PfsGroup fromString(String name) {
+        return fromString(name, PfsGroup.class);
+    }
+
+    /**
+     * @return known PfsGroup values
+     */
+    public static Collection<PfsGroup> values() {
+        return values(PfsGroup.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PolicySettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PolicySettings.java
new file mode 100644
index 000000000000..32aecacd4731
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PolicySettings.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines contents of a web application firewall global configuration.
+ */
+public class PolicySettings {
+    /**
+     * The state of the policy. Possible values include: 'Disabled', 'Enabled'.
+     */
+    @JsonProperty(value = "state")
+    private WebApplicationFirewallEnabledState state;
+
+    /**
+     * The mode of the policy. Possible values include: 'Prevention',
+     * 'Detection'.
+     */
+    @JsonProperty(value = "mode")
+    private WebApplicationFirewallMode mode;
+
+    /**
+     * Whether to allow WAF to check request Body.
+     */
+    @JsonProperty(value = "requestBodyCheck")
+    private Boolean requestBodyCheck;
+
+    /**
+     * Maximum request body size in Kb for WAF.
+     */
+    @JsonProperty(value = "maxRequestBodySizeInKb")
+    private Integer maxRequestBodySizeInKb;
+
+    /**
+     * Maximum file upload size in Mb for WAF.
+     */
+    @JsonProperty(value = "fileUploadLimitInMb")
+    private Integer fileUploadLimitInMb;
+
+    /**
+     * Get the state of the policy. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @return the state value
+     */
+    public WebApplicationFirewallEnabledState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the state of the policy. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @param state the state value to set
+     * @return the PolicySettings object itself.
+     */
+    public PolicySettings withState(WebApplicationFirewallEnabledState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the mode of the policy. Possible values include: 'Prevention', 'Detection'.
+     *
+     * @return the mode value
+     */
+    public WebApplicationFirewallMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the mode of the policy. Possible values include: 'Prevention', 'Detection'.
+     *
+     * @param mode the mode value to set
+     * @return the PolicySettings object itself.
+     */
+    public PolicySettings withMode(WebApplicationFirewallMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Get whether to allow WAF to check request Body.
+     *
+     * @return the requestBodyCheck value
+     */
+    public Boolean requestBodyCheck() {
+        return this.requestBodyCheck;
+    }
+
+    /**
+     * Set whether to allow WAF to check request Body.
+     *
+     * @param requestBodyCheck the requestBodyCheck value to set
+     * @return the PolicySettings object itself.
+     */
+    public PolicySettings withRequestBodyCheck(Boolean requestBodyCheck) {
+        this.requestBodyCheck = requestBodyCheck;
+        return this;
+    }
+
+    /**
+     * Get maximum request body size in Kb for WAF.
+     *
+     * @return the maxRequestBodySizeInKb value
+     */
+    public Integer maxRequestBodySizeInKb() {
+        return this.maxRequestBodySizeInKb;
+    }
+
+    /**
+     * Set maximum request body size in Kb for WAF.
+     *
+     * @param maxRequestBodySizeInKb the maxRequestBodySizeInKb value to set
+     * @return the PolicySettings object itself.
+     */
+    public PolicySettings withMaxRequestBodySizeInKb(Integer maxRequestBodySizeInKb) {
+        this.maxRequestBodySizeInKb = maxRequestBodySizeInKb;
+        return this;
+    }
+
+    /**
+     * Get maximum file upload size in Mb for WAF.
+     *
+     * @return the fileUploadLimitInMb value
+     */
+    public Integer fileUploadLimitInMb() {
+        return this.fileUploadLimitInMb;
+    }
+
+    /**
+     * Set maximum file upload size in Mb for WAF.
+     *
+     * @param fileUploadLimitInMb the fileUploadLimitInMb value to set
+     * @return the PolicySettings object itself.
+     */
+    public PolicySettings withFileUploadLimitInMb(Integer fileUploadLimitInMb) {
+        this.fileUploadLimitInMb = fileUploadLimitInMb;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PreferredIPVersion.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PreferredIPVersion.java
new file mode 100644
index 000000000000..234114d52f4c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PreferredIPVersion.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PreferredIPVersion.
+ */
+public final class PreferredIPVersion extends ExpandableStringEnum<PreferredIPVersion> {
+    /** Static value IPv4 for PreferredIPVersion. */
+    public static final PreferredIPVersion IPV4 = fromString("IPv4");
+
+    /** Static value IPv6 for PreferredIPVersion. */
+    public static final PreferredIPVersion IPV6 = fromString("IPv6");
+
+    /**
+     * Creates or finds a PreferredIPVersion from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PreferredIPVersion
+     */
+    @JsonCreator
+    public static PreferredIPVersion fromString(String name) {
+        return fromString(name, PreferredIPVersion.class);
+    }
+
+    /**
+     * @return known PreferredIPVersion values
+     */
+    public static Collection<PreferredIPVersion> values() {
+        return values(PreferredIPVersion.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrepareNetworkPoliciesRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrepareNetworkPoliciesRequest.java
new file mode 100644
index 000000000000..adcbf0b1729c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrepareNetworkPoliciesRequest.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Details of PrepareNetworkPolicies for Subnet.
+ */
+public class PrepareNetworkPoliciesRequest {
+    /**
+     * The name of the service for which subnet is being prepared for.
+     */
+    @JsonProperty(value = "serviceName")
+    private String serviceName;
+
+    /**
+     * A list of NetworkIntentPolicyConfiguration.
+     */
+    @JsonProperty(value = "networkIntentPolicyConfigurations")
+    private List<NetworkIntentPolicyConfiguration> networkIntentPolicyConfigurations;
+
+    /**
+     * Get the name of the service for which subnet is being prepared for.
+     *
+     * @return the serviceName value
+     */
+    public String serviceName() {
+        return this.serviceName;
+    }
+
+    /**
+     * Set the name of the service for which subnet is being prepared for.
+     *
+     * @param serviceName the serviceName value to set
+     * @return the PrepareNetworkPoliciesRequest object itself.
+     */
+    public PrepareNetworkPoliciesRequest withServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        return this;
+    }
+
+    /**
+     * Get a list of NetworkIntentPolicyConfiguration.
+     *
+     * @return the networkIntentPolicyConfigurations value
+     */
+    public List<NetworkIntentPolicyConfiguration> networkIntentPolicyConfigurations() {
+        return this.networkIntentPolicyConfigurations;
+    }
+
+    /**
+     * Set a list of NetworkIntentPolicyConfiguration.
+     *
+     * @param networkIntentPolicyConfigurations the networkIntentPolicyConfigurations value to set
+     * @return the PrepareNetworkPoliciesRequest object itself.
+     */
+    public PrepareNetworkPoliciesRequest withNetworkIntentPolicyConfigurations(List<NetworkIntentPolicyConfiguration> networkIntentPolicyConfigurations) {
+        this.networkIntentPolicyConfigurations = networkIntentPolicyConfigurations;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneConfig.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneConfig.java
new file mode 100644
index 000000000000..7f8fab566b61
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneConfig.java
@@ -0,0 +1,89 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * PrivateDnsZoneConfig resource.
+ */
+@JsonFlatten
+public class PrivateDnsZoneConfig {
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The resource id of the private dns zone.
+     */
+    @JsonProperty(value = "properties.privateDnsZoneId")
+    private String privateDnsZoneId;
+
+    /**
+     * A collection of information regarding a recordSet, holding information
+     * to identify private resources.
+     */
+    @JsonProperty(value = "properties.recordSets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<RecordSet> recordSets;
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the PrivateDnsZoneConfig object itself.
+     */
+    public PrivateDnsZoneConfig withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the resource id of the private dns zone.
+     *
+     * @return the privateDnsZoneId value
+     */
+    public String privateDnsZoneId() {
+        return this.privateDnsZoneId;
+    }
+
+    /**
+     * Set the resource id of the private dns zone.
+     *
+     * @param privateDnsZoneId the privateDnsZoneId value to set
+     * @return the PrivateDnsZoneConfig object itself.
+     */
+    public PrivateDnsZoneConfig withPrivateDnsZoneId(String privateDnsZoneId) {
+        this.privateDnsZoneId = privateDnsZoneId;
+        return this;
+    }
+
+    /**
+     * Get a collection of information regarding a recordSet, holding information to identify private resources.
+     *
+     * @return the recordSets value
+     */
+    public List<RecordSet> recordSets() {
+        return this.recordSets;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroup.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroup.java
new file mode 100644
index 000000000000..2680e3d20288
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroup.java
@@ -0,0 +1,171 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateDnsZoneGroupInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing PrivateDnsZoneGroup.
+ */
+public interface PrivateDnsZoneGroup extends HasInner<PrivateDnsZoneGroupInner>, Indexable, Refreshable<PrivateDnsZoneGroup>, Updatable<PrivateDnsZoneGroup.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the privateDnsZoneConfigs value.
+     */
+    List<PrivateDnsZoneConfig> privateDnsZoneConfigs();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * The entirety of the PrivateDnsZoneGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPrivateEndpoint, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PrivateDnsZoneGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PrivateDnsZoneGroup definition.
+         */
+        interface Blank extends WithPrivateEndpoint {
+        }
+
+        /**
+         * The stage of the privatednszonegroup definition allowing to specify PrivateEndpoint.
+         */
+        interface WithPrivateEndpoint {
+           /**
+            * Specifies resourceGroupName, privateEndpointName.
+            * @param resourceGroupName The name of the resource group
+            * @param privateEndpointName The name of the private endpoint
+            * @return the next definition stage
+            */
+            WithCreate withExistingPrivateEndpoint(String resourceGroupName, String privateEndpointName);
+        }
+
+        /**
+         * The stage of the privatednszonegroup definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the privatednszonegroup definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name Name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the privatednszonegroup definition allowing to specify PrivateDnsZoneConfigs.
+         */
+        interface WithPrivateDnsZoneConfigs {
+            /**
+             * Specifies privateDnsZoneConfigs.
+             * @param privateDnsZoneConfigs A collection of private dns zone configurations of the private dns zone group
+             * @return the next definition stage
+             */
+            WithCreate withPrivateDnsZoneConfigs(List<PrivateDnsZoneConfig> privateDnsZoneConfigs);
+        }
+
+        /**
+         * 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<PrivateDnsZoneGroup>, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithPrivateDnsZoneConfigs {
+        }
+    }
+    /**
+     * The template for a PrivateDnsZoneGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PrivateDnsZoneGroup>, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPrivateDnsZoneConfigs {
+    }
+
+    /**
+     * Grouping of PrivateDnsZoneGroup update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the privatednszonegroup update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the privatednszonegroup update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name Name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the privatednszonegroup update allowing to specify PrivateDnsZoneConfigs.
+         */
+        interface WithPrivateDnsZoneConfigs {
+            /**
+             * Specifies privateDnsZoneConfigs.
+             * @param privateDnsZoneConfigs A collection of private dns zone configurations of the private dns zone group
+             * @return the next update stage
+             */
+            Update withPrivateDnsZoneConfigs(List<PrivateDnsZoneConfig> privateDnsZoneConfigs);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroups.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroups.java
new file mode 100644
index 000000000000..51cf9ee920e8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateDnsZoneGroups.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateDnsZoneGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PrivateDnsZoneGroups.
+ */
+public interface PrivateDnsZoneGroups extends SupportsCreating<PrivateDnsZoneGroup.DefinitionStages.Blank>, HasInner<PrivateDnsZoneGroupsInner> {
+    /**
+     * Gets the private dns zone group resource by specified private dns zone group name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateDnsZoneGroup> getAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName);
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param privateEndpointName The name of the private endpoint.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateDnsZoneGroup> listAsync(final String privateEndpointName, final String resourceGroupName);
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoint.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoint.java
new file mode 100644
index 000000000000..cfa0538cde15
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoint.java
@@ -0,0 +1,201 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateEndpointInner;
+
+/**
+ * Type representing PrivateEndpoint.
+ */
+public interface PrivateEndpoint extends HasInner<PrivateEndpointInner>, Resource, GroupableResourceCore<NetworkManager, PrivateEndpointInner>, HasResourceGroup, Refreshable<PrivateEndpoint>, Updatable<PrivateEndpoint.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the customDnsConfigs value.
+     */
+    List<CustomDnsConfigPropertiesFormat> customDnsConfigs();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the manualPrivateLinkServiceConnections value.
+     */
+    List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections();
+
+    /**
+     * @return the networkInterfaces value.
+     */
+    List<NetworkInterface> networkInterfaces();
+
+    /**
+     * @return the privateLinkServiceConnections value.
+     */
+    List<PrivateLinkServiceConnection> privateLinkServiceConnections();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the subnet value.
+     */
+    Subnet subnet();
+
+    /**
+     * The entirety of the PrivateEndpoint definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PrivateEndpoint definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PrivateEndpoint definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the PrivateEndpoint definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the privateendpoint definition allowing to specify CustomDnsConfigs.
+         */
+        interface WithCustomDnsConfigs {
+            /**
+             * Specifies customDnsConfigs.
+             * @param customDnsConfigs An array of custom dns configurations
+             * @return the next definition stage
+             */
+            WithCreate withCustomDnsConfigs(List<CustomDnsConfigPropertiesFormat> customDnsConfigs);
+        }
+
+        /**
+         * The stage of the privateendpoint definition allowing to specify ManualPrivateLinkServiceConnections.
+         */
+        interface WithManualPrivateLinkServiceConnections {
+            /**
+             * Specifies manualPrivateLinkServiceConnections.
+             * @param manualPrivateLinkServiceConnections A grouping of information about the connection to the remote resource. Used when the network admin does not have access to approve connections to the remote resource
+             * @return the next definition stage
+             */
+            WithCreate withManualPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections);
+        }
+
+        /**
+         * The stage of the privateendpoint definition allowing to specify PrivateLinkServiceConnections.
+         */
+        interface WithPrivateLinkServiceConnections {
+            /**
+             * Specifies privateLinkServiceConnections.
+             * @param privateLinkServiceConnections A grouping of information about the connection to the remote resource
+             * @return the next definition stage
+             */
+            WithCreate withPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> privateLinkServiceConnections);
+        }
+
+        /**
+         * The stage of the privateendpoint definition allowing to specify Subnet.
+         */
+        interface WithSubnet {
+            /**
+             * Specifies subnet.
+             * @param subnet The ID of the subnet from which the private IP will be allocated
+             * @return the next definition stage
+             */
+            WithCreate withSubnet(SubnetInner subnet);
+        }
+
+        /**
+         * 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<PrivateEndpoint>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCustomDnsConfigs, DefinitionStages.WithManualPrivateLinkServiceConnections, DefinitionStages.WithPrivateLinkServiceConnections, DefinitionStages.WithSubnet {
+        }
+    }
+    /**
+     * The template for a PrivateEndpoint update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PrivateEndpoint>, Resource.UpdateWithTags<Update>, UpdateStages.WithCustomDnsConfigs, UpdateStages.WithManualPrivateLinkServiceConnections, UpdateStages.WithPrivateLinkServiceConnections, UpdateStages.WithSubnet {
+    }
+
+    /**
+     * Grouping of PrivateEndpoint update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the privateendpoint update allowing to specify CustomDnsConfigs.
+         */
+        interface WithCustomDnsConfigs {
+            /**
+             * Specifies customDnsConfigs.
+             * @param customDnsConfigs An array of custom dns configurations
+             * @return the next update stage
+             */
+            Update withCustomDnsConfigs(List<CustomDnsConfigPropertiesFormat> customDnsConfigs);
+        }
+
+        /**
+         * The stage of the privateendpoint update allowing to specify ManualPrivateLinkServiceConnections.
+         */
+        interface WithManualPrivateLinkServiceConnections {
+            /**
+             * Specifies manualPrivateLinkServiceConnections.
+             * @param manualPrivateLinkServiceConnections A grouping of information about the connection to the remote resource. Used when the network admin does not have access to approve connections to the remote resource
+             * @return the next update stage
+             */
+            Update withManualPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections);
+        }
+
+        /**
+         * The stage of the privateendpoint update allowing to specify PrivateLinkServiceConnections.
+         */
+        interface WithPrivateLinkServiceConnections {
+            /**
+             * Specifies privateLinkServiceConnections.
+             * @param privateLinkServiceConnections A grouping of information about the connection to the remote resource
+             * @return the next update stage
+             */
+            Update withPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> privateLinkServiceConnections);
+        }
+
+        /**
+         * The stage of the privateendpoint update allowing to specify Subnet.
+         */
+        interface WithSubnet {
+            /**
+             * Specifies subnet.
+             * @param subnet The ID of the subnet from which the private IP will be allocated
+             * @return the next update stage
+             */
+            Update withSubnet(SubnetInner subnet);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpointConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpointConnection.java
new file mode 100644
index 000000000000..e6235be15401
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpointConnection.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateEndpointConnectionInner;
+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.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing PrivateEndpointConnection.
+ */
+public interface PrivateEndpointConnection extends HasInner<PrivateEndpointConnectionInner>, Indexable, Refreshable<PrivateEndpointConnection>, Updatable<PrivateEndpointConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the linkIdentifier value.
+     */
+    String linkIdentifier();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the privateEndpoint value.
+     */
+    PrivateEndpoint privateEndpoint();
+
+    /**
+     * @return the privateLinkServiceConnectionState value.
+     */
+    PrivateLinkServiceConnectionState privateLinkServiceConnectionState();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The template for a PrivateEndpointConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PrivateEndpointConnection>, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPrivateLinkServiceConnectionState {
+    }
+
+    /**
+     * Grouping of PrivateEndpointConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the privateendpointconnection update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the privateendpointconnection update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the privateendpointconnection update allowing to specify PrivateLinkServiceConnectionState.
+         */
+        interface WithPrivateLinkServiceConnectionState {
+            /**
+             * Specifies privateLinkServiceConnectionState.
+             * @param privateLinkServiceConnectionState A collection of information about the state of the connection between service consumer and provider
+             * @return the next update stage
+             */
+            Update withPrivateLinkServiceConnectionState(PrivateLinkServiceConnectionState privateLinkServiceConnectionState);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoints.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoints.java
new file mode 100644
index 000000000000..a44455f9d2ce
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateEndpoints.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.PrivateEndpointsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PrivateEndpoints.
+ */
+public interface PrivateEndpoints extends SupportsCreating<PrivateEndpoint.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<PrivateEndpoint>, SupportsListingByResourceGroup<PrivateEndpoint>, SupportsListing<PrivateEndpoint>, HasInner<PrivateEndpointsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkService.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkService.java
new file mode 100644
index 000000000000..13e29bc0eec6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkService.java
@@ -0,0 +1,269 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FrontendIPConfigurationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateLinkServiceInner;
+
+/**
+ * Type representing PrivateLinkService.
+ */
+public interface PrivateLinkService extends HasInner<PrivateLinkServiceInner>, Resource, GroupableResourceCore<NetworkManager, PrivateLinkServiceInner>, HasResourceGroup, Refreshable<PrivateLinkService>, Updatable<PrivateLinkService.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the alias value.
+     */
+    String alias();
+
+    /**
+     * @return the autoApproval value.
+     */
+    PrivateLinkServicePropertiesAutoApproval autoApproval();
+
+    /**
+     * @return the enableProxyProtocol value.
+     */
+    Boolean enableProxyProtocol();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the fqdns value.
+     */
+    List<String> fqdns();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<PrivateLinkServiceIpConfiguration> ipConfigurations();
+
+    /**
+     * @return the loadBalancerFrontendIpConfigurations value.
+     */
+    List<FrontendIPConfiguration> loadBalancerFrontendIpConfigurations();
+
+    /**
+     * @return the networkInterfaces value.
+     */
+    List<NetworkInterface> networkInterfaces();
+
+    /**
+     * @return the privateEndpointConnections value.
+     */
+    List<PrivateEndpointConnection> privateEndpointConnections();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the visibility value.
+     */
+    PrivateLinkServicePropertiesVisibility visibility();
+
+    /**
+     * The entirety of the PrivateLinkService definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PrivateLinkService definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PrivateLinkService definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the PrivateLinkService definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify AutoApproval.
+         */
+        interface WithAutoApproval {
+            /**
+             * Specifies autoApproval.
+             * @param autoApproval The auto-approval list of the private link service
+             * @return the next definition stage
+             */
+            WithCreate withAutoApproval(PrivateLinkServicePropertiesAutoApproval autoApproval);
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify EnableProxyProtocol.
+         */
+        interface WithEnableProxyProtocol {
+            /**
+             * Specifies enableProxyProtocol.
+             * @param enableProxyProtocol Whether the private link service is enabled for proxy protocol or not
+             * @return the next definition stage
+             */
+            WithCreate withEnableProxyProtocol(Boolean enableProxyProtocol);
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify Fqdns.
+         */
+        interface WithFqdns {
+            /**
+             * Specifies fqdns.
+             * @param fqdns The list of Fqdn
+             * @return the next definition stage
+             */
+            WithCreate withFqdns(List<String> fqdns);
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations An array of private link service IP configurations
+             * @return the next definition stage
+             */
+            WithCreate withIpConfigurations(List<PrivateLinkServiceIpConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify LoadBalancerFrontendIpConfigurations.
+         */
+        interface WithLoadBalancerFrontendIpConfigurations {
+            /**
+             * Specifies loadBalancerFrontendIpConfigurations.
+             * @param loadBalancerFrontendIpConfigurations An array of references to the load balancer IP configurations
+             * @return the next definition stage
+             */
+            WithCreate withLoadBalancerFrontendIpConfigurations(List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations);
+        }
+
+        /**
+         * The stage of the privatelinkservice definition allowing to specify Visibility.
+         */
+        interface WithVisibility {
+            /**
+             * Specifies visibility.
+             * @param visibility The visibility list of the private link service
+             * @return the next definition stage
+             */
+            WithCreate withVisibility(PrivateLinkServicePropertiesVisibility visibility);
+        }
+
+        /**
+         * 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<PrivateLinkService>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAutoApproval, DefinitionStages.WithEnableProxyProtocol, DefinitionStages.WithFqdns, DefinitionStages.WithIpConfigurations, DefinitionStages.WithLoadBalancerFrontendIpConfigurations, DefinitionStages.WithVisibility {
+        }
+    }
+    /**
+     * The template for a PrivateLinkService update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PrivateLinkService>, Resource.UpdateWithTags<Update>, UpdateStages.WithAutoApproval, UpdateStages.WithEnableProxyProtocol, UpdateStages.WithFqdns, UpdateStages.WithIpConfigurations, UpdateStages.WithLoadBalancerFrontendIpConfigurations, UpdateStages.WithVisibility {
+    }
+
+    /**
+     * Grouping of PrivateLinkService update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the privatelinkservice update allowing to specify AutoApproval.
+         */
+        interface WithAutoApproval {
+            /**
+             * Specifies autoApproval.
+             * @param autoApproval The auto-approval list of the private link service
+             * @return the next update stage
+             */
+            Update withAutoApproval(PrivateLinkServicePropertiesAutoApproval autoApproval);
+        }
+
+        /**
+         * The stage of the privatelinkservice update allowing to specify EnableProxyProtocol.
+         */
+        interface WithEnableProxyProtocol {
+            /**
+             * Specifies enableProxyProtocol.
+             * @param enableProxyProtocol Whether the private link service is enabled for proxy protocol or not
+             * @return the next update stage
+             */
+            Update withEnableProxyProtocol(Boolean enableProxyProtocol);
+        }
+
+        /**
+         * The stage of the privatelinkservice update allowing to specify Fqdns.
+         */
+        interface WithFqdns {
+            /**
+             * Specifies fqdns.
+             * @param fqdns The list of Fqdn
+             * @return the next update stage
+             */
+            Update withFqdns(List<String> fqdns);
+        }
+
+        /**
+         * The stage of the privatelinkservice update allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations An array of private link service IP configurations
+             * @return the next update stage
+             */
+            Update withIpConfigurations(List<PrivateLinkServiceIpConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the privatelinkservice update allowing to specify LoadBalancerFrontendIpConfigurations.
+         */
+        interface WithLoadBalancerFrontendIpConfigurations {
+            /**
+             * Specifies loadBalancerFrontendIpConfigurations.
+             * @param loadBalancerFrontendIpConfigurations An array of references to the load balancer IP configurations
+             * @return the next update stage
+             */
+            Update withLoadBalancerFrontendIpConfigurations(List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations);
+        }
+
+        /**
+         * The stage of the privatelinkservice update allowing to specify Visibility.
+         */
+        interface WithVisibility {
+            /**
+             * Specifies visibility.
+             * @param visibility The visibility list of the private link service
+             * @return the next update stage
+             */
+            Update withVisibility(PrivateLinkServicePropertiesVisibility visibility);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnection.java
new file mode 100644
index 000000000000..5f0b04eebb79
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnection.java
@@ -0,0 +1,201 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * PrivateLinkServiceConnection resource.
+ */
+@JsonFlatten
+public class PrivateLinkServiceConnection extends SubResource {
+    /**
+     * The provisioning state of the private link service connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The resource id of private link service.
+     */
+    @JsonProperty(value = "properties.privateLinkServiceId")
+    private String privateLinkServiceId;
+
+    /**
+     * The ID(s) of the group(s) obtained from the remote resource that this
+     * private endpoint should connect to.
+     */
+    @JsonProperty(value = "properties.groupIds")
+    private List<String> groupIds;
+
+    /**
+     * A message passed to the owner of the remote resource with this
+     * connection request. Restricted to 140 chars.
+     */
+    @JsonProperty(value = "properties.requestMessage")
+    private String requestMessage;
+
+    /**
+     * A collection of read-only information about the state of the connection
+     * to the remote resource.
+     */
+    @JsonProperty(value = "properties.privateLinkServiceConnectionState")
+    private PrivateLinkServiceConnectionState privateLinkServiceConnectionState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the provisioning state of the private link service connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the resource id of private link service.
+     *
+     * @return the privateLinkServiceId value
+     */
+    public String privateLinkServiceId() {
+        return this.privateLinkServiceId;
+    }
+
+    /**
+     * Set the resource id of private link service.
+     *
+     * @param privateLinkServiceId the privateLinkServiceId value to set
+     * @return the PrivateLinkServiceConnection object itself.
+     */
+    public PrivateLinkServiceConnection withPrivateLinkServiceId(String privateLinkServiceId) {
+        this.privateLinkServiceId = privateLinkServiceId;
+        return this;
+    }
+
+    /**
+     * Get the ID(s) of the group(s) obtained from the remote resource that this private endpoint should connect to.
+     *
+     * @return the groupIds value
+     */
+    public List<String> groupIds() {
+        return this.groupIds;
+    }
+
+    /**
+     * Set the ID(s) of the group(s) obtained from the remote resource that this private endpoint should connect to.
+     *
+     * @param groupIds the groupIds value to set
+     * @return the PrivateLinkServiceConnection object itself.
+     */
+    public PrivateLinkServiceConnection withGroupIds(List<String> groupIds) {
+        this.groupIds = groupIds;
+        return this;
+    }
+
+    /**
+     * Get a message passed to the owner of the remote resource with this connection request. Restricted to 140 chars.
+     *
+     * @return the requestMessage value
+     */
+    public String requestMessage() {
+        return this.requestMessage;
+    }
+
+    /**
+     * Set a message passed to the owner of the remote resource with this connection request. Restricted to 140 chars.
+     *
+     * @param requestMessage the requestMessage value to set
+     * @return the PrivateLinkServiceConnection object itself.
+     */
+    public PrivateLinkServiceConnection withRequestMessage(String requestMessage) {
+        this.requestMessage = requestMessage;
+        return this;
+    }
+
+    /**
+     * Get a collection of read-only information about the state of the connection to the remote resource.
+     *
+     * @return the privateLinkServiceConnectionState value
+     */
+    public PrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
+        return this.privateLinkServiceConnectionState;
+    }
+
+    /**
+     * Set a collection of read-only information about the state of the connection to the remote resource.
+     *
+     * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set
+     * @return the PrivateLinkServiceConnection object itself.
+     */
+    public PrivateLinkServiceConnection withPrivateLinkServiceConnectionState(PrivateLinkServiceConnectionState privateLinkServiceConnectionState) {
+        this.privateLinkServiceConnectionState = privateLinkServiceConnectionState;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the PrivateLinkServiceConnection object itself.
+     */
+    public PrivateLinkServiceConnection withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnectionState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnectionState.java
new file mode 100644
index 000000000000..dfebf92922fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceConnectionState.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A collection of information about the state of the connection between
+ * service consumer and provider.
+ */
+public class PrivateLinkServiceConnectionState {
+    /**
+     * Indicates whether the connection has been Approved/Rejected/Removed by
+     * the owner of the service.
+     */
+    @JsonProperty(value = "status")
+    private String status;
+
+    /**
+     * The reason for approval/rejection of the connection.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * A message indicating if changes on the service provider require any
+     * updates on the consumer.
+     */
+    @JsonProperty(value = "actionsRequired")
+    private String actionsRequired;
+
+    /**
+     * Get indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+     *
+     * @return the status value
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+     *
+     * @param status the status value to set
+     * @return the PrivateLinkServiceConnectionState object itself.
+     */
+    public PrivateLinkServiceConnectionState withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get the reason for approval/rejection of the connection.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the reason for approval/rejection of the connection.
+     *
+     * @param description the description value to set
+     * @return the PrivateLinkServiceConnectionState object itself.
+     */
+    public PrivateLinkServiceConnectionState withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get a message indicating if changes on the service provider require any updates on the consumer.
+     *
+     * @return the actionsRequired value
+     */
+    public String actionsRequired() {
+        return this.actionsRequired;
+    }
+
+    /**
+     * Set a message indicating if changes on the service provider require any updates on the consumer.
+     *
+     * @param actionsRequired the actionsRequired value to set
+     * @return the PrivateLinkServiceConnectionState object itself.
+     */
+    public PrivateLinkServiceConnectionState withActionsRequired(String actionsRequired) {
+        this.actionsRequired = actionsRequired;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceIpConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceIpConfiguration.java
new file mode 100644
index 000000000000..a469f64579a6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceIpConfiguration.java
@@ -0,0 +1,226 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * The private link service ip configuration.
+ */
+@JsonFlatten
+public class PrivateLinkServiceIpConfiguration extends SubResource {
+    /**
+     * The private IP address of the IP configuration.
+     */
+    @JsonProperty(value = "properties.privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * The private IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * The reference to the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * Whether the ip configuration is primary or not.
+     */
+    @JsonProperty(value = "properties.primary")
+    private Boolean primary;
+
+    /**
+     * The provisioning state of the private link service IP configuration
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Whether the specific IP configuration is IPv4 or IPv6. Default is IPv4.
+     * Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.privateIPAddressVersion")
+    private IPVersion privateIPAddressVersion;
+
+    /**
+     * The name of private link service ip configuration.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the private IP address of the IP configuration.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set the private IP address of the IP configuration.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get the reference to the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the reference to the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get whether the ip configuration is primary or not.
+     *
+     * @return the primary value
+     */
+    public Boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Set whether the ip configuration is primary or not.
+     *
+     * @param primary the primary value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withPrimary(Boolean primary) {
+        this.primary = primary;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the private link service IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get whether the specific IP configuration is IPv4 or IPv6. Default is IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the privateIPAddressVersion value
+     */
+    public IPVersion privateIPAddressVersion() {
+        return this.privateIPAddressVersion;
+    }
+
+    /**
+     * Set whether the specific IP configuration is IPv4 or IPv6. Default is IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param privateIPAddressVersion the privateIPAddressVersion value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withPrivateIPAddressVersion(IPVersion privateIPAddressVersion) {
+        this.privateIPAddressVersion = privateIPAddressVersion;
+        return this;
+    }
+
+    /**
+     * Get the name of private link service ip configuration.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of private link service ip configuration.
+     *
+     * @param name the name value to set
+     * @return the PrivateLinkServiceIpConfiguration object itself.
+     */
+    public PrivateLinkServiceIpConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesAutoApproval.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesAutoApproval.java
new file mode 100644
index 000000000000..76baaa222c7b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesAutoApproval.java
@@ -0,0 +1,16 @@
+/**
+ * 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.network.v2020_04_01;
+
+
+/**
+ * The auto-approval list of the private link service.
+ */
+public class PrivateLinkServicePropertiesAutoApproval extends ResourceSet {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesVisibility.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesVisibility.java
new file mode 100644
index 000000000000..4512afdd920e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServicePropertiesVisibility.java
@@ -0,0 +1,16 @@
+/**
+ * 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.network.v2020_04_01;
+
+
+/**
+ * The visibility list of the private link service.
+ */
+public class PrivateLinkServicePropertiesVisibility extends ResourceSet {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceVisibility.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceVisibility.java
new file mode 100644
index 000000000000..72bda149f294
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServiceVisibility.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PrivateLinkServiceVisibilityInner;
+
+/**
+ * Type representing PrivateLinkServiceVisibility.
+ */
+public interface PrivateLinkServiceVisibility extends HasInner<PrivateLinkServiceVisibilityInner>, HasManager<NetworkManager> {
+    /**
+     * @return the visible value.
+     */
+    Boolean visible();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServices.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServices.java
new file mode 100644
index 000000000000..70df2180e78b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PrivateLinkServices.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.network.v2020_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.network.v2020_04_01.implementation.PrivateLinkServicesInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpointConnection;
+import rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.AutoApprovedPrivateLinkService;
+
+/**
+ * Type representing PrivateLinkServices.
+ */
+public interface PrivateLinkServices extends SupportsCreating<PrivateLinkService.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<PrivateLinkService>, SupportsListingByResourceGroup<PrivateLinkService>, SupportsListing<PrivateLinkService>, HasInner<PrivateLinkServicesInner> {
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateEndpointConnection> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName);
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateEndpointConnection> listPrivateEndpointConnectionsAsync(final String resourceGroupName, final String serviceName);
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName);
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateLinkServiceVisibility> checkPrivateLinkServiceVisibilityAsync(String location);
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PrivateLinkServiceVisibility> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName);
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AutoApprovedPrivateLinkService> listAutoApprovedPrivateLinkServicesAsync(final String location);
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AutoApprovedPrivateLinkService> listAutoApprovedPrivateLinkServicesByResourceGroupAsync(final String location, final String resourceGroupName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Probe.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Probe.java
new file mode 100644
index 000000000000..9a90898da5cf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Probe.java
@@ -0,0 +1,79 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ProbeInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing Probe.
+ */
+public interface Probe extends HasInner<ProbeInner>, Indexable, Refreshable<Probe>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the intervalInSeconds value.
+     */
+    Integer intervalInSeconds();
+
+    /**
+     * @return the loadBalancingRules value.
+     */
+    List<SubResource> loadBalancingRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the numberOfProbes value.
+     */
+    Integer numberOfProbes();
+
+    /**
+     * @return the port value.
+     */
+    int port();
+
+    /**
+     * @return the protocol value.
+     */
+    ProbeProtocol protocol();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the requestPath value.
+     */
+    String requestPath();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProbeProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProbeProtocol.java
new file mode 100644
index 000000000000..1c38f5c94202
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProbeProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ProbeProtocol.
+ */
+public final class ProbeProtocol extends ExpandableStringEnum<ProbeProtocol> {
+    /** Static value Http for ProbeProtocol. */
+    public static final ProbeProtocol HTTP = fromString("Http");
+
+    /** Static value Tcp for ProbeProtocol. */
+    public static final ProbeProtocol TCP = fromString("Tcp");
+
+    /** Static value Https for ProbeProtocol. */
+    public static final ProbeProtocol HTTPS = fromString("Https");
+
+    /**
+     * Creates or finds a ProbeProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ProbeProtocol
+     */
+    @JsonCreator
+    public static ProbeProtocol fromString(String name) {
+        return fromString(name, ProbeProtocol.class);
+    }
+
+    /**
+     * @return known ProbeProtocol values
+     */
+    public static Collection<ProbeProtocol> values() {
+        return values(ProbeProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProcessorArchitecture.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProcessorArchitecture.java
new file mode 100644
index 000000000000..111101a16753
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProcessorArchitecture.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ProcessorArchitecture.
+ */
+public final class ProcessorArchitecture extends ExpandableStringEnum<ProcessorArchitecture> {
+    /** Static value Amd64 for ProcessorArchitecture. */
+    public static final ProcessorArchitecture AMD64 = fromString("Amd64");
+
+    /** Static value X86 for ProcessorArchitecture. */
+    public static final ProcessorArchitecture X86 = fromString("X86");
+
+    /**
+     * Creates or finds a ProcessorArchitecture from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ProcessorArchitecture
+     */
+    @JsonCreator
+    public static ProcessorArchitecture fromString(String name) {
+        return fromString(name, ProcessorArchitecture.class);
+    }
+
+    /**
+     * @return known ProcessorArchitecture values
+     */
+    public static Collection<ProcessorArchitecture> values() {
+        return values(ProcessorArchitecture.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PropagatedRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PropagatedRouteTable.java
new file mode 100644
index 000000000000..9449a1af11fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PropagatedRouteTable.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The list of RouteTables to advertise the routes to.
+ */
+public class PropagatedRouteTable {
+    /**
+     * The list of labels.
+     */
+    @JsonProperty(value = "labels")
+    private List<String> labels;
+
+    /**
+     * The list of resource ids of all the RouteTables.
+     */
+    @JsonProperty(value = "ids")
+    private List<SubResource> ids;
+
+    /**
+     * Get the list of labels.
+     *
+     * @return the labels value
+     */
+    public List<String> labels() {
+        return this.labels;
+    }
+
+    /**
+     * Set the list of labels.
+     *
+     * @param labels the labels value to set
+     * @return the PropagatedRouteTable object itself.
+     */
+    public PropagatedRouteTable withLabels(List<String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * Get the list of resource ids of all the RouteTables.
+     *
+     * @return the ids value
+     */
+    public List<SubResource> ids() {
+        return this.ids;
+    }
+
+    /**
+     * Set the list of resource ids of all the RouteTables.
+     *
+     * @param ids the ids value to set
+     * @return the PropagatedRouteTable object itself.
+     */
+    public PropagatedRouteTable withIds(List<SubResource> ids) {
+        this.ids = ids;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Protocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Protocol.java
new file mode 100644
index 000000000000..a60a42c4fb2e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Protocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Protocol.
+ */
+public final class Protocol extends ExpandableStringEnum<Protocol> {
+    /** Static value Tcp for Protocol. */
+    public static final Protocol TCP = fromString("Tcp");
+
+    /** Static value Http for Protocol. */
+    public static final Protocol HTTP = fromString("Http");
+
+    /** Static value Https for Protocol. */
+    public static final Protocol HTTPS = fromString("Https");
+
+    /** Static value Icmp for Protocol. */
+    public static final Protocol ICMP = fromString("Icmp");
+
+    /**
+     * Creates or finds a Protocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Protocol
+     */
+    @JsonCreator
+    public static Protocol fromString(String name) {
+        return fromString(name, Protocol.class);
+    }
+
+    /**
+     * @return known Protocol values
+     */
+    public static Collection<Protocol> values() {
+        return values(Protocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolConfiguration.java
new file mode 100644
index 000000000000..f25fd1b1ffaa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolConfiguration.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Configuration of the protocol.
+ */
+public class ProtocolConfiguration {
+    /**
+     * HTTP configuration of the connectivity check.
+     */
+    @JsonProperty(value = "HTTPConfiguration")
+    private HTTPConfiguration hTTPConfiguration;
+
+    /**
+     * Get hTTP configuration of the connectivity check.
+     *
+     * @return the hTTPConfiguration value
+     */
+    public HTTPConfiguration hTTPConfiguration() {
+        return this.hTTPConfiguration;
+    }
+
+    /**
+     * Set hTTP configuration of the connectivity check.
+     *
+     * @param hTTPConfiguration the hTTPConfiguration value to set
+     * @return the ProtocolConfiguration object itself.
+     */
+    public ProtocolConfiguration withHTTPConfiguration(HTTPConfiguration hTTPConfiguration) {
+        this.hTTPConfiguration = hTTPConfiguration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolCustomSettingsFormat.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolCustomSettingsFormat.java
new file mode 100644
index 000000000000..4f30eada5a6c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProtocolCustomSettingsFormat.java
@@ -0,0 +1,127 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DDoS custom policy properties.
+ */
+public class ProtocolCustomSettingsFormat {
+    /**
+     * The protocol for which the DDoS protection policy is being customized.
+     * Possible values include: 'Tcp', 'Udp', 'Syn'.
+     */
+    @JsonProperty(value = "protocol")
+    private DdosCustomPolicyProtocol protocol;
+
+    /**
+     * The customized DDoS protection trigger rate.
+     */
+    @JsonProperty(value = "triggerRateOverride")
+    private String triggerRateOverride;
+
+    /**
+     * The customized DDoS protection source rate.
+     */
+    @JsonProperty(value = "sourceRateOverride")
+    private String sourceRateOverride;
+
+    /**
+     * The customized DDoS protection trigger rate sensitivity degrees. High:
+     * Trigger rate set with most sensitivity w.r.t. normal traffic. Default:
+     * Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low:
+     * Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed:
+     * Trigger rate set with least sensitivity w.r.t. normal traffic. Possible
+     * values include: 'Relaxed', 'Low', 'Default', 'High'.
+     */
+    @JsonProperty(value = "triggerSensitivityOverride")
+    private DdosCustomPolicyTriggerSensitivityOverride triggerSensitivityOverride;
+
+    /**
+     * Get the protocol for which the DDoS protection policy is being customized. Possible values include: 'Tcp', 'Udp', 'Syn'.
+     *
+     * @return the protocol value
+     */
+    public DdosCustomPolicyProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol for which the DDoS protection policy is being customized. Possible values include: 'Tcp', 'Udp', 'Syn'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ProtocolCustomSettingsFormat object itself.
+     */
+    public ProtocolCustomSettingsFormat withProtocol(DdosCustomPolicyProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the customized DDoS protection trigger rate.
+     *
+     * @return the triggerRateOverride value
+     */
+    public String triggerRateOverride() {
+        return this.triggerRateOverride;
+    }
+
+    /**
+     * Set the customized DDoS protection trigger rate.
+     *
+     * @param triggerRateOverride the triggerRateOverride value to set
+     * @return the ProtocolCustomSettingsFormat object itself.
+     */
+    public ProtocolCustomSettingsFormat withTriggerRateOverride(String triggerRateOverride) {
+        this.triggerRateOverride = triggerRateOverride;
+        return this;
+    }
+
+    /**
+     * Get the customized DDoS protection source rate.
+     *
+     * @return the sourceRateOverride value
+     */
+    public String sourceRateOverride() {
+        return this.sourceRateOverride;
+    }
+
+    /**
+     * Set the customized DDoS protection source rate.
+     *
+     * @param sourceRateOverride the sourceRateOverride value to set
+     * @return the ProtocolCustomSettingsFormat object itself.
+     */
+    public ProtocolCustomSettingsFormat withSourceRateOverride(String sourceRateOverride) {
+        this.sourceRateOverride = sourceRateOverride;
+        return this;
+    }
+
+    /**
+     * Get the customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic. Possible values include: 'Relaxed', 'Low', 'Default', 'High'.
+     *
+     * @return the triggerSensitivityOverride value
+     */
+    public DdosCustomPolicyTriggerSensitivityOverride triggerSensitivityOverride() {
+        return this.triggerSensitivityOverride;
+    }
+
+    /**
+     * Set the customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic. Possible values include: 'Relaxed', 'Low', 'Default', 'High'.
+     *
+     * @param triggerSensitivityOverride the triggerSensitivityOverride value to set
+     * @return the ProtocolCustomSettingsFormat object itself.
+     */
+    public ProtocolCustomSettingsFormat withTriggerSensitivityOverride(DdosCustomPolicyTriggerSensitivityOverride triggerSensitivityOverride) {
+        this.triggerSensitivityOverride = triggerSensitivityOverride;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProvisioningState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProvisioningState.java
new file mode 100644
index 000000000000..2248d4f2877c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ProvisioningState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ProvisioningState.
+ */
+public final class ProvisioningState extends ExpandableStringEnum<ProvisioningState> {
+    /** Static value Succeeded for ProvisioningState. */
+    public static final ProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /** Static value Updating for ProvisioningState. */
+    public static final ProvisioningState UPDATING = fromString("Updating");
+
+    /** Static value Deleting for ProvisioningState. */
+    public static final ProvisioningState DELETING = fromString("Deleting");
+
+    /** Static value Failed for ProvisioningState. */
+    public static final ProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Creates or finds a ProvisioningState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ProvisioningState
+     */
+    @JsonCreator
+    public static ProvisioningState fromString(String name) {
+        return fromString(name, ProvisioningState.class);
+    }
+
+    /**
+     * @return known ProvisioningState values
+     */
+    public static Collection<ProvisioningState> values() {
+        return values(ProvisioningState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddress.java
new file mode 100644
index 000000000000..2f899fffb993
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddress.java
@@ -0,0 +1,380 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PublicIPAddressInner;
+
+/**
+ * Type representing PublicIPAddress.
+ */
+public interface PublicIPAddress extends HasInner<PublicIPAddressInner>, Resource, GroupableResourceCore<NetworkManager, PublicIPAddressInner>, HasResourceGroup, Refreshable<PublicIPAddress>, Updatable<PublicIPAddress.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the ddosSettings value.
+     */
+    DdosSettings ddosSettings();
+
+    /**
+     * @return the dnsSettings value.
+     */
+    PublicIPAddressDnsSettings dnsSettings();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the idleTimeoutInMinutes value.
+     */
+    Integer idleTimeoutInMinutes();
+
+    /**
+     * @return the ipAddress value.
+     */
+    String ipAddress();
+
+    /**
+     * @return the ipConfiguration value.
+     */
+    IPConfiguration ipConfiguration();
+
+    /**
+     * @return the ipTags value.
+     */
+    List<IpTag> ipTags();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddressVersion value.
+     */
+    IPVersion publicIPAddressVersion();
+
+    /**
+     * @return the publicIPAllocationMethod value.
+     */
+    IPAllocationMethod publicIPAllocationMethod();
+
+    /**
+     * @return the publicIPPrefix value.
+     */
+    SubResource publicIPPrefix();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    PublicIPAddressSku sku();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * The entirety of the PublicIPAddress definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PublicIPAddress definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PublicIPAddress definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the PublicIPAddress definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify DdosSettings.
+         */
+        interface WithDdosSettings {
+            /**
+             * Specifies ddosSettings.
+             * @param ddosSettings The DDoS protection custom policy associated with the public IP address
+             * @return the next definition stage
+             */
+            WithCreate withDdosSettings(DdosSettings ddosSettings);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify DnsSettings.
+         */
+        interface WithDnsSettings {
+            /**
+             * Specifies dnsSettings.
+             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
+             * @return the next definition stage
+             */
+            WithCreate withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The idle timeout of the public IP address
+             * @return the next definition stage
+             */
+            WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify IpAddress.
+         */
+        interface WithIpAddress {
+            /**
+             * Specifies ipAddress.
+             * @param ipAddress The IP address associated with the public IP address resource
+             * @return the next definition stage
+             */
+            WithCreate withIpAddress(String ipAddress);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify IpTags.
+         */
+        interface WithIpTags {
+            /**
+             * Specifies ipTags.
+             * @param ipTags The list of tags associated with the public IP address
+             * @return the next definition stage
+             */
+            WithCreate withIpTags(List<IpTag> ipTags);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify PublicIPAddressVersion.
+         */
+        interface WithPublicIPAddressVersion {
+            /**
+             * Specifies publicIPAddressVersion.
+             * @param publicIPAddressVersion The public IP address version. Possible values include: 'IPv4', 'IPv6'
+             * @return the next definition stage
+             */
+            WithCreate withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify PublicIPAllocationMethod.
+         */
+        interface WithPublicIPAllocationMethod {
+            /**
+             * Specifies publicIPAllocationMethod.
+             * @param publicIPAllocationMethod The public IP address allocation method. Possible values include: 'Static', 'Dynamic'
+             * @return the next definition stage
+             */
+            WithCreate withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify PublicIPPrefix.
+         */
+        interface WithPublicIPPrefix {
+            /**
+             * Specifies publicIPPrefix.
+             * @param publicIPPrefix The Public IP Prefix this Public IP Address should be allocated from
+             * @return the next definition stage
+             */
+            WithCreate withPublicIPPrefix(SubResource publicIPPrefix);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The public IP address SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(PublicIPAddressSku sku);
+        }
+
+        /**
+         * The stage of the publicipaddress definition allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
+             * @return the next definition stage
+             */
+            WithCreate withZones(List<String> zones);
+        }
+
+        /**
+         * 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<PublicIPAddress>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithDdosSettings, DefinitionStages.WithDnsSettings, DefinitionStages.WithIdleTimeoutInMinutes, DefinitionStages.WithIpAddress, DefinitionStages.WithIpTags, DefinitionStages.WithPublicIPAddressVersion, DefinitionStages.WithPublicIPAllocationMethod, DefinitionStages.WithPublicIPPrefix, DefinitionStages.WithSku, DefinitionStages.WithZones {
+        }
+    }
+    /**
+     * The template for a PublicIPAddress update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PublicIPAddress>, Resource.UpdateWithTags<Update>, UpdateStages.WithDdosSettings, UpdateStages.WithDnsSettings, UpdateStages.WithIdleTimeoutInMinutes, UpdateStages.WithIpAddress, UpdateStages.WithIpTags, UpdateStages.WithPublicIPAddressVersion, UpdateStages.WithPublicIPAllocationMethod, UpdateStages.WithPublicIPPrefix, UpdateStages.WithSku, UpdateStages.WithZones {
+    }
+
+    /**
+     * Grouping of PublicIPAddress update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the publicipaddress update allowing to specify DdosSettings.
+         */
+        interface WithDdosSettings {
+            /**
+             * Specifies ddosSettings.
+             * @param ddosSettings The DDoS protection custom policy associated with the public IP address
+             * @return the next update stage
+             */
+            Update withDdosSettings(DdosSettings ddosSettings);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify DnsSettings.
+         */
+        interface WithDnsSettings {
+            /**
+             * Specifies dnsSettings.
+             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
+             * @return the next update stage
+             */
+            Update withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
+         */
+        interface WithIdleTimeoutInMinutes {
+            /**
+             * Specifies idleTimeoutInMinutes.
+             * @param idleTimeoutInMinutes The idle timeout of the public IP address
+             * @return the next update stage
+             */
+            Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify IpAddress.
+         */
+        interface WithIpAddress {
+            /**
+             * Specifies ipAddress.
+             * @param ipAddress The IP address associated with the public IP address resource
+             * @return the next update stage
+             */
+            Update withIpAddress(String ipAddress);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify IpTags.
+         */
+        interface WithIpTags {
+            /**
+             * Specifies ipTags.
+             * @param ipTags The list of tags associated with the public IP address
+             * @return the next update stage
+             */
+            Update withIpTags(List<IpTag> ipTags);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
+         */
+        interface WithPublicIPAddressVersion {
+            /**
+             * Specifies publicIPAddressVersion.
+             * @param publicIPAddressVersion The public IP address version. Possible values include: 'IPv4', 'IPv6'
+             * @return the next update stage
+             */
+            Update withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
+         */
+        interface WithPublicIPAllocationMethod {
+            /**
+             * Specifies publicIPAllocationMethod.
+             * @param publicIPAllocationMethod The public IP address allocation method. Possible values include: 'Static', 'Dynamic'
+             * @return the next update stage
+             */
+            Update withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify PublicIPPrefix.
+         */
+        interface WithPublicIPPrefix {
+            /**
+             * Specifies publicIPPrefix.
+             * @param publicIPPrefix The Public IP Prefix this Public IP Address should be allocated from
+             * @return the next update stage
+             */
+            Update withPublicIPPrefix(SubResource publicIPPrefix);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The public IP address SKU
+             * @return the next update stage
+             */
+            Update withSku(PublicIPAddressSku sku);
+        }
+
+        /**
+         * The stage of the publicipaddress update allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
+             * @return the next update stage
+             */
+            Update withZones(List<String> zones);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressDnsSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressDnsSettings.java
new file mode 100644
index 000000000000..a65e09edd0e1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressDnsSettings.java
@@ -0,0 +1,104 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains FQDN of the DNS record associated with the public IP address.
+ */
+public class PublicIPAddressDnsSettings {
+    /**
+     * The domain name label. The concatenation of the domain name label and
+     * the regionalized DNS zone make up the fully qualified domain name
+     * associated with the public IP address. If a domain name label is
+     * specified, an A DNS record is created for the public IP in the Microsoft
+     * Azure DNS system.
+     */
+    @JsonProperty(value = "domainNameLabel")
+    private String domainNameLabel;
+
+    /**
+     * The Fully Qualified Domain Name of the A DNS record associated with the
+     * public IP. This is the concatenation of the domainNameLabel and the
+     * regionalized DNS zone.
+     */
+    @JsonProperty(value = "fqdn")
+    private String fqdn;
+
+    /**
+     * The reverse FQDN. A user-visible, fully qualified domain name that
+     * resolves to this public IP address. If the reverseFqdn is specified,
+     * then a PTR DNS record is created pointing from the IP address in the
+     * in-addr.arpa domain to the reverse FQDN.
+     */
+    @JsonProperty(value = "reverseFqdn")
+    private String reverseFqdn;
+
+    /**
+     * Get the domain name label. The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address. If a domain name label is specified, an A DNS record is created for the public IP in the Microsoft Azure DNS system.
+     *
+     * @return the domainNameLabel value
+     */
+    public String domainNameLabel() {
+        return this.domainNameLabel;
+    }
+
+    /**
+     * Set the domain name label. The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address. If a domain name label is specified, an A DNS record is created for the public IP in the Microsoft Azure DNS system.
+     *
+     * @param domainNameLabel the domainNameLabel value to set
+     * @return the PublicIPAddressDnsSettings object itself.
+     */
+    public PublicIPAddressDnsSettings withDomainNameLabel(String domainNameLabel) {
+        this.domainNameLabel = domainNameLabel;
+        return this;
+    }
+
+    /**
+     * Get the Fully Qualified Domain Name of the A DNS record associated with the public IP. This is the concatenation of the domainNameLabel and the regionalized DNS zone.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set the Fully Qualified Domain Name of the A DNS record associated with the public IP. This is the concatenation of the domainNameLabel and the regionalized DNS zone.
+     *
+     * @param fqdn the fqdn value to set
+     * @return the PublicIPAddressDnsSettings object itself.
+     */
+    public PublicIPAddressDnsSettings withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get the reverse FQDN. A user-visible, fully qualified domain name that resolves to this public IP address. If the reverseFqdn is specified, then a PTR DNS record is created pointing from the IP address in the in-addr.arpa domain to the reverse FQDN.
+     *
+     * @return the reverseFqdn value
+     */
+    public String reverseFqdn() {
+        return this.reverseFqdn;
+    }
+
+    /**
+     * Set the reverse FQDN. A user-visible, fully qualified domain name that resolves to this public IP address. If the reverseFqdn is specified, then a PTR DNS record is created pointing from the IP address in the in-addr.arpa domain to the reverse FQDN.
+     *
+     * @param reverseFqdn the reverseFqdn value to set
+     * @return the PublicIPAddressDnsSettings object itself.
+     */
+    public PublicIPAddressDnsSettings withReverseFqdn(String reverseFqdn) {
+        this.reverseFqdn = reverseFqdn;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSku.java
new file mode 100644
index 000000000000..8a204936b40c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of a public IP address.
+ */
+public class PublicIPAddressSku {
+    /**
+     * Name of a public IP address SKU. Possible values include: 'Basic',
+     * 'Standard'.
+     */
+    @JsonProperty(value = "name")
+    private PublicIPAddressSkuName name;
+
+    /**
+     * Get name of a public IP address SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the name value
+     */
+    public PublicIPAddressSkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of a public IP address SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the PublicIPAddressSku object itself.
+     */
+    public PublicIPAddressSku withName(PublicIPAddressSkuName name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSkuName.java
new file mode 100644
index 000000000000..8bbe03a2ccf5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddressSkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PublicIPAddressSkuName.
+ */
+public final class PublicIPAddressSkuName extends ExpandableStringEnum<PublicIPAddressSkuName> {
+    /** Static value Basic for PublicIPAddressSkuName. */
+    public static final PublicIPAddressSkuName BASIC = fromString("Basic");
+
+    /** Static value Standard for PublicIPAddressSkuName. */
+    public static final PublicIPAddressSkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a PublicIPAddressSkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PublicIPAddressSkuName
+     */
+    @JsonCreator
+    public static PublicIPAddressSkuName fromString(String name) {
+        return fromString(name, PublicIPAddressSkuName.class);
+    }
+
+    /**
+     * @return known PublicIPAddressSkuName values
+     */
+    public static Collection<PublicIPAddressSkuName> values() {
+        return values(PublicIPAddressSkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddresses.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddresses.java
new file mode 100644
index 000000000000..753b6aafd201
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPAddresses.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.network.v2020_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.network.v2020_04_01.implementation.PublicIPAddressesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PublicIPAddresses.
+ */
+public interface PublicIPAddresses extends SupportsCreating<PublicIPAddress.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<PublicIPAddress>, SupportsListingByResourceGroup<PublicIPAddress>, SupportsListing<PublicIPAddress>, HasInner<PublicIPAddressesInner> {
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PublicIPAddress> listVirtualMachineScaleSetPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName);
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The network interface name.
+     * @param ipConfigurationName The IP configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PublicIPAddress> listVirtualMachineScaleSetVMPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName);
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PublicIPAddress> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefix.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefix.java
new file mode 100644
index 000000000000..0e95167eb172
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefix.java
@@ -0,0 +1,245 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.PublicIPPrefixInner;
+
+/**
+ * Type representing PublicIPPrefix.
+ */
+public interface PublicIPPrefix extends HasInner<PublicIPPrefixInner>, Resource, GroupableResourceCore<NetworkManager, PublicIPPrefixInner>, HasResourceGroup, Refreshable<PublicIPPrefix>, Updatable<PublicIPPrefix.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipPrefix value.
+     */
+    String ipPrefix();
+
+    /**
+     * @return the ipTags value.
+     */
+    List<IpTag> ipTags();
+
+    /**
+     * @return the loadBalancerFrontendIpConfiguration value.
+     */
+    SubResource loadBalancerFrontendIpConfiguration();
+
+    /**
+     * @return the prefixLength value.
+     */
+    Integer prefixLength();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddresses value.
+     */
+    List<ReferencedPublicIpAddress> publicIPAddresses();
+
+    /**
+     * @return the publicIPAddressVersion value.
+     */
+    IPVersion publicIPAddressVersion();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    PublicIPPrefixSku sku();
+
+    /**
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * The entirety of the PublicIPPrefix definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PublicIPPrefix definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PublicIPPrefix definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the PublicIPPrefix definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the publicipprefix definition allowing to specify IpTags.
+         */
+        interface WithIpTags {
+            /**
+             * Specifies ipTags.
+             * @param ipTags The list of tags associated with the public IP prefix
+             * @return the next definition stage
+             */
+            WithCreate withIpTags(List<IpTag> ipTags);
+        }
+
+        /**
+         * The stage of the publicipprefix definition allowing to specify PrefixLength.
+         */
+        interface WithPrefixLength {
+            /**
+             * Specifies prefixLength.
+             * @param prefixLength The Length of the Public IP Prefix
+             * @return the next definition stage
+             */
+            WithCreate withPrefixLength(Integer prefixLength);
+        }
+
+        /**
+         * The stage of the publicipprefix definition allowing to specify PublicIPAddressVersion.
+         */
+        interface WithPublicIPAddressVersion {
+            /**
+             * Specifies publicIPAddressVersion.
+             * @param publicIPAddressVersion The public IP address version. Possible values include: 'IPv4', 'IPv6'
+             * @return the next definition stage
+             */
+            WithCreate withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
+        }
+
+        /**
+         * The stage of the publicipprefix definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The public IP prefix SKU
+             * @return the next definition stage
+             */
+            WithCreate withSku(PublicIPPrefixSku sku);
+        }
+
+        /**
+         * The stage of the publicipprefix definition allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
+             * @return the next definition stage
+             */
+            WithCreate withZones(List<String> zones);
+        }
+
+        /**
+         * 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<PublicIPPrefix>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithIpTags, DefinitionStages.WithPrefixLength, DefinitionStages.WithPublicIPAddressVersion, DefinitionStages.WithSku, DefinitionStages.WithZones {
+        }
+    }
+    /**
+     * The template for a PublicIPPrefix update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PublicIPPrefix>, Resource.UpdateWithTags<Update>, UpdateStages.WithIpTags, UpdateStages.WithPrefixLength, UpdateStages.WithPublicIPAddressVersion, UpdateStages.WithSku, UpdateStages.WithZones {
+    }
+
+    /**
+     * Grouping of PublicIPPrefix update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the publicipprefix update allowing to specify IpTags.
+         */
+        interface WithIpTags {
+            /**
+             * Specifies ipTags.
+             * @param ipTags The list of tags associated with the public IP prefix
+             * @return the next update stage
+             */
+            Update withIpTags(List<IpTag> ipTags);
+        }
+
+        /**
+         * The stage of the publicipprefix update allowing to specify PrefixLength.
+         */
+        interface WithPrefixLength {
+            /**
+             * Specifies prefixLength.
+             * @param prefixLength The Length of the Public IP Prefix
+             * @return the next update stage
+             */
+            Update withPrefixLength(Integer prefixLength);
+        }
+
+        /**
+         * The stage of the publicipprefix update allowing to specify PublicIPAddressVersion.
+         */
+        interface WithPublicIPAddressVersion {
+            /**
+             * Specifies publicIPAddressVersion.
+             * @param publicIPAddressVersion The public IP address version. Possible values include: 'IPv4', 'IPv6'
+             * @return the next update stage
+             */
+            Update withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
+        }
+
+        /**
+         * The stage of the publicipprefix update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The public IP prefix SKU
+             * @return the next update stage
+             */
+            Update withSku(PublicIPPrefixSku sku);
+        }
+
+        /**
+         * The stage of the publicipprefix update allowing to specify Zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies zones.
+             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
+             * @return the next update stage
+             */
+            Update withZones(List<String> zones);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSku.java
new file mode 100644
index 000000000000..56d1e01b4482
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU of a public IP prefix.
+ */
+public class PublicIPPrefixSku {
+    /**
+     * Name of a public IP prefix SKU. Possible values include: 'Standard'.
+     */
+    @JsonProperty(value = "name")
+    private PublicIPPrefixSkuName name;
+
+    /**
+     * Get name of a public IP prefix SKU. Possible values include: 'Standard'.
+     *
+     * @return the name value
+     */
+    public PublicIPPrefixSkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of a public IP prefix SKU. Possible values include: 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the PublicIPPrefixSku object itself.
+     */
+    public PublicIPPrefixSku withName(PublicIPPrefixSkuName name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSkuName.java
new file mode 100644
index 000000000000..465b97fbb1df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixSkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PublicIPPrefixSkuName.
+ */
+public final class PublicIPPrefixSkuName extends ExpandableStringEnum<PublicIPPrefixSkuName> {
+    /** Static value Standard for PublicIPPrefixSkuName. */
+    public static final PublicIPPrefixSkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a PublicIPPrefixSkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PublicIPPrefixSkuName
+     */
+    @JsonCreator
+    public static PublicIPPrefixSkuName fromString(String name) {
+        return fromString(name, PublicIPPrefixSkuName.class);
+    }
+
+    /**
+     * @return known PublicIPPrefixSkuName values
+     */
+    public static Collection<PublicIPPrefixSkuName> values() {
+        return values(PublicIPPrefixSkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixes.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixes.java
new file mode 100644
index 000000000000..60d2ac73906d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/PublicIPPrefixes.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.PublicIPPrefixesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PublicIPPrefixes.
+ */
+public interface PublicIPPrefixes extends SupportsCreating<PublicIPPrefix.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<PublicIPPrefix>, SupportsListingByResourceGroup<PublicIPPrefix>, SupportsListing<PublicIPPrefix>, HasInner<PublicIPPrefixesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/QueryTroubleshootingParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/QueryTroubleshootingParameters.java
new file mode 100644
index 000000000000..b39dc1cb2267
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/QueryTroubleshootingParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the resource to query the troubleshooting result.
+ */
+public class QueryTroubleshootingParameters {
+    /**
+     * The target resource ID to query the troubleshooting result.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * Get the target resource ID to query the troubleshooting result.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the target resource ID to query the troubleshooting result.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the QueryTroubleshootingParameters object itself.
+     */
+    public QueryTroubleshootingParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RadiusServer.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RadiusServer.java
new file mode 100644
index 000000000000..7febe09f3cb3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RadiusServer.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Radius Server Settings.
+ */
+public class RadiusServer {
+    /**
+     * The address of this radius server.
+     */
+    @JsonProperty(value = "radiusServerAddress", required = true)
+    private String radiusServerAddress;
+
+    /**
+     * The initial score assigned to this radius server.
+     */
+    @JsonProperty(value = "radiusServerScore")
+    private Long radiusServerScore;
+
+    /**
+     * The secret used for this radius server.
+     */
+    @JsonProperty(value = "radiusServerSecret")
+    private String radiusServerSecret;
+
+    /**
+     * Get the address of this radius server.
+     *
+     * @return the radiusServerAddress value
+     */
+    public String radiusServerAddress() {
+        return this.radiusServerAddress;
+    }
+
+    /**
+     * Set the address of this radius server.
+     *
+     * @param radiusServerAddress the radiusServerAddress value to set
+     * @return the RadiusServer object itself.
+     */
+    public RadiusServer withRadiusServerAddress(String radiusServerAddress) {
+        this.radiusServerAddress = radiusServerAddress;
+        return this;
+    }
+
+    /**
+     * Get the initial score assigned to this radius server.
+     *
+     * @return the radiusServerScore value
+     */
+    public Long radiusServerScore() {
+        return this.radiusServerScore;
+    }
+
+    /**
+     * Set the initial score assigned to this radius server.
+     *
+     * @param radiusServerScore the radiusServerScore value to set
+     * @return the RadiusServer object itself.
+     */
+    public RadiusServer withRadiusServerScore(Long radiusServerScore) {
+        this.radiusServerScore = radiusServerScore;
+        return this;
+    }
+
+    /**
+     * Get the secret used for this radius server.
+     *
+     * @return the radiusServerSecret value
+     */
+    public String radiusServerSecret() {
+        return this.radiusServerSecret;
+    }
+
+    /**
+     * Set the secret used for this radius server.
+     *
+     * @param radiusServerSecret the radiusServerSecret value to set
+     * @return the RadiusServer object itself.
+     */
+    public RadiusServer withRadiusServerSecret(String radiusServerSecret) {
+        this.radiusServerSecret = radiusServerSecret;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RecordSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RecordSet.java
new file mode 100644
index 000000000000..4790ed68ebff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RecordSet.java
@@ -0,0 +1,164 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A collective group of information about the record set information.
+ */
+public class RecordSet {
+    /**
+     * Resource record type.
+     */
+    @JsonProperty(value = "recordType")
+    private String recordType;
+
+    /**
+     * Recordset name.
+     */
+    @JsonProperty(value = "recordSetName")
+    private String recordSetName;
+
+    /**
+     * Fqdn that resolves to private endpoint ip address.
+     */
+    @JsonProperty(value = "fqdn")
+    private String fqdn;
+
+    /**
+     * The provisioning state of the recordset. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Recordset time to live.
+     */
+    @JsonProperty(value = "ttl")
+    private Integer ttl;
+
+    /**
+     * The private ip address of the private endpoint.
+     */
+    @JsonProperty(value = "ipAddresses")
+    private List<String> ipAddresses;
+
+    /**
+     * Get resource record type.
+     *
+     * @return the recordType value
+     */
+    public String recordType() {
+        return this.recordType;
+    }
+
+    /**
+     * Set resource record type.
+     *
+     * @param recordType the recordType value to set
+     * @return the RecordSet object itself.
+     */
+    public RecordSet withRecordType(String recordType) {
+        this.recordType = recordType;
+        return this;
+    }
+
+    /**
+     * Get recordset name.
+     *
+     * @return the recordSetName value
+     */
+    public String recordSetName() {
+        return this.recordSetName;
+    }
+
+    /**
+     * Set recordset name.
+     *
+     * @param recordSetName the recordSetName value to set
+     * @return the RecordSet object itself.
+     */
+    public RecordSet withRecordSetName(String recordSetName) {
+        this.recordSetName = recordSetName;
+        return this;
+    }
+
+    /**
+     * Get fqdn that resolves to private endpoint ip address.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set fqdn that resolves to private endpoint ip address.
+     *
+     * @param fqdn the fqdn value to set
+     * @return the RecordSet object itself.
+     */
+    public RecordSet withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the recordset. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get recordset time to live.
+     *
+     * @return the ttl value
+     */
+    public Integer ttl() {
+        return this.ttl;
+    }
+
+    /**
+     * Set recordset time to live.
+     *
+     * @param ttl the ttl value to set
+     * @return the RecordSet object itself.
+     */
+    public RecordSet withTtl(Integer ttl) {
+        this.ttl = ttl;
+        return this;
+    }
+
+    /**
+     * Get the private ip address of the private endpoint.
+     *
+     * @return the ipAddresses value
+     */
+    public List<String> ipAddresses() {
+        return this.ipAddresses;
+    }
+
+    /**
+     * Set the private ip address of the private endpoint.
+     *
+     * @param ipAddresses the ipAddresses value to set
+     * @return the RecordSet object itself.
+     */
+    public RecordSet withIpAddresses(List<String> ipAddresses) {
+        this.ipAddresses = ipAddresses;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ReferencedPublicIpAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ReferencedPublicIpAddress.java
new file mode 100644
index 000000000000..110972d08549
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ReferencedPublicIpAddress.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Reference to a public IP address.
+ */
+public class ReferencedPublicIpAddress {
+    /**
+     * The PublicIPAddress Reference.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the PublicIPAddress Reference.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the PublicIPAddress Reference.
+     *
+     * @param id the id value to set
+     * @return the ReferencedPublicIpAddress object itself.
+     */
+    public ReferencedPublicIpAddress withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceIdentityType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceIdentityType.java
new file mode 100644
index 000000000000..48abce69d1c5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceIdentityType.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for ResourceIdentityType.
+ */
+public enum ResourceIdentityType {
+    /** Enum value SystemAssigned. */
+    SYSTEM_ASSIGNED("SystemAssigned"),
+
+    /** Enum value UserAssigned. */
+    USER_ASSIGNED("UserAssigned"),
+
+    /** Enum value SystemAssigned, UserAssigned. */
+    SYSTEM_ASSIGNED_USER_ASSIGNED("SystemAssigned, UserAssigned"),
+
+    /** Enum value None. */
+    NONE("None");
+
+    /** The actual serialized value for a ResourceIdentityType instance. */
+    private String value;
+
+    ResourceIdentityType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a ResourceIdentityType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ResourceIdentityType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static ResourceIdentityType fromString(String value) {
+        ResourceIdentityType[] items = ResourceIdentityType.values();
+        for (ResourceIdentityType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinks.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinks.java
new file mode 100644
index 000000000000..172caef5c6da
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinks.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinksInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ResourceNavigationLinks.
+ */
+public interface ResourceNavigationLinks extends HasInner<ResourceNavigationLinksInner> {
+    /**
+     * Gets a list of resource navigation links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceNavigationLinksListResult> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinksListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinksListResult.java
new file mode 100644
index 000000000000..bfd4ef86f81b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceNavigationLinksListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinksListResultInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinkInner;
+import java.util.List;
+
+/**
+ * Type representing ResourceNavigationLinksListResult.
+ */
+public interface ResourceNavigationLinksListResult extends HasInner<ResourceNavigationLinksListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ResourceNavigationLinkInner> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceSet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceSet.java
new file mode 100644
index 000000000000..67db55ffd8c6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ResourceSet.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The base resource set for visibility and auto-approval.
+ */
+public class ResourceSet {
+    /**
+     * The list of subscriptions.
+     */
+    @JsonProperty(value = "subscriptions")
+    private List<String> subscriptions;
+
+    /**
+     * Get the list of subscriptions.
+     *
+     * @return the subscriptions value
+     */
+    public List<String> subscriptions() {
+        return this.subscriptions;
+    }
+
+    /**
+     * Set the list of subscriptions.
+     *
+     * @param subscriptions the subscriptions value to set
+     * @return the ResourceSet object itself.
+     */
+    public ResourceSet withSubscriptions(List<String> subscriptions) {
+        this.subscriptions = subscriptions;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RetentionPolicyParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RetentionPolicyParameters.java
new file mode 100644
index 000000000000..0ab02b8fcb4b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RetentionPolicyParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the retention policy for flow log.
+ */
+public class RetentionPolicyParameters {
+    /**
+     * Number of days to retain flow log records.
+     */
+    @JsonProperty(value = "days")
+    private Integer days;
+
+    /**
+     * Flag to enable/disable retention.
+     */
+    @JsonProperty(value = "enabled")
+    private Boolean enabled;
+
+    /**
+     * Get number of days to retain flow log records.
+     *
+     * @return the days value
+     */
+    public Integer days() {
+        return this.days;
+    }
+
+    /**
+     * Set number of days to retain flow log records.
+     *
+     * @param days the days value to set
+     * @return the RetentionPolicyParameters object itself.
+     */
+    public RetentionPolicyParameters withDays(Integer days) {
+        this.days = days;
+        return this;
+    }
+
+    /**
+     * Get flag to enable/disable retention.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set flag to enable/disable retention.
+     *
+     * @param enabled the enabled value to set
+     * @return the RetentionPolicyParameters object itself.
+     */
+    public RetentionPolicyParameters withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Route.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Route.java
new file mode 100644
index 000000000000..7459f4efee62
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Route.java
@@ -0,0 +1,216 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing Route.
+ */
+public interface Route extends HasInner<RouteInner>, Indexable, Refreshable<Route>, Updatable<Route.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressPrefix value.
+     */
+    String addressPrefix();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the nextHopIpAddress value.
+     */
+    String nextHopIpAddress();
+
+    /**
+     * @return the nextHopType value.
+     */
+    RouteNextHopType nextHopType();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * The entirety of the Route definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithRouteTable, DefinitionStages.WithNextHopType, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of Route definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a Route definition.
+         */
+        interface Blank extends WithRouteTable {
+        }
+
+        /**
+         * The stage of the route definition allowing to specify RouteTable.
+         */
+        interface WithRouteTable {
+           /**
+            * Specifies resourceGroupName, routeTableName.
+            * @param resourceGroupName The name of the resource group
+            * @param routeTableName The name of the route table
+            * @return the next definition stage
+            */
+            WithNextHopType withExistingRouteTable(String resourceGroupName, String routeTableName);
+        }
+
+        /**
+         * The stage of the route definition allowing to specify NextHopType.
+         */
+        interface WithNextHopType {
+           /**
+            * Specifies nextHopType.
+            * @param nextHopType The type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'
+            * @return the next definition stage
+            */
+            WithCreate withNextHopType(RouteNextHopType nextHopType);
+        }
+
+        /**
+         * The stage of the route definition allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix The destination CIDR to which the route applies
+             * @return the next definition stage
+             */
+            WithCreate withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the route definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the route definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the route definition allowing to specify NextHopIpAddress.
+         */
+        interface WithNextHopIpAddress {
+            /**
+             * Specifies nextHopIpAddress.
+             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
+             * @return the next definition stage
+             */
+            WithCreate withNextHopIpAddress(String nextHopIpAddress);
+        }
+
+        /**
+         * 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<Route>, DefinitionStages.WithAddressPrefix, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithNextHopIpAddress {
+        }
+    }
+    /**
+     * The template for a Route update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<Route>, UpdateStages.WithAddressPrefix, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithNextHopIpAddress {
+    }
+
+    /**
+     * Grouping of Route update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the route update allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix The destination CIDR to which the route applies
+             * @return the next update stage
+             */
+            Update withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the route update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the route update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the route update allowing to specify NextHopIpAddress.
+         */
+        interface WithNextHopIpAddress {
+            /**
+             * Specifies nextHopIpAddress.
+             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
+             * @return the next update stage
+             */
+            Update withNextHopIpAddress(String nextHopIpAddress);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilter.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilter.java
new file mode 100644
index 000000000000..cb04af06863c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilter.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteFilterRuleInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteFilterInner;
+
+/**
+ * Type representing RouteFilter.
+ */
+public interface RouteFilter extends HasInner<RouteFilterInner>, Resource, GroupableResourceCore<NetworkManager, RouteFilterInner>, HasResourceGroup, Refreshable<RouteFilter>, Updatable<RouteFilter.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipv6Peerings value.
+     */
+    List<ExpressRouteCircuitPeering> ipv6Peerings();
+
+    /**
+     * @return the peerings value.
+     */
+    List<ExpressRouteCircuitPeering> peerings();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the rules value.
+     */
+    List<RouteFilterRule> rules();
+
+    /**
+     * The entirety of the RouteFilter definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of RouteFilter definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a RouteFilter definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the RouteFilter definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the routefilter definition allowing to specify Rules.
+         */
+        interface WithRules {
+            /**
+             * Specifies rules.
+             * @param rules Collection of RouteFilterRules contained within a route filter
+             * @return the next definition stage
+             */
+            WithCreate withRules(List<RouteFilterRuleInner> rules);
+        }
+
+        /**
+         * 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<RouteFilter>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithRules {
+        }
+    }
+    /**
+     * The template for a RouteFilter update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<RouteFilter>, Resource.UpdateWithTags<Update>, UpdateStages.WithRules {
+    }
+
+    /**
+     * Grouping of RouteFilter update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the routefilter update allowing to specify Rules.
+         */
+        interface WithRules {
+            /**
+             * Specifies rules.
+             * @param rules Collection of RouteFilterRules contained within a route filter
+             * @return the next update stage
+             */
+            Update withRules(List<RouteFilterRuleInner> rules);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRule.java
new file mode 100644
index 000000000000..902ed178d9a9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRule.java
@@ -0,0 +1,222 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteFilterRuleInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing RouteFilterRule.
+ */
+public interface RouteFilterRule extends HasInner<RouteFilterRuleInner>, Indexable, Refreshable<RouteFilterRule>, Updatable<RouteFilterRule.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the access value.
+     */
+    Access access();
+
+    /**
+     * @return the communities value.
+     */
+    List<String> communities();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routeFilterRuleType value.
+     */
+    String routeFilterRuleType();
+
+    /**
+     * The entirety of the RouteFilterRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithRouteFilter, DefinitionStages.WithAccess, DefinitionStages.WithCommunities, DefinitionStages.WithRouteFilterRuleType, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of RouteFilterRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a RouteFilterRule definition.
+         */
+        interface Blank extends WithRouteFilter {
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify RouteFilter.
+         */
+        interface WithRouteFilter {
+           /**
+            * Specifies resourceGroupName, routeFilterName.
+            * @param resourceGroupName The name of the resource group
+            * @param routeFilterName The name of the route filter
+            * @return the next definition stage
+            */
+            WithAccess withExistingRouteFilter(String resourceGroupName, String routeFilterName);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify Access.
+         */
+        interface WithAccess {
+           /**
+            * Specifies access.
+            * @param access The access type of the rule. Possible values include: 'Allow', 'Deny'
+            * @return the next definition stage
+            */
+            WithCommunities withAccess(Access access);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify Communities.
+         */
+        interface WithCommunities {
+           /**
+            * Specifies communities.
+            * @param communities The collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020']
+            * @return the next definition stage
+            */
+            WithRouteFilterRuleType withCommunities(List<String> communities);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify RouteFilterRuleType.
+         */
+        interface WithRouteFilterRuleType {
+           /**
+            * Specifies routeFilterRuleType.
+            * @param routeFilterRuleType The rule type of the rule
+            * @return the next definition stage
+            */
+            WithCreate withRouteFilterRuleType(String routeFilterRuleType);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Resource location
+             * @return the next definition stage
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the routefilterrule definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            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<RouteFilterRule>, DefinitionStages.WithId, DefinitionStages.WithLocation, DefinitionStages.WithName {
+        }
+    }
+    /**
+     * The template for a RouteFilterRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<RouteFilterRule>, UpdateStages.WithId, UpdateStages.WithLocation, UpdateStages.WithName {
+    }
+
+    /**
+     * Grouping of RouteFilterRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the routefilterrule update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the routefilterrule update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             * @param location Resource location
+             * @return the next update stage
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the routefilterrule update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRules.java
new file mode 100644
index 000000000000..b6f23c2367f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilterRules.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteFilterRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RouteFilterRules.
+ */
+public interface RouteFilterRules extends SupportsCreating<RouteFilterRule.DefinitionStages.Blank>, HasInner<RouteFilterRulesInner> {
+    /**
+     * Gets the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RouteFilterRule> getAsync(String resourceGroupName, String routeFilterName, String ruleName);
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RouteFilterRule> listByRouteFilterAsync(final String resourceGroupName, final String routeFilterName);
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String routeFilterName, String ruleName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilters.java
new file mode 100644
index 000000000000..882d010a28d2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteFilters.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.RouteFiltersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RouteFilters.
+ */
+public interface RouteFilters extends SupportsCreating<RouteFilter.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<RouteFilter>, SupportsListingByResourceGroup<RouteFilter>, SupportsListing<RouteFilter>, HasInner<RouteFiltersInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteNextHopType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteNextHopType.java
new file mode 100644
index 000000000000..ad6fade168d1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteNextHopType.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for RouteNextHopType.
+ */
+public final class RouteNextHopType extends ExpandableStringEnum<RouteNextHopType> {
+    /** Static value VirtualNetworkGateway for RouteNextHopType. */
+    public static final RouteNextHopType VIRTUAL_NETWORK_GATEWAY = fromString("VirtualNetworkGateway");
+
+    /** Static value VnetLocal for RouteNextHopType. */
+    public static final RouteNextHopType VNET_LOCAL = fromString("VnetLocal");
+
+    /** Static value Internet for RouteNextHopType. */
+    public static final RouteNextHopType INTERNET = fromString("Internet");
+
+    /** Static value VirtualAppliance for RouteNextHopType. */
+    public static final RouteNextHopType VIRTUAL_APPLIANCE = fromString("VirtualAppliance");
+
+    /** Static value None for RouteNextHopType. */
+    public static final RouteNextHopType NONE = fromString("None");
+
+    /**
+     * Creates or finds a RouteNextHopType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding RouteNextHopType
+     */
+    @JsonCreator
+    public static RouteNextHopType fromString(String name) {
+        return fromString(name, RouteNextHopType.class);
+    }
+
+    /**
+     * @return known RouteNextHopType values
+     */
+    public static Collection<RouteNextHopType> values() {
+        return values(RouteNextHopType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTable.java
new file mode 100644
index 000000000000..a8224a306560
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTable.java
@@ -0,0 +1,143 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteTableInner;
+
+/**
+ * Type representing RouteTable.
+ */
+public interface RouteTable extends HasInner<RouteTableInner>, Resource, GroupableResourceCore<NetworkManager, RouteTableInner>, HasResourceGroup, Refreshable<RouteTable>, Updatable<RouteTable.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the disableBgpRoutePropagation value.
+     */
+    Boolean disableBgpRoutePropagation();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routes value.
+     */
+    List<Route> routes();
+
+    /**
+     * @return the subnets value.
+     */
+    List<Subnet> subnets();
+
+    /**
+     * The entirety of the RouteTable definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of RouteTable definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a RouteTable definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the RouteTable definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the routetable definition allowing to specify DisableBgpRoutePropagation.
+         */
+        interface WithDisableBgpRoutePropagation {
+            /**
+             * Specifies disableBgpRoutePropagation.
+             * @param disableBgpRoutePropagation Whether to disable the routes learned by BGP on that route table. True means disable
+             * @return the next definition stage
+             */
+            WithCreate withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
+        }
+
+        /**
+         * The stage of the routetable definition allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes Collection of routes contained within a route table
+             * @return the next definition stage
+             */
+            WithCreate withRoutes(List<RouteInner> routes);
+        }
+
+        /**
+         * 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<RouteTable>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithDisableBgpRoutePropagation, DefinitionStages.WithRoutes {
+        }
+    }
+    /**
+     * The template for a RouteTable update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<RouteTable>, Resource.UpdateWithTags<Update>, UpdateStages.WithDisableBgpRoutePropagation, UpdateStages.WithRoutes {
+    }
+
+    /**
+     * Grouping of RouteTable update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
+         */
+        interface WithDisableBgpRoutePropagation {
+            /**
+             * Specifies disableBgpRoutePropagation.
+             * @param disableBgpRoutePropagation Whether to disable the routes learned by BGP on that route table. True means disable
+             * @return the next update stage
+             */
+            Update withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
+        }
+
+        /**
+         * The stage of the routetable update allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes Collection of routes contained within a route table
+             * @return the next update stage
+             */
+            Update withRoutes(List<RouteInner> routes);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTables.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTables.java
new file mode 100644
index 000000000000..6f413849412c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RouteTables.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.RouteTablesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RouteTables.
+ */
+public interface RouteTables extends SupportsCreating<RouteTable.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<RouteTable>, SupportsListingByResourceGroup<RouteTable>, SupportsListing<RouteTable>, HasInner<RouteTablesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Routes.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Routes.java
new file mode 100644
index 000000000000..bbd5bc368b4d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Routes.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RoutesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Routes.
+ */
+public interface Routes extends SupportsCreating<Route.DefinitionStages.Blank>, HasInner<RoutesInner> {
+    /**
+     * Gets the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Route> getAsync(String resourceGroupName, String routeTableName, String routeName);
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Route> listAsync(final String resourceGroupName, final String routeTableName);
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String routeTableName, String routeName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RoutingConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RoutingConfiguration.java
new file mode 100644
index 000000000000..35a20b6ddbe5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/RoutingConfiguration.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Routing Configuration indicating the associated and propagated route tables
+ * for this connection.
+ */
+public class RoutingConfiguration {
+    /**
+     * The resource id RouteTable associated with this RoutingConfiguration.
+     */
+    @JsonProperty(value = "associatedRouteTable")
+    private SubResource associatedRouteTable;
+
+    /**
+     * The list of RouteTables to advertise the routes to.
+     */
+    @JsonProperty(value = "propagatedRouteTables")
+    private PropagatedRouteTable propagatedRouteTables;
+
+    /**
+     * List of routes that control routing from VirtualHub into a virtual
+     * network connection.
+     */
+    @JsonProperty(value = "vnetRoutes")
+    private VnetRoute vnetRoutes;
+
+    /**
+     * Get the resource id RouteTable associated with this RoutingConfiguration.
+     *
+     * @return the associatedRouteTable value
+     */
+    public SubResource associatedRouteTable() {
+        return this.associatedRouteTable;
+    }
+
+    /**
+     * Set the resource id RouteTable associated with this RoutingConfiguration.
+     *
+     * @param associatedRouteTable the associatedRouteTable value to set
+     * @return the RoutingConfiguration object itself.
+     */
+    public RoutingConfiguration withAssociatedRouteTable(SubResource associatedRouteTable) {
+        this.associatedRouteTable = associatedRouteTable;
+        return this;
+    }
+
+    /**
+     * Get the list of RouteTables to advertise the routes to.
+     *
+     * @return the propagatedRouteTables value
+     */
+    public PropagatedRouteTable propagatedRouteTables() {
+        return this.propagatedRouteTables;
+    }
+
+    /**
+     * Set the list of RouteTables to advertise the routes to.
+     *
+     * @param propagatedRouteTables the propagatedRouteTables value to set
+     * @return the RoutingConfiguration object itself.
+     */
+    public RoutingConfiguration withPropagatedRouteTables(PropagatedRouteTable propagatedRouteTables) {
+        this.propagatedRouteTables = propagatedRouteTables;
+        return this;
+    }
+
+    /**
+     * Get list of routes that control routing from VirtualHub into a virtual network connection.
+     *
+     * @return the vnetRoutes value
+     */
+    public VnetRoute vnetRoutes() {
+        return this.vnetRoutes;
+    }
+
+    /**
+     * Set list of routes that control routing from VirtualHub into a virtual network connection.
+     *
+     * @param vnetRoutes the vnetRoutes value to set
+     * @return the RoutingConfiguration object itself.
+     */
+    public RoutingConfiguration withVnetRoutes(VnetRoute vnetRoutes) {
+        this.vnetRoutes = vnetRoutes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupNetworkInterface.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupNetworkInterface.java
new file mode 100644
index 000000000000..359c42f9db11
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupNetworkInterface.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network interface and all its associated security rules.
+ */
+public class SecurityGroupNetworkInterface {
+    /**
+     * ID of the network interface.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * All security rules associated with the network interface.
+     */
+    @JsonProperty(value = "securityRuleAssociations")
+    private SecurityRuleAssociations securityRuleAssociations;
+
+    /**
+     * Get iD of the network interface.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set iD of the network interface.
+     *
+     * @param id the id value to set
+     * @return the SecurityGroupNetworkInterface object itself.
+     */
+    public SecurityGroupNetworkInterface withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get all security rules associated with the network interface.
+     *
+     * @return the securityRuleAssociations value
+     */
+    public SecurityRuleAssociations securityRuleAssociations() {
+        return this.securityRuleAssociations;
+    }
+
+    /**
+     * Set all security rules associated with the network interface.
+     *
+     * @param securityRuleAssociations the securityRuleAssociations value to set
+     * @return the SecurityGroupNetworkInterface object itself.
+     */
+    public SecurityGroupNetworkInterface withSecurityRuleAssociations(SecurityRuleAssociations securityRuleAssociations) {
+        this.securityRuleAssociations = securityRuleAssociations;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewParameters.java
new file mode 100644
index 000000000000..2c0d63da8eef
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the VM to check security groups for.
+ */
+public class SecurityGroupViewParameters {
+    /**
+     * ID of the target VM.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * Get iD of the target VM.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set iD of the target VM.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the SecurityGroupViewParameters object itself.
+     */
+    public SecurityGroupViewParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewResult.java
new file mode 100644
index 000000000000..216c12812de5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityGroupViewResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityGroupViewResultInner;
+import java.util.List;
+
+/**
+ * Type representing SecurityGroupViewResult.
+ */
+public interface SecurityGroupViewResult extends HasInner<SecurityGroupViewResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the networkInterfaces value.
+     */
+    List<SecurityGroupNetworkInterface> networkInterfaces();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProvider.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProvider.java
new file mode 100644
index 000000000000..6d0520cbdf5f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProvider.java
@@ -0,0 +1,142 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityPartnerProviderInner;
+
+/**
+ * Type representing SecurityPartnerProvider.
+ */
+public interface SecurityPartnerProvider extends HasInner<SecurityPartnerProviderInner>, Resource, GroupableResourceCore<NetworkManager, SecurityPartnerProviderInner>, HasResourceGroup, Refreshable<SecurityPartnerProvider>, Updatable<SecurityPartnerProvider.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the connectionStatus value.
+     */
+    SecurityPartnerProviderConnectionStatus connectionStatus();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the securityProviderName value.
+     */
+    SecurityProviderName securityProviderName();
+
+    /**
+     * @return the virtualHub value.
+     */
+    SubResource virtualHub();
+
+    /**
+     * The entirety of the SecurityPartnerProvider definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of SecurityPartnerProvider definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a SecurityPartnerProvider definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the SecurityPartnerProvider definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the securitypartnerprovider definition allowing to specify SecurityProviderName.
+         */
+        interface WithSecurityProviderName {
+            /**
+             * Specifies securityProviderName.
+             * @param securityProviderName The security provider name. Possible values include: 'ZScaler', 'IBoss', 'Checkpoint'
+             * @return the next definition stage
+             */
+            WithCreate withSecurityProviderName(SecurityProviderName securityProviderName);
+        }
+
+        /**
+         * The stage of the securitypartnerprovider definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The virtualHub to which the Security Partner Provider belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * 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<SecurityPartnerProvider>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithSecurityProviderName, DefinitionStages.WithVirtualHub {
+        }
+    }
+    /**
+     * The template for a SecurityPartnerProvider update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<SecurityPartnerProvider>, Resource.UpdateWithTags<Update>, UpdateStages.WithSecurityProviderName, UpdateStages.WithVirtualHub {
+    }
+
+    /**
+     * Grouping of SecurityPartnerProvider update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the securitypartnerprovider update allowing to specify SecurityProviderName.
+         */
+        interface WithSecurityProviderName {
+            /**
+             * Specifies securityProviderName.
+             * @param securityProviderName The security provider name. Possible values include: 'ZScaler', 'IBoss', 'Checkpoint'
+             * @return the next update stage
+             */
+            Update withSecurityProviderName(SecurityProviderName securityProviderName);
+        }
+
+        /**
+         * The stage of the securitypartnerprovider update allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The virtualHub to which the Security Partner Provider belongs
+             * @return the next update stage
+             */
+            Update withVirtualHub(SubResource virtualHub);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviderConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviderConnectionStatus.java
new file mode 100644
index 000000000000..9535656f90df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviderConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SecurityPartnerProviderConnectionStatus.
+ */
+public final class SecurityPartnerProviderConnectionStatus extends ExpandableStringEnum<SecurityPartnerProviderConnectionStatus> {
+    /** Static value Unknown for SecurityPartnerProviderConnectionStatus. */
+    public static final SecurityPartnerProviderConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value PartiallyConnected for SecurityPartnerProviderConnectionStatus. */
+    public static final SecurityPartnerProviderConnectionStatus PARTIALLY_CONNECTED = fromString("PartiallyConnected");
+
+    /** Static value Connected for SecurityPartnerProviderConnectionStatus. */
+    public static final SecurityPartnerProviderConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value NotConnected for SecurityPartnerProviderConnectionStatus. */
+    public static final SecurityPartnerProviderConnectionStatus NOT_CONNECTED = fromString("NotConnected");
+
+    /**
+     * Creates or finds a SecurityPartnerProviderConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SecurityPartnerProviderConnectionStatus
+     */
+    @JsonCreator
+    public static SecurityPartnerProviderConnectionStatus fromString(String name) {
+        return fromString(name, SecurityPartnerProviderConnectionStatus.class);
+    }
+
+    /**
+     * @return known SecurityPartnerProviderConnectionStatus values
+     */
+    public static Collection<SecurityPartnerProviderConnectionStatus> values() {
+        return values(SecurityPartnerProviderConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviders.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviders.java
new file mode 100644
index 000000000000..816b90be95b4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityPartnerProviders.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.SecurityPartnerProvidersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing SecurityPartnerProviders.
+ */
+public interface SecurityPartnerProviders extends SupportsCreating<SecurityPartnerProvider.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<SecurityPartnerProvider>, SupportsListingByResourceGroup<SecurityPartnerProvider>, SupportsListing<SecurityPartnerProvider>, HasInner<SecurityPartnerProvidersInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityProviderName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityProviderName.java
new file mode 100644
index 000000000000..34d76b2bf13f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityProviderName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SecurityProviderName.
+ */
+public final class SecurityProviderName extends ExpandableStringEnum<SecurityProviderName> {
+    /** Static value ZScaler for SecurityProviderName. */
+    public static final SecurityProviderName ZSCALER = fromString("ZScaler");
+
+    /** Static value IBoss for SecurityProviderName. */
+    public static final SecurityProviderName IBOSS = fromString("IBoss");
+
+    /** Static value Checkpoint for SecurityProviderName. */
+    public static final SecurityProviderName CHECKPOINT = fromString("Checkpoint");
+
+    /**
+     * Creates or finds a SecurityProviderName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SecurityProviderName
+     */
+    @JsonCreator
+    public static SecurityProviderName fromString(String name) {
+        return fromString(name, SecurityProviderName.class);
+    }
+
+    /**
+     * @return known SecurityProviderName values
+     */
+    public static Collection<SecurityProviderName> values() {
+        return values(SecurityProviderName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAccess.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAccess.java
new file mode 100644
index 000000000000..3a6160d76ce5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAccess.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SecurityRuleAccess.
+ */
+public final class SecurityRuleAccess extends ExpandableStringEnum<SecurityRuleAccess> {
+    /** Static value Allow for SecurityRuleAccess. */
+    public static final SecurityRuleAccess ALLOW = fromString("Allow");
+
+    /** Static value Deny for SecurityRuleAccess. */
+    public static final SecurityRuleAccess DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a SecurityRuleAccess from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SecurityRuleAccess
+     */
+    @JsonCreator
+    public static SecurityRuleAccess fromString(String name) {
+        return fromString(name, SecurityRuleAccess.class);
+    }
+
+    /**
+     * @return known SecurityRuleAccess values
+     */
+    public static Collection<SecurityRuleAccess> values() {
+        return values(SecurityRuleAccess.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAssociations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAssociations.java
new file mode 100644
index 000000000000..bc3a456981c7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleAssociations.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * All security rules associated with the network interface.
+ */
+public class SecurityRuleAssociations {
+    /**
+     * Network interface and it's custom security rules.
+     */
+    @JsonProperty(value = "networkInterfaceAssociation")
+    private NetworkInterfaceAssociation networkInterfaceAssociation;
+
+    /**
+     * Subnet and it's custom security rules.
+     */
+    @JsonProperty(value = "subnetAssociation")
+    private SubnetAssociation subnetAssociation;
+
+    /**
+     * Collection of default security rules of the network security group.
+     */
+    @JsonProperty(value = "defaultSecurityRules")
+    private List<SecurityRuleInner> defaultSecurityRules;
+
+    /**
+     * Collection of effective security rules.
+     */
+    @JsonProperty(value = "effectiveSecurityRules")
+    private List<EffectiveNetworkSecurityRule> effectiveSecurityRules;
+
+    /**
+     * Get network interface and it's custom security rules.
+     *
+     * @return the networkInterfaceAssociation value
+     */
+    public NetworkInterfaceAssociation networkInterfaceAssociation() {
+        return this.networkInterfaceAssociation;
+    }
+
+    /**
+     * Set network interface and it's custom security rules.
+     *
+     * @param networkInterfaceAssociation the networkInterfaceAssociation value to set
+     * @return the SecurityRuleAssociations object itself.
+     */
+    public SecurityRuleAssociations withNetworkInterfaceAssociation(NetworkInterfaceAssociation networkInterfaceAssociation) {
+        this.networkInterfaceAssociation = networkInterfaceAssociation;
+        return this;
+    }
+
+    /**
+     * Get subnet and it's custom security rules.
+     *
+     * @return the subnetAssociation value
+     */
+    public SubnetAssociation subnetAssociation() {
+        return this.subnetAssociation;
+    }
+
+    /**
+     * Set subnet and it's custom security rules.
+     *
+     * @param subnetAssociation the subnetAssociation value to set
+     * @return the SecurityRuleAssociations object itself.
+     */
+    public SecurityRuleAssociations withSubnetAssociation(SubnetAssociation subnetAssociation) {
+        this.subnetAssociation = subnetAssociation;
+        return this;
+    }
+
+    /**
+     * Get collection of default security rules of the network security group.
+     *
+     * @return the defaultSecurityRules value
+     */
+    public List<SecurityRuleInner> defaultSecurityRules() {
+        return this.defaultSecurityRules;
+    }
+
+    /**
+     * Set collection of default security rules of the network security group.
+     *
+     * @param defaultSecurityRules the defaultSecurityRules value to set
+     * @return the SecurityRuleAssociations object itself.
+     */
+    public SecurityRuleAssociations withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules) {
+        this.defaultSecurityRules = defaultSecurityRules;
+        return this;
+    }
+
+    /**
+     * Get collection of effective security rules.
+     *
+     * @return the effectiveSecurityRules value
+     */
+    public List<EffectiveNetworkSecurityRule> effectiveSecurityRules() {
+        return this.effectiveSecurityRules;
+    }
+
+    /**
+     * Set collection of effective security rules.
+     *
+     * @param effectiveSecurityRules the effectiveSecurityRules value to set
+     * @return the SecurityRuleAssociations object itself.
+     */
+    public SecurityRuleAssociations withEffectiveSecurityRules(List<EffectiveNetworkSecurityRule> effectiveSecurityRules) {
+        this.effectiveSecurityRules = effectiveSecurityRules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleDirection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleDirection.java
new file mode 100644
index 000000000000..c5986f9f8f98
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleDirection.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SecurityRuleDirection.
+ */
+public final class SecurityRuleDirection extends ExpandableStringEnum<SecurityRuleDirection> {
+    /** Static value Inbound for SecurityRuleDirection. */
+    public static final SecurityRuleDirection INBOUND = fromString("Inbound");
+
+    /** Static value Outbound for SecurityRuleDirection. */
+    public static final SecurityRuleDirection OUTBOUND = fromString("Outbound");
+
+    /**
+     * Creates or finds a SecurityRuleDirection from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SecurityRuleDirection
+     */
+    @JsonCreator
+    public static SecurityRuleDirection fromString(String name) {
+        return fromString(name, SecurityRuleDirection.class);
+    }
+
+    /**
+     * @return known SecurityRuleDirection values
+     */
+    public static Collection<SecurityRuleDirection> values() {
+        return values(SecurityRuleDirection.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleProtocol.java
new file mode 100644
index 000000000000..394c3c38c423
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRuleProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SecurityRuleProtocol.
+ */
+public final class SecurityRuleProtocol extends ExpandableStringEnum<SecurityRuleProtocol> {
+    /** Static value Tcp for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol TCP = fromString("Tcp");
+
+    /** Static value Udp for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol UDP = fromString("Udp");
+
+    /** Static value Icmp for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol ICMP = fromString("Icmp");
+
+    /** Static value Esp for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol ESP = fromString("Esp");
+
+    /** Static value * for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol ASTERISK = fromString("*");
+
+    /** Static value Ah for SecurityRuleProtocol. */
+    public static final SecurityRuleProtocol AH = fromString("Ah");
+
+    /**
+     * Creates or finds a SecurityRuleProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SecurityRuleProtocol
+     */
+    @JsonCreator
+    public static SecurityRuleProtocol fromString(String name) {
+        return fromString(name, SecurityRuleProtocol.class);
+    }
+
+    /**
+     * @return known SecurityRuleProtocol values
+     */
+    public static Collection<SecurityRuleProtocol> values() {
+        return values(SecurityRuleProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRules.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRules.java
new file mode 100644
index 000000000000..dbc3a0eded2c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SecurityRules.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRulesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing SecurityRules.
+ */
+public interface SecurityRules extends SupportsCreating<NetworkSecurityGroupSecurityRule.DefinitionStages.Blank>, HasInner<SecurityRulesInner> {
+    /**
+     * Get the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkSecurityGroupSecurityRule> getAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName);
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkSecurityGroupSecurityRule> listAsync(final String resourceGroupName, final String networkSecurityGroupName);
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinks.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinks.java
new file mode 100644
index 000000000000..bc4b33343516
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinks.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinksInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServiceAssociationLinks.
+ */
+public interface ServiceAssociationLinks extends HasInner<ServiceAssociationLinksInner> {
+    /**
+     * Gets a list of service association links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceAssociationLinksListResult> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinksListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinksListResult.java
new file mode 100644
index 000000000000..f7ea26c528b5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceAssociationLinksListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinksListResultInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinkInner;
+import java.util.List;
+
+/**
+ * Type representing ServiceAssociationLinksListResult.
+ */
+public interface ServiceAssociationLinksListResult extends HasInner<ServiceAssociationLinksListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the nextLink value.
+     */
+    String nextLink();
+
+    /**
+     * @return the value value.
+     */
+    List<ServiceAssociationLinkInner> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicies.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicies.java
new file mode 100644
index 000000000000..5bd9780b1a56
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicies.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.ServiceEndpointPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServiceEndpointPolicies.
+ */
+public interface ServiceEndpointPolicies extends SupportsCreating<ServiceEndpointPolicy.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ServiceEndpointPolicy>, SupportsListingByResourceGroup<ServiceEndpointPolicy>, SupportsListing<ServiceEndpointPolicy>, HasInner<ServiceEndpointPoliciesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicy.java
new file mode 100644
index 000000000000..9018d56af725
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicy.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceEndpointPolicyDefinitionInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceEndpointPolicyInner;
+
+/**
+ * Type representing ServiceEndpointPolicy.
+ */
+public interface ServiceEndpointPolicy extends HasInner<ServiceEndpointPolicyInner>, Resource, GroupableResourceCore<NetworkManager, ServiceEndpointPolicyInner>, HasResourceGroup, Refreshable<ServiceEndpointPolicy>, Updatable<ServiceEndpointPolicy.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the serviceEndpointPolicyDefinitions value.
+     */
+    List<ServiceEndpointPolicyDefinition> serviceEndpointPolicyDefinitions();
+
+    /**
+     * @return the subnets value.
+     */
+    List<Subnet> subnets();
+
+    /**
+     * The entirety of the ServiceEndpointPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ServiceEndpointPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ServiceEndpointPolicy definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ServiceEndpointPolicy definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the serviceendpointpolicy definition allowing to specify ServiceEndpointPolicyDefinitions.
+         */
+        interface WithServiceEndpointPolicyDefinitions {
+            /**
+             * Specifies serviceEndpointPolicyDefinitions.
+             * @param serviceEndpointPolicyDefinitions A collection of service endpoint policy definitions of the service endpoint policy
+             * @return the next definition stage
+             */
+            WithCreate withServiceEndpointPolicyDefinitions(List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions);
+        }
+
+        /**
+         * 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<ServiceEndpointPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithServiceEndpointPolicyDefinitions {
+        }
+    }
+    /**
+     * The template for a ServiceEndpointPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ServiceEndpointPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithServiceEndpointPolicyDefinitions {
+    }
+
+    /**
+     * Grouping of ServiceEndpointPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the serviceendpointpolicy update allowing to specify ServiceEndpointPolicyDefinitions.
+         */
+        interface WithServiceEndpointPolicyDefinitions {
+            /**
+             * Specifies serviceEndpointPolicyDefinitions.
+             * @param serviceEndpointPolicyDefinitions A collection of service endpoint policy definitions of the service endpoint policy
+             * @return the next update stage
+             */
+            Update withServiceEndpointPolicyDefinitions(List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinition.java
new file mode 100644
index 000000000000..2be4227b9c0b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinition.java
@@ -0,0 +1,229 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceEndpointPolicyDefinitionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing ServiceEndpointPolicyDefinition.
+ */
+public interface ServiceEndpointPolicyDefinition extends HasInner<ServiceEndpointPolicyDefinitionInner>, Indexable, Refreshable<ServiceEndpointPolicyDefinition>, Updatable<ServiceEndpointPolicyDefinition.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the service value.
+     */
+    String service();
+
+    /**
+     * @return the serviceResources value.
+     */
+    List<String> serviceResources();
+
+    /**
+     * The entirety of the ServiceEndpointPolicyDefinition definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithServiceEndpointPolicy, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ServiceEndpointPolicyDefinition definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ServiceEndpointPolicyDefinition definition.
+         */
+        interface Blank extends WithServiceEndpointPolicy {
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify ServiceEndpointPolicy.
+         */
+        interface WithServiceEndpointPolicy {
+           /**
+            * Specifies resourceGroupName, serviceEndpointPolicyName.
+            * @param resourceGroupName The name of the resource group
+            * @param serviceEndpointPolicyName The name of the service endpoint policy
+            * @return the next definition stage
+            */
+            WithCreate withExistingServiceEndpointPolicy(String resourceGroupName, String serviceEndpointPolicyName);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             * @param description A description for this rule. Restricted to 140 chars
+             * @return the next definition stage
+             */
+            WithCreate withDescription(String description);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify Service.
+         */
+        interface WithService {
+            /**
+             * Specifies service.
+             * @param service Service endpoint name
+             * @return the next definition stage
+             */
+            WithCreate withService(String service);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition definition allowing to specify ServiceResources.
+         */
+        interface WithServiceResources {
+            /**
+             * Specifies serviceResources.
+             * @param serviceResources A list of service resources
+             * @return the next definition stage
+             */
+            WithCreate withServiceResources(List<String> serviceResources);
+        }
+
+        /**
+         * 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<ServiceEndpointPolicyDefinition>, DefinitionStages.WithDescription, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithService, DefinitionStages.WithServiceResources {
+        }
+    }
+    /**
+     * The template for a ServiceEndpointPolicyDefinition update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ServiceEndpointPolicyDefinition>, UpdateStages.WithDescription, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithService, UpdateStages.WithServiceResources {
+    }
+
+    /**
+     * Grouping of ServiceEndpointPolicyDefinition update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the serviceendpointpolicydefinition update allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             * @param description A description for this rule. Restricted to 140 chars
+             * @return the next update stage
+             */
+            Update withDescription(String description);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition update allowing to specify Service.
+         */
+        interface WithService {
+            /**
+             * Specifies service.
+             * @param service Service endpoint name
+             * @return the next update stage
+             */
+            Update withService(String service);
+        }
+
+        /**
+         * The stage of the serviceendpointpolicydefinition update allowing to specify ServiceResources.
+         */
+        interface WithServiceResources {
+            /**
+             * Specifies serviceResources.
+             * @param serviceResources A list of service resources
+             * @return the next update stage
+             */
+            Update withServiceResources(List<String> serviceResources);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinitions.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinitions.java
new file mode 100644
index 000000000000..572e99f1ceca
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPolicyDefinitions.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceEndpointPolicyDefinitionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServiceEndpointPolicyDefinitions.
+ */
+public interface ServiceEndpointPolicyDefinitions extends SupportsCreating<ServiceEndpointPolicyDefinition.DefinitionStages.Blank>, HasInner<ServiceEndpointPolicyDefinitionsInner> {
+    /**
+     * Get the specified service endpoint policy definitions from service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceEndpointPolicyDefinition> getAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName);
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceEndpointPolicyDefinition> listByResourceGroupAsync(final String resourceGroupName, final String serviceEndpointPolicyName);
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPropertiesFormat.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPropertiesFormat.java
new file mode 100644
index 000000000000..a0e6bfbb9663
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceEndpointPropertiesFormat.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The service endpoint properties.
+ */
+public class ServiceEndpointPropertiesFormat {
+    /**
+     * The type of the endpoint service.
+     */
+    @JsonProperty(value = "service")
+    private String service;
+
+    /**
+     * A list of locations.
+     */
+    @JsonProperty(value = "locations")
+    private List<String> locations;
+
+    /**
+     * The provisioning state of the service endpoint resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Get the type of the endpoint service.
+     *
+     * @return the service value
+     */
+    public String service() {
+        return this.service;
+    }
+
+    /**
+     * Set the type of the endpoint service.
+     *
+     * @param service the service value to set
+     * @return the ServiceEndpointPropertiesFormat object itself.
+     */
+    public ServiceEndpointPropertiesFormat withService(String service) {
+        this.service = service;
+        return this;
+    }
+
+    /**
+     * Get a list of locations.
+     *
+     * @return the locations value
+     */
+    public List<String> locations() {
+        return this.locations;
+    }
+
+    /**
+     * Set a list of locations.
+     *
+     * @param locations the locations value to set
+     * @return the ServiceEndpointPropertiesFormat object itself.
+     */
+    public ServiceEndpointPropertiesFormat withLocations(List<String> locations) {
+        this.locations = locations;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the service endpoint resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceProviderProvisioningState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceProviderProvisioningState.java
new file mode 100644
index 000000000000..943bb00e68f5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceProviderProvisioningState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ServiceProviderProvisioningState.
+ */
+public final class ServiceProviderProvisioningState extends ExpandableStringEnum<ServiceProviderProvisioningState> {
+    /** Static value NotProvisioned for ServiceProviderProvisioningState. */
+    public static final ServiceProviderProvisioningState NOT_PROVISIONED = fromString("NotProvisioned");
+
+    /** Static value Provisioning for ServiceProviderProvisioningState. */
+    public static final ServiceProviderProvisioningState PROVISIONING = fromString("Provisioning");
+
+    /** Static value Provisioned for ServiceProviderProvisioningState. */
+    public static final ServiceProviderProvisioningState PROVISIONED = fromString("Provisioned");
+
+    /** Static value Deprovisioning for ServiceProviderProvisioningState. */
+    public static final ServiceProviderProvisioningState DEPROVISIONING = fromString("Deprovisioning");
+
+    /**
+     * Creates or finds a ServiceProviderProvisioningState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ServiceProviderProvisioningState
+     */
+    @JsonCreator
+    public static ServiceProviderProvisioningState fromString(String name) {
+        return fromString(name, ServiceProviderProvisioningState.class);
+    }
+
+    /**
+     * @return known ServiceProviderProvisioningState values
+     */
+    public static Collection<ServiceProviderProvisioningState> values() {
+        return values(ServiceProviderProvisioningState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformation.java
new file mode 100644
index 000000000000..2a3746c48281
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformation.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The service tag information.
+ */
+public class ServiceTagInformation {
+    /**
+     * Properties of the service tag information.
+     */
+    @JsonProperty(value = "properties", access = JsonProperty.Access.WRITE_ONLY)
+    private ServiceTagInformationPropertiesFormat properties;
+
+    /**
+     * The name of service tag.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The ID of service tag.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Get properties of the service tag information.
+     *
+     * @return the properties value
+     */
+    public ServiceTagInformationPropertiesFormat properties() {
+        return this.properties;
+    }
+
+    /**
+     * Get the name of service tag.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the ID of service tag.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformationPropertiesFormat.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformationPropertiesFormat.java
new file mode 100644
index 000000000000..d39630bf257e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagInformationPropertiesFormat.java
@@ -0,0 +1,78 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the service tag information.
+ */
+public class ServiceTagInformationPropertiesFormat {
+    /**
+     * The iteration number of service tag.
+     */
+    @JsonProperty(value = "changeNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private String changeNumber;
+
+    /**
+     * The region of service tag.
+     */
+    @JsonProperty(value = "region", access = JsonProperty.Access.WRITE_ONLY)
+    private String region;
+
+    /**
+     * The name of system service.
+     */
+    @JsonProperty(value = "systemService", access = JsonProperty.Access.WRITE_ONLY)
+    private String systemService;
+
+    /**
+     * The list of IP address prefixes.
+     */
+    @JsonProperty(value = "addressPrefixes", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> addressPrefixes;
+
+    /**
+     * Get the iteration number of service tag.
+     *
+     * @return the changeNumber value
+     */
+    public String changeNumber() {
+        return this.changeNumber;
+    }
+
+    /**
+     * Get the region of service tag.
+     *
+     * @return the region value
+     */
+    public String region() {
+        return this.region;
+    }
+
+    /**
+     * Get the name of system service.
+     *
+     * @return the systemService value
+     */
+    public String systemService() {
+        return this.systemService;
+    }
+
+    /**
+     * Get the list of IP address prefixes.
+     *
+     * @return the addressPrefixes value
+     */
+    public List<String> addressPrefixes() {
+        return this.addressPrefixes;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTags.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTags.java
new file mode 100644
index 000000000000..adc855a209b8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTags.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceTagsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServiceTags.
+ */
+public interface ServiceTags extends HasInner<ServiceTagsInner> {
+    /**
+     * Gets a list of service tag information resources.
+     *
+     * @param location The location that will be used as a reference for version (not as a filter based on location, you will get the list of service tags with prefix details across all regions but limited to the cloud that your subscription belongs to).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceTagsListResult> listAsync(String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagsListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagsListResult.java
new file mode 100644
index 000000000000..c3fc82dc2197
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ServiceTagsListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceTagsListResultInner;
+import java.util.List;
+
+/**
+ * Type representing ServiceTagsListResult.
+ */
+public interface ServiceTagsListResult extends HasInner<ServiceTagsListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the changeNumber value.
+     */
+    String changeNumber();
+
+    /**
+     * @return the cloud value.
+     */
+    String cloud();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the values value.
+     */
+    List<ServiceTagInformation> values();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SessionIds.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SessionIds.java
new file mode 100644
index 000000000000..1cfb3dfdc0dd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SessionIds.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of session IDs.
+ */
+public class SessionIds {
+    /**
+     * List of session IDs.
+     */
+    @JsonProperty(value = "sessionIds")
+    private List<String> sessionIds;
+
+    /**
+     * Get list of session IDs.
+     *
+     * @return the sessionIds value
+     */
+    public List<String> sessionIds() {
+        return this.sessionIds;
+    }
+
+    /**
+     * Set list of session IDs.
+     *
+     * @param sessionIds the sessionIds value to set
+     * @return the SessionIds object itself.
+     */
+    public SessionIds withSessionIds(List<String> sessionIds) {
+        this.sessionIds = sessionIds;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Severity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Severity.java
new file mode 100644
index 000000000000..3a576a1809db
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Severity.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Severity.
+ */
+public final class Severity extends ExpandableStringEnum<Severity> {
+    /** Static value Error for Severity. */
+    public static final Severity ERROR = fromString("Error");
+
+    /** Static value Warning for Severity. */
+    public static final Severity WARNING = fromString("Warning");
+
+    /**
+     * Creates or finds a Severity from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Severity
+     */
+    @JsonCreator
+    public static Severity fromString(String name) {
+        return fromString(name, Severity.class);
+    }
+
+    /**
+     * @return known Severity values
+     */
+    public static Collection<Severity> values() {
+        return values(Severity.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/StaticRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/StaticRoute.java
new file mode 100644
index 000000000000..f59b95ec5f6a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/StaticRoute.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of all Static Routes.
+ */
+public class StaticRoute {
+    /**
+     * The name of the StaticRoute that is unique within a VnetRoute.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * List of all address prefixes.
+     */
+    @JsonProperty(value = "addressPrefixes")
+    private List<String> addressPrefixes;
+
+    /**
+     * The ip address of the next hop.
+     */
+    @JsonProperty(value = "nextHopIpAddress")
+    private String nextHopIpAddress;
+
+    /**
+     * Get the name of the StaticRoute that is unique within a VnetRoute.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the StaticRoute that is unique within a VnetRoute.
+     *
+     * @param name the name value to set
+     * @return the StaticRoute object itself.
+     */
+    public StaticRoute withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get list of all address prefixes.
+     *
+     * @return the addressPrefixes value
+     */
+    public List<String> addressPrefixes() {
+        return this.addressPrefixes;
+    }
+
+    /**
+     * Set list of all address prefixes.
+     *
+     * @param addressPrefixes the addressPrefixes value to set
+     * @return the StaticRoute object itself.
+     */
+    public StaticRoute withAddressPrefixes(List<String> addressPrefixes) {
+        this.addressPrefixes = addressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the ip address of the next hop.
+     *
+     * @return the nextHopIpAddress value
+     */
+    public String nextHopIpAddress() {
+        return this.nextHopIpAddress;
+    }
+
+    /**
+     * Set the ip address of the next hop.
+     *
+     * @param nextHopIpAddress the nextHopIpAddress value to set
+     * @return the StaticRoute object itself.
+     */
+    public StaticRoute withNextHopIpAddress(String nextHopIpAddress) {
+        this.nextHopIpAddress = nextHopIpAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java
new file mode 100644
index 000000000000..92cb82eda4eb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java
@@ -0,0 +1,497 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinkInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinkInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkSecurityGroupInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.RouteTableInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceEndpointPolicyInner;
+
+/**
+ * Type representing Subnet.
+ */
+public interface Subnet extends HasInner<SubnetInner>, Indexable, Refreshable<Subnet>, Updatable<Subnet.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressPrefix value.
+     */
+    String addressPrefix();
+
+    /**
+     * @return the addressPrefixes value.
+     */
+    List<String> addressPrefixes();
+
+    /**
+     * @return the delegations value.
+     */
+    List<Delegation> delegations();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipAllocations value.
+     */
+    List<SubResource> ipAllocations();
+
+    /**
+     * @return the ipConfigurationProfiles value.
+     */
+    List<IPConfigurationProfile> ipConfigurationProfiles();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<IPConfiguration> ipConfigurations();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the natGateway value.
+     */
+    SubResource natGateway();
+
+    /**
+     * @return the networkSecurityGroup value.
+     */
+    NetworkSecurityGroup networkSecurityGroup();
+
+    /**
+     * @return the privateEndpointNetworkPolicies value.
+     */
+    String privateEndpointNetworkPolicies();
+
+    /**
+     * @return the privateEndpoints value.
+     */
+    List<PrivateEndpoint> privateEndpoints();
+
+    /**
+     * @return the privateLinkServiceNetworkPolicies value.
+     */
+    String privateLinkServiceNetworkPolicies();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the purpose value.
+     */
+    String purpose();
+
+    /**
+     * @return the resourceNavigationLinks value.
+     */
+    List<ResourceNavigationLinkInner> resourceNavigationLinks();
+
+    /**
+     * @return the routeTable value.
+     */
+    RouteTable routeTable();
+
+    /**
+     * @return the serviceAssociationLinks value.
+     */
+    List<ServiceAssociationLinkInner> serviceAssociationLinks();
+
+    /**
+     * @return the serviceEndpointPolicies value.
+     */
+    List<ServiceEndpointPolicy> serviceEndpointPolicies();
+
+    /**
+     * @return the serviceEndpoints value.
+     */
+    List<ServiceEndpointPropertiesFormat> serviceEndpoints();
+
+    /**
+     * The entirety of the Subnet definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVirtualNetwork, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of Subnet definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a Subnet definition.
+         */
+        interface Blank extends WithVirtualNetwork {
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify VirtualNetwork.
+         */
+        interface WithVirtualNetwork {
+           /**
+            * Specifies resourceGroupName, virtualNetworkName.
+            * @param resourceGroupName The name of the resource group
+            * @param virtualNetworkName The name of the virtual network
+            * @return the next definition stage
+            */
+            WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix The address prefix for the subnet
+             * @return the next definition stage
+             */
+            WithCreate withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify AddressPrefixes.
+         */
+        interface WithAddressPrefixes {
+            /**
+             * Specifies addressPrefixes.
+             * @param addressPrefixes List of address prefixes for the subnet
+             * @return the next definition stage
+             */
+            WithCreate withAddressPrefixes(List<String> addressPrefixes);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify Delegations.
+         */
+        interface WithDelegations {
+            /**
+             * Specifies delegations.
+             * @param delegations An array of references to the delegations on the subnet
+             * @return the next definition stage
+             */
+            WithCreate withDelegations(List<Delegation> delegations);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify IpAllocations.
+         */
+        interface WithIpAllocations {
+            /**
+             * Specifies ipAllocations.
+             * @param ipAllocations Array of IpAllocation which reference this subnet
+             * @return the next definition stage
+             */
+            WithCreate withIpAllocations(List<SubResource> ipAllocations);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify NatGateway.
+         */
+        interface WithNatGateway {
+            /**
+             * Specifies natGateway.
+             * @param natGateway Nat gateway associated with this subnet
+             * @return the next definition stage
+             */
+            WithCreate withNatGateway(SubResource natGateway);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify NetworkSecurityGroup.
+         */
+        interface WithNetworkSecurityGroup {
+            /**
+             * Specifies networkSecurityGroup.
+             * @param networkSecurityGroup The reference to the NetworkSecurityGroup resource
+             * @return the next definition stage
+             */
+            WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify PrivateEndpointNetworkPolicies.
+         */
+        interface WithPrivateEndpointNetworkPolicies {
+            /**
+             * Specifies privateEndpointNetworkPolicies.
+             * @param privateEndpointNetworkPolicies Enable or Disable apply network policies on private end point in the subnet
+             * @return the next definition stage
+             */
+            WithCreate withPrivateEndpointNetworkPolicies(String privateEndpointNetworkPolicies);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify PrivateLinkServiceNetworkPolicies.
+         */
+        interface WithPrivateLinkServiceNetworkPolicies {
+            /**
+             * Specifies privateLinkServiceNetworkPolicies.
+             * @param privateLinkServiceNetworkPolicies Enable or Disable apply network policies on private link service in the subnet
+             * @return the next definition stage
+             */
+            WithCreate withPrivateLinkServiceNetworkPolicies(String privateLinkServiceNetworkPolicies);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify RouteTable.
+         */
+        interface WithRouteTable {
+            /**
+             * Specifies routeTable.
+             * @param routeTable The reference to the RouteTable resource
+             * @return the next definition stage
+             */
+            WithCreate withRouteTable(RouteTableInner routeTable);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify ServiceEndpointPolicies.
+         */
+        interface WithServiceEndpointPolicies {
+            /**
+             * Specifies serviceEndpointPolicies.
+             * @param serviceEndpointPolicies An array of service endpoint policies
+             * @return the next definition stage
+             */
+            WithCreate withServiceEndpointPolicies(List<ServiceEndpointPolicyInner> serviceEndpointPolicies);
+        }
+
+        /**
+         * The stage of the subnet definition allowing to specify ServiceEndpoints.
+         */
+        interface WithServiceEndpoints {
+            /**
+             * Specifies serviceEndpoints.
+             * @param serviceEndpoints An array of service endpoints
+             * @return the next definition stage
+             */
+            WithCreate withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
+        }
+
+        /**
+         * 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<Subnet>, DefinitionStages.WithAddressPrefix, DefinitionStages.WithAddressPrefixes, DefinitionStages.WithDelegations, DefinitionStages.WithId, DefinitionStages.WithIpAllocations, DefinitionStages.WithName, DefinitionStages.WithNatGateway, DefinitionStages.WithNetworkSecurityGroup, DefinitionStages.WithPrivateEndpointNetworkPolicies, DefinitionStages.WithPrivateLinkServiceNetworkPolicies, DefinitionStages.WithRouteTable, DefinitionStages.WithServiceEndpointPolicies, DefinitionStages.WithServiceEndpoints {
+        }
+    }
+    /**
+     * The template for a Subnet update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<Subnet>, UpdateStages.WithAddressPrefix, UpdateStages.WithAddressPrefixes, UpdateStages.WithDelegations, UpdateStages.WithId, UpdateStages.WithIpAllocations, UpdateStages.WithName, UpdateStages.WithNatGateway, UpdateStages.WithNetworkSecurityGroup, UpdateStages.WithPrivateEndpointNetworkPolicies, UpdateStages.WithPrivateLinkServiceNetworkPolicies, UpdateStages.WithRouteTable, UpdateStages.WithServiceEndpointPolicies, UpdateStages.WithServiceEndpoints {
+    }
+
+    /**
+     * Grouping of Subnet update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the subnet update allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix The address prefix for the subnet
+             * @return the next update stage
+             */
+            Update withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify AddressPrefixes.
+         */
+        interface WithAddressPrefixes {
+            /**
+             * Specifies addressPrefixes.
+             * @param addressPrefixes List of address prefixes for the subnet
+             * @return the next update stage
+             */
+            Update withAddressPrefixes(List<String> addressPrefixes);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify Delegations.
+         */
+        interface WithDelegations {
+            /**
+             * Specifies delegations.
+             * @param delegations An array of references to the delegations on the subnet
+             * @return the next update stage
+             */
+            Update withDelegations(List<Delegation> delegations);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify IpAllocations.
+         */
+        interface WithIpAllocations {
+            /**
+             * Specifies ipAllocations.
+             * @param ipAllocations Array of IpAllocation which reference this subnet
+             * @return the next update stage
+             */
+            Update withIpAllocations(List<SubResource> ipAllocations);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify NatGateway.
+         */
+        interface WithNatGateway {
+            /**
+             * Specifies natGateway.
+             * @param natGateway Nat gateway associated with this subnet
+             * @return the next update stage
+             */
+            Update withNatGateway(SubResource natGateway);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify NetworkSecurityGroup.
+         */
+        interface WithNetworkSecurityGroup {
+            /**
+             * Specifies networkSecurityGroup.
+             * @param networkSecurityGroup The reference to the NetworkSecurityGroup resource
+             * @return the next update stage
+             */
+            Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify PrivateEndpointNetworkPolicies.
+         */
+        interface WithPrivateEndpointNetworkPolicies {
+            /**
+             * Specifies privateEndpointNetworkPolicies.
+             * @param privateEndpointNetworkPolicies Enable or Disable apply network policies on private end point in the subnet
+             * @return the next update stage
+             */
+            Update withPrivateEndpointNetworkPolicies(String privateEndpointNetworkPolicies);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify PrivateLinkServiceNetworkPolicies.
+         */
+        interface WithPrivateLinkServiceNetworkPolicies {
+            /**
+             * Specifies privateLinkServiceNetworkPolicies.
+             * @param privateLinkServiceNetworkPolicies Enable or Disable apply network policies on private link service in the subnet
+             * @return the next update stage
+             */
+            Update withPrivateLinkServiceNetworkPolicies(String privateLinkServiceNetworkPolicies);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify RouteTable.
+         */
+        interface WithRouteTable {
+            /**
+             * Specifies routeTable.
+             * @param routeTable The reference to the RouteTable resource
+             * @return the next update stage
+             */
+            Update withRouteTable(RouteTableInner routeTable);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify ServiceEndpointPolicies.
+         */
+        interface WithServiceEndpointPolicies {
+            /**
+             * Specifies serviceEndpointPolicies.
+             * @param serviceEndpointPolicies An array of service endpoint policies
+             * @return the next update stage
+             */
+            Update withServiceEndpointPolicies(List<ServiceEndpointPolicyInner> serviceEndpointPolicies);
+        }
+
+        /**
+         * The stage of the subnet update allowing to specify ServiceEndpoints.
+         */
+        interface WithServiceEndpoints {
+            /**
+             * Specifies serviceEndpoints.
+             * @param serviceEndpoints An array of service endpoints
+             * @return the next update stage
+             */
+            Update withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SubnetAssociation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SubnetAssociation.java
new file mode 100644
index 000000000000..51c7e127bfff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/SubnetAssociation.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.network.v2020_04_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SecurityRuleInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Subnet and it's custom security rules.
+ */
+public class SubnetAssociation {
+    /**
+     * Subnet ID.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Collection of custom security rules.
+     */
+    @JsonProperty(value = "securityRules")
+    private List<SecurityRuleInner> securityRules;
+
+    /**
+     * Get subnet ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get collection of custom security rules.
+     *
+     * @return the securityRules value
+     */
+    public List<SecurityRuleInner> securityRules() {
+        return this.securityRules;
+    }
+
+    /**
+     * Set collection of custom security rules.
+     *
+     * @param securityRules the securityRules value to set
+     * @return the SubnetAssociation object itself.
+     */
+    public SubnetAssociation withSecurityRules(List<SecurityRuleInner> securityRules) {
+        this.securityRules = securityRules;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnets.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnets.java
new file mode 100644
index 000000000000..6dac75917ac2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnets.java
@@ -0,0 +1,76 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Subnets.
+ */
+public interface Subnets extends SupportsCreating<Subnet.DefinitionStages.Blank>, HasInner<SubnetsInner> {
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable prepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters);
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName);
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Subnet> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName);
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Subnet> listAsync(final String resourceGroupName, final String virtualNetworkName);
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TagsObject.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TagsObject.java
new file mode 100644
index 000000000000..934dfc8851ec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TagsObject.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.network.v2020_04_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Tags object for patch operations.
+ */
+public class TagsObject {
+    /**
+     * Resource tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * 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 TagsObject object itself.
+     */
+    public TagsObject withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Topology.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Topology.java
new file mode 100644
index 000000000000..7fd4b23723ff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Topology.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.TopologyInner;
+import org.joda.time.DateTime;
+import java.util.List;
+
+/**
+ * Type representing Topology.
+ */
+public interface Topology extends HasInner<TopologyInner>, HasManager<NetworkManager> {
+    /**
+     * @return the createdDateTime value.
+     */
+    DateTime createdDateTime();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the lastModified value.
+     */
+    DateTime lastModified();
+
+    /**
+     * @return the resources value.
+     */
+    List<TopologyResource> resources();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyAssociation.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyAssociation.java
new file mode 100644
index 000000000000..71d502290866
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyAssociation.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Resources that have an association with the parent resource.
+ */
+public class TopologyAssociation {
+    /**
+     * The name of the resource that is associated with the parent resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The ID of the resource that is associated with the parent resource.
+     */
+    @JsonProperty(value = "resourceId")
+    private String resourceId;
+
+    /**
+     * The association type of the child resource to the parent resource.
+     * Possible values include: 'Associated', 'Contains'.
+     */
+    @JsonProperty(value = "associationType")
+    private AssociationType associationType;
+
+    /**
+     * Get the name of the resource that is associated with the parent resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is associated with the parent resource.
+     *
+     * @param name the name value to set
+     * @return the TopologyAssociation object itself.
+     */
+    public TopologyAssociation withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the ID of the resource that is associated with the parent resource.
+     *
+     * @return the resourceId value
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the ID of the resource that is associated with the parent resource.
+     *
+     * @param resourceId the resourceId value to set
+     * @return the TopologyAssociation object itself.
+     */
+    public TopologyAssociation withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get the association type of the child resource to the parent resource. Possible values include: 'Associated', 'Contains'.
+     *
+     * @return the associationType value
+     */
+    public AssociationType associationType() {
+        return this.associationType;
+    }
+
+    /**
+     * Set the association type of the child resource to the parent resource. Possible values include: 'Associated', 'Contains'.
+     *
+     * @param associationType the associationType value to set
+     * @return the TopologyAssociation object itself.
+     */
+    public TopologyAssociation withAssociationType(AssociationType associationType) {
+        this.associationType = associationType;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyParameters.java
new file mode 100644
index 000000000000..f269689751ea
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyParameters.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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the representation of topology.
+ */
+public class TopologyParameters {
+    /**
+     * The name of the target resource group to perform topology on.
+     */
+    @JsonProperty(value = "targetResourceGroupName")
+    private String targetResourceGroupName;
+
+    /**
+     * The reference to the Virtual Network resource.
+     */
+    @JsonProperty(value = "targetVirtualNetwork")
+    private SubResource targetVirtualNetwork;
+
+    /**
+     * The reference to the Subnet resource.
+     */
+    @JsonProperty(value = "targetSubnet")
+    private SubResource targetSubnet;
+
+    /**
+     * Get the name of the target resource group to perform topology on.
+     *
+     * @return the targetResourceGroupName value
+     */
+    public String targetResourceGroupName() {
+        return this.targetResourceGroupName;
+    }
+
+    /**
+     * Set the name of the target resource group to perform topology on.
+     *
+     * @param targetResourceGroupName the targetResourceGroupName value to set
+     * @return the TopologyParameters object itself.
+     */
+    public TopologyParameters withTargetResourceGroupName(String targetResourceGroupName) {
+        this.targetResourceGroupName = targetResourceGroupName;
+        return this;
+    }
+
+    /**
+     * Get the reference to the Virtual Network resource.
+     *
+     * @return the targetVirtualNetwork value
+     */
+    public SubResource targetVirtualNetwork() {
+        return this.targetVirtualNetwork;
+    }
+
+    /**
+     * Set the reference to the Virtual Network resource.
+     *
+     * @param targetVirtualNetwork the targetVirtualNetwork value to set
+     * @return the TopologyParameters object itself.
+     */
+    public TopologyParameters withTargetVirtualNetwork(SubResource targetVirtualNetwork) {
+        this.targetVirtualNetwork = targetVirtualNetwork;
+        return this;
+    }
+
+    /**
+     * Get the reference to the Subnet resource.
+     *
+     * @return the targetSubnet value
+     */
+    public SubResource targetSubnet() {
+        return this.targetSubnet;
+    }
+
+    /**
+     * Set the reference to the Subnet resource.
+     *
+     * @param targetSubnet the targetSubnet value to set
+     * @return the TopologyParameters object itself.
+     */
+    public TopologyParameters withTargetSubnet(SubResource targetSubnet) {
+        this.targetSubnet = targetSubnet;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyResource.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyResource.java
new file mode 100644
index 000000000000..4771b7ee7ef0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TopologyResource.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The network resource topology information for the given resource group.
+ */
+public class TopologyResource {
+    /**
+     * Name of the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * ID of the resource.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Holds the associations the resource has with other resources in the
+     * resource group.
+     */
+    @JsonProperty(value = "associations")
+    private List<TopologyAssociation> associations;
+
+    /**
+     * Get name of the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource.
+     *
+     * @param name the name value to set
+     * @return the TopologyResource object itself.
+     */
+    public TopologyResource withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get iD of the resource.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set iD of the resource.
+     *
+     * @param id the id value to set
+     * @return the TopologyResource object itself.
+     */
+    public TopologyResource withId(String id) {
+        this.id = id;
+        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 TopologyResource object itself.
+     */
+    public TopologyResource withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get holds the associations the resource has with other resources in the resource group.
+     *
+     * @return the associations value
+     */
+    public List<TopologyAssociation> associations() {
+        return this.associations;
+    }
+
+    /**
+     * Set holds the associations the resource has with other resources in the resource group.
+     *
+     * @param associations the associations value to set
+     * @return the TopologyResource object itself.
+     */
+    public TopologyResource withAssociations(List<TopologyAssociation> associations) {
+        this.associations = associations;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsConfigurationProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsConfigurationProperties.java
new file mode 100644
index 000000000000..b201b0f196ab
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsConfigurationProperties.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the configuration of traffic analytics.
+ */
+public class TrafficAnalyticsConfigurationProperties {
+    /**
+     * Flag to enable/disable traffic analytics.
+     */
+    @JsonProperty(value = "enabled")
+    private Boolean enabled;
+
+    /**
+     * The resource guid of the attached workspace.
+     */
+    @JsonProperty(value = "workspaceId")
+    private String workspaceId;
+
+    /**
+     * The location of the attached workspace.
+     */
+    @JsonProperty(value = "workspaceRegion")
+    private String workspaceRegion;
+
+    /**
+     * Resource Id of the attached workspace.
+     */
+    @JsonProperty(value = "workspaceResourceId")
+    private String workspaceResourceId;
+
+    /**
+     * The interval in minutes which would decide how frequently TA service
+     * should do flow analytics.
+     */
+    @JsonProperty(value = "trafficAnalyticsInterval")
+    private Integer trafficAnalyticsInterval;
+
+    /**
+     * Get flag to enable/disable traffic analytics.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set flag to enable/disable traffic analytics.
+     *
+     * @param enabled the enabled value to set
+     * @return the TrafficAnalyticsConfigurationProperties object itself.
+     */
+    public TrafficAnalyticsConfigurationProperties withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the resource guid of the attached workspace.
+     *
+     * @return the workspaceId value
+     */
+    public String workspaceId() {
+        return this.workspaceId;
+    }
+
+    /**
+     * Set the resource guid of the attached workspace.
+     *
+     * @param workspaceId the workspaceId value to set
+     * @return the TrafficAnalyticsConfigurationProperties object itself.
+     */
+    public TrafficAnalyticsConfigurationProperties withWorkspaceId(String workspaceId) {
+        this.workspaceId = workspaceId;
+        return this;
+    }
+
+    /**
+     * Get the location of the attached workspace.
+     *
+     * @return the workspaceRegion value
+     */
+    public String workspaceRegion() {
+        return this.workspaceRegion;
+    }
+
+    /**
+     * Set the location of the attached workspace.
+     *
+     * @param workspaceRegion the workspaceRegion value to set
+     * @return the TrafficAnalyticsConfigurationProperties object itself.
+     */
+    public TrafficAnalyticsConfigurationProperties withWorkspaceRegion(String workspaceRegion) {
+        this.workspaceRegion = workspaceRegion;
+        return this;
+    }
+
+    /**
+     * Get resource Id of the attached workspace.
+     *
+     * @return the workspaceResourceId value
+     */
+    public String workspaceResourceId() {
+        return this.workspaceResourceId;
+    }
+
+    /**
+     * Set resource Id of the attached workspace.
+     *
+     * @param workspaceResourceId the workspaceResourceId value to set
+     * @return the TrafficAnalyticsConfigurationProperties object itself.
+     */
+    public TrafficAnalyticsConfigurationProperties withWorkspaceResourceId(String workspaceResourceId) {
+        this.workspaceResourceId = workspaceResourceId;
+        return this;
+    }
+
+    /**
+     * Get the interval in minutes which would decide how frequently TA service should do flow analytics.
+     *
+     * @return the trafficAnalyticsInterval value
+     */
+    public Integer trafficAnalyticsInterval() {
+        return this.trafficAnalyticsInterval;
+    }
+
+    /**
+     * Set the interval in minutes which would decide how frequently TA service should do flow analytics.
+     *
+     * @param trafficAnalyticsInterval the trafficAnalyticsInterval value to set
+     * @return the TrafficAnalyticsConfigurationProperties object itself.
+     */
+    public TrafficAnalyticsConfigurationProperties withTrafficAnalyticsInterval(Integer trafficAnalyticsInterval) {
+        this.trafficAnalyticsInterval = trafficAnalyticsInterval;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsProperties.java
new file mode 100644
index 000000000000..8b0a1556f203
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficAnalyticsProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the configuration of traffic analytics.
+ */
+public class TrafficAnalyticsProperties {
+    /**
+     * Parameters that define the configuration of traffic analytics.
+     */
+    @JsonProperty(value = "networkWatcherFlowAnalyticsConfiguration")
+    private TrafficAnalyticsConfigurationProperties networkWatcherFlowAnalyticsConfiguration;
+
+    /**
+     * Get parameters that define the configuration of traffic analytics.
+     *
+     * @return the networkWatcherFlowAnalyticsConfiguration value
+     */
+    public TrafficAnalyticsConfigurationProperties networkWatcherFlowAnalyticsConfiguration() {
+        return this.networkWatcherFlowAnalyticsConfiguration;
+    }
+
+    /**
+     * Set parameters that define the configuration of traffic analytics.
+     *
+     * @param networkWatcherFlowAnalyticsConfiguration the networkWatcherFlowAnalyticsConfiguration value to set
+     * @return the TrafficAnalyticsProperties object itself.
+     */
+    public TrafficAnalyticsProperties withNetworkWatcherFlowAnalyticsConfiguration(TrafficAnalyticsConfigurationProperties networkWatcherFlowAnalyticsConfiguration) {
+        this.networkWatcherFlowAnalyticsConfiguration = networkWatcherFlowAnalyticsConfiguration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficSelectorPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficSelectorPolicy.java
new file mode 100644
index 000000000000..6900981211c2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TrafficSelectorPolicy.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * An traffic selector policy for a virtual network gateway connection.
+ */
+public class TrafficSelectorPolicy {
+    /**
+     * A collection of local address spaces in CIDR format.
+     */
+    @JsonProperty(value = "localAddressRanges", required = true)
+    private List<String> localAddressRanges;
+
+    /**
+     * A collection of remote address spaces in CIDR format.
+     */
+    @JsonProperty(value = "remoteAddressRanges", required = true)
+    private List<String> remoteAddressRanges;
+
+    /**
+     * Get a collection of local address spaces in CIDR format.
+     *
+     * @return the localAddressRanges value
+     */
+    public List<String> localAddressRanges() {
+        return this.localAddressRanges;
+    }
+
+    /**
+     * Set a collection of local address spaces in CIDR format.
+     *
+     * @param localAddressRanges the localAddressRanges value to set
+     * @return the TrafficSelectorPolicy object itself.
+     */
+    public TrafficSelectorPolicy withLocalAddressRanges(List<String> localAddressRanges) {
+        this.localAddressRanges = localAddressRanges;
+        return this;
+    }
+
+    /**
+     * Get a collection of remote address spaces in CIDR format.
+     *
+     * @return the remoteAddressRanges value
+     */
+    public List<String> remoteAddressRanges() {
+        return this.remoteAddressRanges;
+    }
+
+    /**
+     * Set a collection of remote address spaces in CIDR format.
+     *
+     * @param remoteAddressRanges the remoteAddressRanges value to set
+     * @return the TrafficSelectorPolicy object itself.
+     */
+    public TrafficSelectorPolicy withRemoteAddressRanges(List<String> remoteAddressRanges) {
+        this.remoteAddressRanges = remoteAddressRanges;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TransportProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TransportProtocol.java
new file mode 100644
index 000000000000..bffad04a3d6b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TransportProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for TransportProtocol.
+ */
+public final class TransportProtocol extends ExpandableStringEnum<TransportProtocol> {
+    /** Static value Udp for TransportProtocol. */
+    public static final TransportProtocol UDP = fromString("Udp");
+
+    /** Static value Tcp for TransportProtocol. */
+    public static final TransportProtocol TCP = fromString("Tcp");
+
+    /** Static value All for TransportProtocol. */
+    public static final TransportProtocol ALL = fromString("All");
+
+    /**
+     * Creates or finds a TransportProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding TransportProtocol
+     */
+    @JsonCreator
+    public static TransportProtocol fromString(String name) {
+        return fromString(name, TransportProtocol.class);
+    }
+
+    /**
+     * @return known TransportProtocol values
+     */
+    public static Collection<TransportProtocol> values() {
+        return values(TransportProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingDetails.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingDetails.java
new file mode 100644
index 000000000000..04fb37d22797
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingDetails.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information gained from troubleshooting of specified resource.
+ */
+public class TroubleshootingDetails {
+    /**
+     * The id of the get troubleshoot operation.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Reason type of failure.
+     */
+    @JsonProperty(value = "reasonType")
+    private String reasonType;
+
+    /**
+     * A summary of troubleshooting.
+     */
+    @JsonProperty(value = "summary")
+    private String summary;
+
+    /**
+     * Details on troubleshooting results.
+     */
+    @JsonProperty(value = "detail")
+    private String detail;
+
+    /**
+     * List of recommended actions.
+     */
+    @JsonProperty(value = "recommendedActions")
+    private List<TroubleshootingRecommendedActions> recommendedActions;
+
+    /**
+     * Get the id of the get troubleshoot operation.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the id of the get troubleshoot operation.
+     *
+     * @param id the id value to set
+     * @return the TroubleshootingDetails object itself.
+     */
+    public TroubleshootingDetails withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get reason type of failure.
+     *
+     * @return the reasonType value
+     */
+    public String reasonType() {
+        return this.reasonType;
+    }
+
+    /**
+     * Set reason type of failure.
+     *
+     * @param reasonType the reasonType value to set
+     * @return the TroubleshootingDetails object itself.
+     */
+    public TroubleshootingDetails withReasonType(String reasonType) {
+        this.reasonType = reasonType;
+        return this;
+    }
+
+    /**
+     * Get a summary of troubleshooting.
+     *
+     * @return the summary value
+     */
+    public String summary() {
+        return this.summary;
+    }
+
+    /**
+     * Set a summary of troubleshooting.
+     *
+     * @param summary the summary value to set
+     * @return the TroubleshootingDetails object itself.
+     */
+    public TroubleshootingDetails withSummary(String summary) {
+        this.summary = summary;
+        return this;
+    }
+
+    /**
+     * Get details on troubleshooting results.
+     *
+     * @return the detail value
+     */
+    public String detail() {
+        return this.detail;
+    }
+
+    /**
+     * Set details on troubleshooting results.
+     *
+     * @param detail the detail value to set
+     * @return the TroubleshootingDetails object itself.
+     */
+    public TroubleshootingDetails withDetail(String detail) {
+        this.detail = detail;
+        return this;
+    }
+
+    /**
+     * Get list of recommended actions.
+     *
+     * @return the recommendedActions value
+     */
+    public List<TroubleshootingRecommendedActions> recommendedActions() {
+        return this.recommendedActions;
+    }
+
+    /**
+     * Set list of recommended actions.
+     *
+     * @param recommendedActions the recommendedActions value to set
+     * @return the TroubleshootingDetails object itself.
+     */
+    public TroubleshootingDetails withRecommendedActions(List<TroubleshootingRecommendedActions> recommendedActions) {
+        this.recommendedActions = recommendedActions;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingParameters.java
new file mode 100644
index 000000000000..dd7dcb4e06ce
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters that define the resource to troubleshoot.
+ */
+@JsonFlatten
+public class TroubleshootingParameters {
+    /**
+     * The target resource to troubleshoot.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * The ID for the storage account to save the troubleshoot result.
+     */
+    @JsonProperty(value = "properties.storageId", required = true)
+    private String storageId;
+
+    /**
+     * The path to the blob to save the troubleshoot result in.
+     */
+    @JsonProperty(value = "properties.storagePath", required = true)
+    private String storagePath;
+
+    /**
+     * Get the target resource to troubleshoot.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the target resource to troubleshoot.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the TroubleshootingParameters object itself.
+     */
+    public TroubleshootingParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get the ID for the storage account to save the troubleshoot result.
+     *
+     * @return the storageId value
+     */
+    public String storageId() {
+        return this.storageId;
+    }
+
+    /**
+     * Set the ID for the storage account to save the troubleshoot result.
+     *
+     * @param storageId the storageId value to set
+     * @return the TroubleshootingParameters object itself.
+     */
+    public TroubleshootingParameters withStorageId(String storageId) {
+        this.storageId = storageId;
+        return this;
+    }
+
+    /**
+     * Get the path to the blob to save the troubleshoot result in.
+     *
+     * @return the storagePath value
+     */
+    public String storagePath() {
+        return this.storagePath;
+    }
+
+    /**
+     * Set the path to the blob to save the troubleshoot result in.
+     *
+     * @param storagePath the storagePath value to set
+     * @return the TroubleshootingParameters object itself.
+     */
+    public TroubleshootingParameters withStoragePath(String storagePath) {
+        this.storagePath = storagePath;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingRecommendedActions.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingRecommendedActions.java
new file mode 100644
index 000000000000..7390687f463b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingRecommendedActions.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Recommended actions based on discovered issues.
+ */
+public class TroubleshootingRecommendedActions {
+    /**
+     * ID of the recommended action.
+     */
+    @JsonProperty(value = "actionId")
+    private String actionId;
+
+    /**
+     * Description of recommended actions.
+     */
+    @JsonProperty(value = "actionText")
+    private String actionText;
+
+    /**
+     * The uri linking to a documentation for the recommended troubleshooting
+     * actions.
+     */
+    @JsonProperty(value = "actionUri")
+    private String actionUri;
+
+    /**
+     * The information from the URI for the recommended troubleshooting
+     * actions.
+     */
+    @JsonProperty(value = "actionUriText")
+    private String actionUriText;
+
+    /**
+     * Get iD of the recommended action.
+     *
+     * @return the actionId value
+     */
+    public String actionId() {
+        return this.actionId;
+    }
+
+    /**
+     * Set iD of the recommended action.
+     *
+     * @param actionId the actionId value to set
+     * @return the TroubleshootingRecommendedActions object itself.
+     */
+    public TroubleshootingRecommendedActions withActionId(String actionId) {
+        this.actionId = actionId;
+        return this;
+    }
+
+    /**
+     * Get description of recommended actions.
+     *
+     * @return the actionText value
+     */
+    public String actionText() {
+        return this.actionText;
+    }
+
+    /**
+     * Set description of recommended actions.
+     *
+     * @param actionText the actionText value to set
+     * @return the TroubleshootingRecommendedActions object itself.
+     */
+    public TroubleshootingRecommendedActions withActionText(String actionText) {
+        this.actionText = actionText;
+        return this;
+    }
+
+    /**
+     * Get the uri linking to a documentation for the recommended troubleshooting actions.
+     *
+     * @return the actionUri value
+     */
+    public String actionUri() {
+        return this.actionUri;
+    }
+
+    /**
+     * Set the uri linking to a documentation for the recommended troubleshooting actions.
+     *
+     * @param actionUri the actionUri value to set
+     * @return the TroubleshootingRecommendedActions object itself.
+     */
+    public TroubleshootingRecommendedActions withActionUri(String actionUri) {
+        this.actionUri = actionUri;
+        return this;
+    }
+
+    /**
+     * Get the information from the URI for the recommended troubleshooting actions.
+     *
+     * @return the actionUriText value
+     */
+    public String actionUriText() {
+        return this.actionUriText;
+    }
+
+    /**
+     * Set the information from the URI for the recommended troubleshooting actions.
+     *
+     * @param actionUriText the actionUriText value to set
+     * @return the TroubleshootingRecommendedActions object itself.
+     */
+    public TroubleshootingRecommendedActions withActionUriText(String actionUriText) {
+        this.actionUriText = actionUriText;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingResult.java
new file mode 100644
index 000000000000..8809e598e3f0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TroubleshootingResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.TroubleshootingResultInner;
+import org.joda.time.DateTime;
+import java.util.List;
+
+/**
+ * Type representing TroubleshootingResult.
+ */
+public interface TroubleshootingResult extends HasInner<TroubleshootingResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the code value.
+     */
+    String code();
+
+    /**
+     * @return the endTime value.
+     */
+    DateTime endTime();
+
+    /**
+     * @return the results value.
+     */
+    List<TroubleshootingDetails> results();
+
+    /**
+     * @return the startTime value.
+     */
+    DateTime startTime();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionHealth.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionHealth.java
new file mode 100644
index 000000000000..91d1625c39fe
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionHealth.java
@@ -0,0 +1,93 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VirtualNetworkGatewayConnection properties.
+ */
+public class TunnelConnectionHealth {
+    /**
+     * Tunnel name.
+     */
+    @JsonProperty(value = "tunnel", access = JsonProperty.Access.WRITE_ONLY)
+    private String tunnel;
+
+    /**
+     * Virtual Network Gateway connection status. Possible values include:
+     * 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     */
+    @JsonProperty(value = "connectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private VirtualNetworkGatewayConnectionStatus connectionStatus;
+
+    /**
+     * The Ingress Bytes Transferred in this connection.
+     */
+    @JsonProperty(value = "ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * The Egress Bytes Transferred in this connection.
+     */
+    @JsonProperty(value = "egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * The time at which connection was established in Utc format.
+     */
+    @JsonProperty(value = "lastConnectionEstablishedUtcTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastConnectionEstablishedUtcTime;
+
+    /**
+     * Get tunnel name.
+     *
+     * @return the tunnel value
+     */
+    public String tunnel() {
+        return this.tunnel;
+    }
+
+    /**
+     * Get virtual Network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public VirtualNetworkGatewayConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Get the Ingress Bytes Transferred in this connection.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get the Egress Bytes Transferred in this connection.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get the time at which connection was established in Utc format.
+     *
+     * @return the lastConnectionEstablishedUtcTime value
+     */
+    public String lastConnectionEstablishedUtcTime() {
+        return this.lastConnectionEstablishedUtcTime;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionStatus.java
new file mode 100644
index 000000000000..a5a200f57963
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/TunnelConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for TunnelConnectionStatus.
+ */
+public final class TunnelConnectionStatus extends ExpandableStringEnum<TunnelConnectionStatus> {
+    /** Static value Unknown for TunnelConnectionStatus. */
+    public static final TunnelConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Connecting for TunnelConnectionStatus. */
+    public static final TunnelConnectionStatus CONNECTING = fromString("Connecting");
+
+    /** Static value Connected for TunnelConnectionStatus. */
+    public static final TunnelConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value NotConnected for TunnelConnectionStatus. */
+    public static final TunnelConnectionStatus NOT_CONNECTED = fromString("NotConnected");
+
+    /**
+     * Creates or finds a TunnelConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding TunnelConnectionStatus
+     */
+    @JsonCreator
+    public static TunnelConnectionStatus fromString(String name) {
+        return fromString(name, TunnelConnectionStatus.class);
+    }
+
+    /**
+     * @return known TunnelConnectionStatus values
+     */
+    public static Collection<TunnelConnectionStatus> values() {
+        return values(TunnelConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UnprepareNetworkPoliciesRequest.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UnprepareNetworkPoliciesRequest.java
new file mode 100644
index 000000000000..ac70c12e516f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UnprepareNetworkPoliciesRequest.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Details of UnprepareNetworkPolicies for Subnet.
+ */
+public class UnprepareNetworkPoliciesRequest {
+    /**
+     * The name of the service for which subnet is being unprepared for.
+     */
+    @JsonProperty(value = "serviceName")
+    private String serviceName;
+
+    /**
+     * Get the name of the service for which subnet is being unprepared for.
+     *
+     * @return the serviceName value
+     */
+    public String serviceName() {
+        return this.serviceName;
+    }
+
+    /**
+     * Set the name of the service for which subnet is being unprepared for.
+     *
+     * @param serviceName the serviceName value to set
+     * @return the UnprepareNetworkPoliciesRequest object itself.
+     */
+    public UnprepareNetworkPoliciesRequest withServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usage.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usage.java
new file mode 100644
index 000000000000..99aba36543c7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usage.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.UsageInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing Usage.
+ */
+public interface Usage extends HasInner<UsageInner>, HasManager<NetworkManager> {
+    /**
+     * @return the currentValue value.
+     */
+    long currentValue();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the limit value.
+     */
+    long limit();
+
+    /**
+     * @return the name value.
+     */
+    UsageName name();
+
+    /**
+     * @return the unit value.
+     */
+    String unit();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UsageName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UsageName.java
new file mode 100644
index 000000000000..eb70db11fc66
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/UsageName.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The usage names.
+ */
+public class UsageName {
+    /**
+     * A string describing the resource name.
+     */
+    @JsonProperty(value = "value")
+    private String value;
+
+    /**
+     * A localized string describing the resource name.
+     */
+    @JsonProperty(value = "localizedValue")
+    private String localizedValue;
+
+    /**
+     * Get a string describing the resource name.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set a string describing the resource name.
+     *
+     * @param value the value value to set
+     * @return the UsageName object itself.
+     */
+    public UsageName withValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get a localized string describing the resource name.
+     *
+     * @return the localizedValue value
+     */
+    public String localizedValue() {
+        return this.localizedValue;
+    }
+
+    /**
+     * Set a localized string describing the resource name.
+     *
+     * @param localizedValue the localizedValue value to set
+     * @return the UsageName object itself.
+     */
+    public UsageName withLocalizedValue(String localizedValue) {
+        this.localizedValue = localizedValue;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usages.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usages.java
new file mode 100644
index 000000000000..84d9c2feac8a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Usages.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.UsagesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Usages.
+ */
+public interface Usages extends HasInner<UsagesInner> {
+    /**
+     * List network usages for a subscription.
+     *
+     * @param location The location where resource usage is queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Usage> listAsync(final String location);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VM.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VM.java
new file mode 100644
index 000000000000..322df22b16b1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VM.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Describes a Virtual Machine.
+ */
+@SkipParentValidation
+public class VM extends Resource {
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VM object itself.
+     */
+    public VM withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerbosityLevel.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerbosityLevel.java
new file mode 100644
index 000000000000..89d041fe2941
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerbosityLevel.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VerbosityLevel.
+ */
+public final class VerbosityLevel extends ExpandableStringEnum<VerbosityLevel> {
+    /** Static value Normal for VerbosityLevel. */
+    public static final VerbosityLevel NORMAL = fromString("Normal");
+
+    /** Static value Minimum for VerbosityLevel. */
+    public static final VerbosityLevel MINIMUM = fromString("Minimum");
+
+    /** Static value Full for VerbosityLevel. */
+    public static final VerbosityLevel FULL = fromString("Full");
+
+    /**
+     * Creates or finds a VerbosityLevel from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VerbosityLevel
+     */
+    @JsonCreator
+    public static VerbosityLevel fromString(String name) {
+        return fromString(name, VerbosityLevel.class);
+    }
+
+    /**
+     * @return known VerbosityLevel values
+     */
+    public static Collection<VerbosityLevel> values() {
+        return values(VerbosityLevel.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowParameters.java
new file mode 100644
index 000000000000..7e95b15180fb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowParameters.java
@@ -0,0 +1,231 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters that define the IP flow to be verified.
+ */
+public class VerificationIPFlowParameters {
+    /**
+     * The ID of the target resource to perform next-hop on.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * The direction of the packet represented as a 5-tuple. Possible values
+     * include: 'Inbound', 'Outbound'.
+     */
+    @JsonProperty(value = "direction", required = true)
+    private Direction direction;
+
+    /**
+     * Protocol to be verified on. Possible values include: 'TCP', 'UDP'.
+     */
+    @JsonProperty(value = "protocol", required = true)
+    private IpFlowProtocol protocol;
+
+    /**
+     * The local port. Acceptable values are a single integer in the range
+     * (0-65535). Support for * for the source port, which depends on the
+     * direction.
+     */
+    @JsonProperty(value = "localPort", required = true)
+    private String localPort;
+
+    /**
+     * The remote port. Acceptable values are a single integer in the range
+     * (0-65535). Support for * for the source port, which depends on the
+     * direction.
+     */
+    @JsonProperty(value = "remotePort", required = true)
+    private String remotePort;
+
+    /**
+     * The local IP address. Acceptable values are valid IPv4 addresses.
+     */
+    @JsonProperty(value = "localIPAddress", required = true)
+    private String localIPAddress;
+
+    /**
+     * The remote IP address. Acceptable values are valid IPv4 addresses.
+     */
+    @JsonProperty(value = "remoteIPAddress", required = true)
+    private String remoteIPAddress;
+
+    /**
+     * The NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any
+     * of them, then this parameter must be specified. Otherwise optional).
+     */
+    @JsonProperty(value = "targetNicResourceId")
+    private String targetNicResourceId;
+
+    /**
+     * Get the ID of the target resource to perform next-hop on.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the ID of the target resource to perform next-hop on.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get the direction of the packet represented as a 5-tuple. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @return the direction value
+     */
+    public Direction direction() {
+        return this.direction;
+    }
+
+    /**
+     * Set the direction of the packet represented as a 5-tuple. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @param direction the direction value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withDirection(Direction direction) {
+        this.direction = direction;
+        return this;
+    }
+
+    /**
+     * Get protocol to be verified on. Possible values include: 'TCP', 'UDP'.
+     *
+     * @return the protocol value
+     */
+    public IpFlowProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set protocol to be verified on. Possible values include: 'TCP', 'UDP'.
+     *
+     * @param protocol the protocol value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withProtocol(IpFlowProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the local port. Acceptable values are a single integer in the range (0-65535). Support for * for the source port, which depends on the direction.
+     *
+     * @return the localPort value
+     */
+    public String localPort() {
+        return this.localPort;
+    }
+
+    /**
+     * Set the local port. Acceptable values are a single integer in the range (0-65535). Support for * for the source port, which depends on the direction.
+     *
+     * @param localPort the localPort value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withLocalPort(String localPort) {
+        this.localPort = localPort;
+        return this;
+    }
+
+    /**
+     * Get the remote port. Acceptable values are a single integer in the range (0-65535). Support for * for the source port, which depends on the direction.
+     *
+     * @return the remotePort value
+     */
+    public String remotePort() {
+        return this.remotePort;
+    }
+
+    /**
+     * Set the remote port. Acceptable values are a single integer in the range (0-65535). Support for * for the source port, which depends on the direction.
+     *
+     * @param remotePort the remotePort value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withRemotePort(String remotePort) {
+        this.remotePort = remotePort;
+        return this;
+    }
+
+    /**
+     * Get the local IP address. Acceptable values are valid IPv4 addresses.
+     *
+     * @return the localIPAddress value
+     */
+    public String localIPAddress() {
+        return this.localIPAddress;
+    }
+
+    /**
+     * Set the local IP address. Acceptable values are valid IPv4 addresses.
+     *
+     * @param localIPAddress the localIPAddress value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withLocalIPAddress(String localIPAddress) {
+        this.localIPAddress = localIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the remote IP address. Acceptable values are valid IPv4 addresses.
+     *
+     * @return the remoteIPAddress value
+     */
+    public String remoteIPAddress() {
+        return this.remoteIPAddress;
+    }
+
+    /**
+     * Set the remote IP address. Acceptable values are valid IPv4 addresses.
+     *
+     * @param remoteIPAddress the remoteIPAddress value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withRemoteIPAddress(String remoteIPAddress) {
+        this.remoteIPAddress = remoteIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any of them, then this parameter must be specified. Otherwise optional).
+     *
+     * @return the targetNicResourceId value
+     */
+    public String targetNicResourceId() {
+        return this.targetNicResourceId;
+    }
+
+    /**
+     * Set the NIC ID. (If VM has multiple NICs and IP forwarding is enabled on any of them, then this parameter must be specified. Otherwise optional).
+     *
+     * @param targetNicResourceId the targetNicResourceId value to set
+     * @return the VerificationIPFlowParameters object itself.
+     */
+    public VerificationIPFlowParameters withTargetNicResourceId(String targetNicResourceId) {
+        this.targetNicResourceId = targetNicResourceId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowResult.java
new file mode 100644
index 000000000000..4a1a9b254544
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VerificationIPFlowResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VerificationIPFlowResultInner;
+
+/**
+ * Type representing VerificationIPFlowResult.
+ */
+public interface VerificationIPFlowResult extends HasInner<VerificationIPFlowResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the access value.
+     */
+    Access access();
+
+    /**
+     * @return the ruleName value.
+     */
+    String ruleName();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceNicProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceNicProperties.java
new file mode 100644
index 000000000000..762f2a613a26
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceNicProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network Virtual Appliance NIC properties.
+ */
+public class VirtualApplianceNicProperties {
+    /**
+     * NIC name.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Public IP address.
+     */
+    @JsonProperty(value = "publicIpAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String publicIpAddress;
+
+    /**
+     * Private IP address.
+     */
+    @JsonProperty(value = "privateIpAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String privateIpAddress;
+
+    /**
+     * Get nIC name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get public IP address.
+     *
+     * @return the publicIpAddress value
+     */
+    public String publicIpAddress() {
+        return this.publicIpAddress;
+    }
+
+    /**
+     * Get private IP address.
+     *
+     * @return the privateIpAddress value
+     */
+    public String privateIpAddress() {
+        return this.privateIpAddress;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceSkuProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceSkuProperties.java
new file mode 100644
index 000000000000..152fc3cc21da
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualApplianceSkuProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network Virtual Appliance Sku Properties.
+ */
+public class VirtualApplianceSkuProperties {
+    /**
+     * Virtual Appliance Vendor.
+     */
+    @JsonProperty(value = "vendor")
+    private String vendor;
+
+    /**
+     * Virtual Appliance Scale Unit.
+     */
+    @JsonProperty(value = "bundledScaleUnit")
+    private String bundledScaleUnit;
+
+    /**
+     * Virtual Appliance Version.
+     */
+    @JsonProperty(value = "marketPlaceVersion")
+    private String marketPlaceVersion;
+
+    /**
+     * Get virtual Appliance Vendor.
+     *
+     * @return the vendor value
+     */
+    public String vendor() {
+        return this.vendor;
+    }
+
+    /**
+     * Set virtual Appliance Vendor.
+     *
+     * @param vendor the vendor value to set
+     * @return the VirtualApplianceSkuProperties object itself.
+     */
+    public VirtualApplianceSkuProperties withVendor(String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+    /**
+     * Get virtual Appliance Scale Unit.
+     *
+     * @return the bundledScaleUnit value
+     */
+    public String bundledScaleUnit() {
+        return this.bundledScaleUnit;
+    }
+
+    /**
+     * Set virtual Appliance Scale Unit.
+     *
+     * @param bundledScaleUnit the bundledScaleUnit value to set
+     * @return the VirtualApplianceSkuProperties object itself.
+     */
+    public VirtualApplianceSkuProperties withBundledScaleUnit(String bundledScaleUnit) {
+        this.bundledScaleUnit = bundledScaleUnit;
+        return this;
+    }
+
+    /**
+     * Get virtual Appliance Version.
+     *
+     * @return the marketPlaceVersion value
+     */
+    public String marketPlaceVersion() {
+        return this.marketPlaceVersion;
+    }
+
+    /**
+     * Set virtual Appliance Version.
+     *
+     * @param marketPlaceVersion the marketPlaceVersion value to set
+     * @return the VirtualApplianceSkuProperties object itself.
+     */
+    public VirtualApplianceSkuProperties withMarketPlaceVersion(String marketPlaceVersion) {
+        this.marketPlaceVersion = marketPlaceVersion;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHub.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHub.java
new file mode 100644
index 000000000000..57c3eb54477a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHub.java
@@ -0,0 +1,430 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualHubRouteTableV2Inner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.HubVirtualNetworkConnectionInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualHubInner;
+
+/**
+ * Type representing VirtualHub.
+ */
+public interface VirtualHub extends HasInner<VirtualHubInner>, Resource, GroupableResourceCore<NetworkManager, VirtualHubInner>, HasResourceGroup, Refreshable<VirtualHub>, Updatable<VirtualHub.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressPrefix value.
+     */
+    String addressPrefix();
+
+    /**
+     * @return the azureFirewall value.
+     */
+    SubResource azureFirewall();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteGateway value.
+     */
+    SubResource expressRouteGateway();
+
+    /**
+     * @return the p2SVpnGateway value.
+     */
+    SubResource p2SVpnGateway();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routeTable value.
+     */
+    VirtualHubRouteTable routeTable();
+
+    /**
+     * @return the securityPartnerProvider value.
+     */
+    SubResource securityPartnerProvider();
+
+    /**
+     * @return the securityProviderName value.
+     */
+    String securityProviderName();
+
+    /**
+     * @return the sku value.
+     */
+    String sku();
+
+    /**
+     * @return the virtualHubRouteTableV2s value.
+     */
+    List<VirtualHubRouteTableV2> virtualHubRouteTableV2s();
+
+    /**
+     * @return the virtualNetworkConnections value.
+     */
+    List<HubVirtualNetworkConnection> virtualNetworkConnections();
+
+    /**
+     * @return the virtualWan value.
+     */
+    SubResource virtualWan();
+
+    /**
+     * @return the vpnGateway value.
+     */
+    SubResource vpnGateway();
+
+    /**
+     * The entirety of the VirtualHub definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualHub definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualHub definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualHub definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix Address-prefix for this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify AzureFirewall.
+         */
+        interface WithAzureFirewall {
+            /**
+             * Specifies azureFirewall.
+             * @param azureFirewall The azureFirewall associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withAzureFirewall(SubResource azureFirewall);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify ExpressRouteGateway.
+         */
+        interface WithExpressRouteGateway {
+            /**
+             * Specifies expressRouteGateway.
+             * @param expressRouteGateway The expressRouteGateway associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withExpressRouteGateway(SubResource expressRouteGateway);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify P2SVpnGateway.
+         */
+        interface WithP2SVpnGateway {
+            /**
+             * Specifies p2SVpnGateway.
+             * @param p2SVpnGateway The P2SVpnGateway associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withP2SVpnGateway(SubResource p2SVpnGateway);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify RouteTable.
+         */
+        interface WithRouteTable {
+            /**
+             * Specifies routeTable.
+             * @param routeTable The routeTable associated with this virtual hub
+             * @return the next definition stage
+             */
+            WithCreate withRouteTable(VirtualHubRouteTable routeTable);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify SecurityPartnerProvider.
+         */
+        interface WithSecurityPartnerProvider {
+            /**
+             * Specifies securityPartnerProvider.
+             * @param securityPartnerProvider The securityPartnerProvider associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withSecurityPartnerProvider(SubResource securityPartnerProvider);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify SecurityProviderName.
+         */
+        interface WithSecurityProviderName {
+            /**
+             * Specifies securityProviderName.
+             * @param securityProviderName The Security Provider name
+             * @return the next definition stage
+             */
+            WithCreate withSecurityProviderName(String securityProviderName);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The sku of this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withSku(String sku);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify VirtualHubRouteTableV2s.
+         */
+        interface WithVirtualHubRouteTableV2s {
+            /**
+             * Specifies virtualHubRouteTableV2s.
+             * @param virtualHubRouteTableV2s List of all virtual hub route table v2s associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHubRouteTableV2s(List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify VirtualNetworkConnections.
+         */
+        interface WithVirtualNetworkConnections {
+            /**
+             * Specifies virtualNetworkConnections.
+             * @param virtualNetworkConnections List of all vnet connections with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> virtualNetworkConnections);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify VirtualWan.
+         */
+        interface WithVirtualWan {
+            /**
+             * Specifies virtualWan.
+             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualWan(SubResource virtualWan);
+        }
+
+        /**
+         * The stage of the virtualhub definition allowing to specify VpnGateway.
+         */
+        interface WithVpnGateway {
+            /**
+             * Specifies vpnGateway.
+             * @param vpnGateway The VpnGateway associated with this VirtualHub
+             * @return the next definition stage
+             */
+            WithCreate withVpnGateway(SubResource vpnGateway);
+        }
+
+        /**
+         * 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<VirtualHub>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAddressPrefix, DefinitionStages.WithAzureFirewall, DefinitionStages.WithExpressRouteGateway, DefinitionStages.WithP2SVpnGateway, DefinitionStages.WithRouteTable, DefinitionStages.WithSecurityPartnerProvider, DefinitionStages.WithSecurityProviderName, DefinitionStages.WithSku, DefinitionStages.WithVirtualHubRouteTableV2s, DefinitionStages.WithVirtualNetworkConnections, DefinitionStages.WithVirtualWan, DefinitionStages.WithVpnGateway {
+        }
+    }
+    /**
+     * The template for a VirtualHub update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualHub>, Resource.UpdateWithTags<Update>, UpdateStages.WithAddressPrefix, UpdateStages.WithAzureFirewall, UpdateStages.WithExpressRouteGateway, UpdateStages.WithP2SVpnGateway, UpdateStages.WithRouteTable, UpdateStages.WithSecurityPartnerProvider, UpdateStages.WithSecurityProviderName, UpdateStages.WithSku, UpdateStages.WithVirtualHubRouteTableV2s, UpdateStages.WithVirtualNetworkConnections, UpdateStages.WithVirtualWan, UpdateStages.WithVpnGateway {
+    }
+
+    /**
+     * Grouping of VirtualHub update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualhub update allowing to specify AddressPrefix.
+         */
+        interface WithAddressPrefix {
+            /**
+             * Specifies addressPrefix.
+             * @param addressPrefix Address-prefix for this VirtualHub
+             * @return the next update stage
+             */
+            Update withAddressPrefix(String addressPrefix);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify AzureFirewall.
+         */
+        interface WithAzureFirewall {
+            /**
+             * Specifies azureFirewall.
+             * @param azureFirewall The azureFirewall associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withAzureFirewall(SubResource azureFirewall);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify ExpressRouteGateway.
+         */
+        interface WithExpressRouteGateway {
+            /**
+             * Specifies expressRouteGateway.
+             * @param expressRouteGateway The expressRouteGateway associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withExpressRouteGateway(SubResource expressRouteGateway);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify P2SVpnGateway.
+         */
+        interface WithP2SVpnGateway {
+            /**
+             * Specifies p2SVpnGateway.
+             * @param p2SVpnGateway The P2SVpnGateway associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withP2SVpnGateway(SubResource p2SVpnGateway);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify RouteTable.
+         */
+        interface WithRouteTable {
+            /**
+             * Specifies routeTable.
+             * @param routeTable The routeTable associated with this virtual hub
+             * @return the next update stage
+             */
+            Update withRouteTable(VirtualHubRouteTable routeTable);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify SecurityPartnerProvider.
+         */
+        interface WithSecurityPartnerProvider {
+            /**
+             * Specifies securityPartnerProvider.
+             * @param securityPartnerProvider The securityPartnerProvider associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withSecurityPartnerProvider(SubResource securityPartnerProvider);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify SecurityProviderName.
+         */
+        interface WithSecurityProviderName {
+            /**
+             * Specifies securityProviderName.
+             * @param securityProviderName The Security Provider name
+             * @return the next update stage
+             */
+            Update withSecurityProviderName(String securityProviderName);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The sku of this VirtualHub
+             * @return the next update stage
+             */
+            Update withSku(String sku);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify VirtualHubRouteTableV2s.
+         */
+        interface WithVirtualHubRouteTableV2s {
+            /**
+             * Specifies virtualHubRouteTableV2s.
+             * @param virtualHubRouteTableV2s List of all virtual hub route table v2s associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withVirtualHubRouteTableV2s(List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify VirtualNetworkConnections.
+         */
+        interface WithVirtualNetworkConnections {
+            /**
+             * Specifies virtualNetworkConnections.
+             * @param virtualNetworkConnections List of all vnet connections with this VirtualHub
+             * @return the next update stage
+             */
+            Update withVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> virtualNetworkConnections);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify VirtualWan.
+         */
+        interface WithVirtualWan {
+            /**
+             * Specifies virtualWan.
+             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
+             * @return the next update stage
+             */
+            Update withVirtualWan(SubResource virtualWan);
+        }
+
+        /**
+         * The stage of the virtualhub update allowing to specify VpnGateway.
+         */
+        interface WithVpnGateway {
+            /**
+             * Specifies vpnGateway.
+             * @param vpnGateway The VpnGateway associated with this VirtualHub
+             * @return the next update stage
+             */
+            Update withVpnGateway(SubResource vpnGateway);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubId.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubId.java
new file mode 100644
index 000000000000..8fee9281b729
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubId.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Virtual Hub identifier.
+ */
+public class VirtualHubId {
+    /**
+     * The resource URI for the Virtual Hub where the ExpressRoute gateway is
+     * or will be deployed. The Virtual Hub resource and the ExpressRoute
+     * gateway resource reside in the same subscription.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the resource URI for the Virtual Hub where the ExpressRoute gateway is or will be deployed. The Virtual Hub resource and the ExpressRoute gateway resource reside in the same subscription.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the resource URI for the Virtual Hub where the ExpressRoute gateway is or will be deployed. The Virtual Hub resource and the ExpressRoute gateway resource reside in the same subscription.
+     *
+     * @param id the id value to set
+     * @return the VirtualHubId object itself.
+     */
+    public VirtualHubId withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRoute.java
new file mode 100644
index 000000000000..5ed5392ad23f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRoute.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VirtualHub route.
+ */
+public class VirtualHubRoute {
+    /**
+     * List of all addressPrefixes.
+     */
+    @JsonProperty(value = "addressPrefixes")
+    private List<String> addressPrefixes;
+
+    /**
+     * NextHop ip address.
+     */
+    @JsonProperty(value = "nextHopIpAddress")
+    private String nextHopIpAddress;
+
+    /**
+     * Get list of all addressPrefixes.
+     *
+     * @return the addressPrefixes value
+     */
+    public List<String> addressPrefixes() {
+        return this.addressPrefixes;
+    }
+
+    /**
+     * Set list of all addressPrefixes.
+     *
+     * @param addressPrefixes the addressPrefixes value to set
+     * @return the VirtualHubRoute object itself.
+     */
+    public VirtualHubRoute withAddressPrefixes(List<String> addressPrefixes) {
+        this.addressPrefixes = addressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get nextHop ip address.
+     *
+     * @return the nextHopIpAddress value
+     */
+    public String nextHopIpAddress() {
+        return this.nextHopIpAddress;
+    }
+
+    /**
+     * Set nextHop ip address.
+     *
+     * @param nextHopIpAddress the nextHopIpAddress value to set
+     * @return the VirtualHubRoute object itself.
+     */
+    public VirtualHubRoute withNextHopIpAddress(String nextHopIpAddress) {
+        this.nextHopIpAddress = nextHopIpAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTable.java
new file mode 100644
index 000000000000..aefa0be31fd6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTable.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VirtualHub route table.
+ */
+public class VirtualHubRouteTable {
+    /**
+     * List of all routes.
+     */
+    @JsonProperty(value = "routes")
+    private List<VirtualHubRoute> routes;
+
+    /**
+     * Get list of all routes.
+     *
+     * @return the routes value
+     */
+    public List<VirtualHubRoute> routes() {
+        return this.routes;
+    }
+
+    /**
+     * Set list of all routes.
+     *
+     * @param routes the routes value to set
+     * @return the VirtualHubRouteTable object itself.
+     */
+    public VirtualHubRouteTable withRoutes(List<VirtualHubRoute> routes) {
+        this.routes = routes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2.java
new file mode 100644
index 000000000000..f05d1b02796a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2.java
@@ -0,0 +1,200 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualHubRouteTableV2Inner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing VirtualHubRouteTableV2.
+ */
+public interface VirtualHubRouteTableV2 extends HasInner<VirtualHubRouteTableV2Inner>, Indexable, Refreshable<VirtualHubRouteTableV2>, Updatable<VirtualHubRouteTableV2.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the attachedConnections value.
+     */
+    List<String> attachedConnections();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routes value.
+     */
+    List<VirtualHubRouteV2> routes();
+
+    /**
+     * The entirety of the VirtualHubRouteTableV2 definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVirtualHub, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualHubRouteTableV2 definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualHubRouteTableV2 definition.
+         */
+        interface Blank extends WithVirtualHub {
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+           /**
+            * Specifies resourceGroupName, virtualHubName.
+            * @param resourceGroupName The resource group name of the VirtualHub
+            * @param virtualHubName The name of the VirtualHub
+            * @return the next definition stage
+            */
+            WithCreate withExistingVirtualHub(String resourceGroupName, String virtualHubName);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 definition allowing to specify AttachedConnections.
+         */
+        interface WithAttachedConnections {
+            /**
+             * Specifies attachedConnections.
+             * @param attachedConnections List of all connections attached to this route table v2
+             * @return the next definition stage
+             */
+            WithCreate withAttachedConnections(List<String> attachedConnections);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 definition allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes List of all routes
+             * @return the next definition stage
+             */
+            WithCreate withRoutes(List<VirtualHubRouteV2> routes);
+        }
+
+        /**
+         * 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<VirtualHubRouteTableV2>, DefinitionStages.WithAttachedConnections, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithRoutes {
+        }
+    }
+    /**
+     * The template for a VirtualHubRouteTableV2 update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualHubRouteTableV2>, UpdateStages.WithAttachedConnections, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithRoutes {
+    }
+
+    /**
+     * Grouping of VirtualHubRouteTableV2 update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualhubroutetablev2 update allowing to specify AttachedConnections.
+         */
+        interface WithAttachedConnections {
+            /**
+             * Specifies attachedConnections.
+             * @param attachedConnections List of all connections attached to this route table v2
+             * @return the next update stage
+             */
+            Update withAttachedConnections(List<String> attachedConnections);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the virtualhubroutetablev2 update allowing to specify Routes.
+         */
+        interface WithRoutes {
+            /**
+             * Specifies routes.
+             * @param routes List of all routes
+             * @return the next update stage
+             */
+            Update withRoutes(List<VirtualHubRouteV2> routes);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2s.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2s.java
new file mode 100644
index 000000000000..4cc6e62a3ce2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteTableV2s.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualHubRouteTableV2sInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualHubRouteTableV2s.
+ */
+public interface VirtualHubRouteTableV2s extends SupportsCreating<VirtualHubRouteTableV2.DefinitionStages.Blank>, HasInner<VirtualHubRouteTableV2sInner> {
+    /**
+     * Retrieves the details of a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualHubRouteTableV2> getAsync(String resourceGroupName, String virtualHubName, String routeTableName);
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualHubRouteTableV2> listAsync(final String resourceGroupName, final String virtualHubName);
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteV2.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteV2.java
new file mode 100644
index 000000000000..a4cecf2bee43
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubRouteV2.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VirtualHubRouteTableV2 route.
+ */
+public class VirtualHubRouteV2 {
+    /**
+     * The type of destinations.
+     */
+    @JsonProperty(value = "destinationType")
+    private String destinationType;
+
+    /**
+     * List of all destinations.
+     */
+    @JsonProperty(value = "destinations")
+    private List<String> destinations;
+
+    /**
+     * The type of next hops.
+     */
+    @JsonProperty(value = "nextHopType")
+    private String nextHopType;
+
+    /**
+     * NextHops ip address.
+     */
+    @JsonProperty(value = "nextHops")
+    private List<String> nextHops;
+
+    /**
+     * Get the type of destinations.
+     *
+     * @return the destinationType value
+     */
+    public String destinationType() {
+        return this.destinationType;
+    }
+
+    /**
+     * Set the type of destinations.
+     *
+     * @param destinationType the destinationType value to set
+     * @return the VirtualHubRouteV2 object itself.
+     */
+    public VirtualHubRouteV2 withDestinationType(String destinationType) {
+        this.destinationType = destinationType;
+        return this;
+    }
+
+    /**
+     * Get list of all destinations.
+     *
+     * @return the destinations value
+     */
+    public List<String> destinations() {
+        return this.destinations;
+    }
+
+    /**
+     * Set list of all destinations.
+     *
+     * @param destinations the destinations value to set
+     * @return the VirtualHubRouteV2 object itself.
+     */
+    public VirtualHubRouteV2 withDestinations(List<String> destinations) {
+        this.destinations = destinations;
+        return this;
+    }
+
+    /**
+     * Get the type of next hops.
+     *
+     * @return the nextHopType value
+     */
+    public String nextHopType() {
+        return this.nextHopType;
+    }
+
+    /**
+     * Set the type of next hops.
+     *
+     * @param nextHopType the nextHopType value to set
+     * @return the VirtualHubRouteV2 object itself.
+     */
+    public VirtualHubRouteV2 withNextHopType(String nextHopType) {
+        this.nextHopType = nextHopType;
+        return this;
+    }
+
+    /**
+     * Get nextHops ip address.
+     *
+     * @return the nextHops value
+     */
+    public List<String> nextHops() {
+        return this.nextHops;
+    }
+
+    /**
+     * Set nextHops ip address.
+     *
+     * @param nextHops the nextHops value to set
+     * @return the VirtualHubRouteV2 object itself.
+     */
+    public VirtualHubRouteV2 withNextHops(List<String> nextHops) {
+        this.nextHops = nextHops;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubs.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubs.java
new file mode 100644
index 000000000000..52294eca1a5d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualHubs.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VirtualHubsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualHubs.
+ */
+public interface VirtualHubs extends SupportsCreating<VirtualHub.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualHub>, SupportsListingByResourceGroup<VirtualHub>, SupportsListing<VirtualHub>, HasInner<VirtualHubsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualMachineScaleSetNetworkInterfaceIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualMachineScaleSetNetworkInterfaceIPConfiguration.java
new file mode 100644
index 000000000000..f6dc0857701d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualMachineScaleSetNetworkInterfaceIPConfiguration.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+
+/**
+ * Type representing VirtualMachineScaleSetNetworkInterfaceIPConfiguration.
+ */
+public interface VirtualMachineScaleSetNetworkInterfaceIPConfiguration extends HasInner<NetworkInterfaceIPConfigurationInner>, Indexable, Refreshable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration>, HasManager<NetworkManager> {
+    /**
+     * @return the applicationGatewayBackendAddressPools value.
+     */
+    List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools();
+
+    /**
+     * @return the applicationSecurityGroups value.
+     */
+    List<ApplicationSecurityGroup> applicationSecurityGroups();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the loadBalancerBackendAddressPools value.
+     */
+    List<BackendAddressPool> loadBalancerBackendAddressPools();
+
+    /**
+     * @return the loadBalancerInboundNatRules value.
+     */
+    List<InboundNatRule> loadBalancerInboundNatRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the primary value.
+     */
+    Boolean primary();
+
+    /**
+     * @return the privateIPAddress value.
+     */
+    String privateIPAddress();
+
+    /**
+     * @return the privateIPAddressVersion value.
+     */
+    IPVersion privateIPAddressVersion();
+
+    /**
+     * @return the privateIPAllocationMethod value.
+     */
+    IPAllocationMethod privateIPAllocationMethod();
+
+    /**
+     * @return the privateLinkConnectionProperties value.
+     */
+    NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the publicIPAddress value.
+     */
+    PublicIPAddress publicIPAddress();
+
+    /**
+     * @return the subnet value.
+     */
+    Subnet subnet();
+
+    /**
+     * @return the virtualNetworkTaps value.
+     */
+    List<VirtualNetworkTap> virtualNetworkTaps();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetwork.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetwork.java
new file mode 100644
index 000000000000..9e9dc0f6abe8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetwork.java
@@ -0,0 +1,348 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkPeeringInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkInner;
+
+/**
+ * Type representing VirtualNetwork.
+ */
+public interface VirtualNetwork extends HasInner<VirtualNetworkInner>, Resource, GroupableResourceCore<NetworkManager, VirtualNetworkInner>, HasResourceGroup, Refreshable<VirtualNetwork>, Updatable<VirtualNetwork.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressSpace value.
+     */
+    AddressSpace addressSpace();
+
+    /**
+     * @return the bgpCommunities value.
+     */
+    VirtualNetworkBgpCommunities bgpCommunities();
+
+    /**
+     * @return the ddosProtectionPlan value.
+     */
+    SubResource ddosProtectionPlan();
+
+    /**
+     * @return the dhcpOptions value.
+     */
+    DhcpOptions dhcpOptions();
+
+    /**
+     * @return the enableDdosProtection value.
+     */
+    Boolean enableDdosProtection();
+
+    /**
+     * @return the enableVmProtection value.
+     */
+    Boolean enableVmProtection();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipAllocations value.
+     */
+    List<SubResource> ipAllocations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the subnets value.
+     */
+    List<Subnet> subnets();
+
+    /**
+     * @return the virtualNetworkPeerings value.
+     */
+    List<VirtualNetworkPeering> virtualNetworkPeerings();
+
+    /**
+     * The entirety of the VirtualNetwork definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetwork definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetwork definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualNetwork definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify AddressSpace.
+         */
+        interface WithAddressSpace {
+            /**
+             * Specifies addressSpace.
+             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
+             * @return the next definition stage
+             */
+            WithCreate withAddressSpace(AddressSpace addressSpace);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify BgpCommunities.
+         */
+        interface WithBgpCommunities {
+            /**
+             * Specifies bgpCommunities.
+             * @param bgpCommunities Bgp Communities sent over ExpressRoute with each route corresponding to a prefix in this VNET
+             * @return the next definition stage
+             */
+            WithCreate withBgpCommunities(VirtualNetworkBgpCommunities bgpCommunities);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify DdosProtectionPlan.
+         */
+        interface WithDdosProtectionPlan {
+            /**
+             * Specifies ddosProtectionPlan.
+             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
+             * @return the next definition stage
+             */
+            WithCreate withDdosProtectionPlan(SubResource ddosProtectionPlan);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify DhcpOptions.
+         */
+        interface WithDhcpOptions {
+            /**
+             * Specifies dhcpOptions.
+             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
+             * @return the next definition stage
+             */
+            WithCreate withDhcpOptions(DhcpOptions dhcpOptions);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify EnableDdosProtection.
+         */
+        interface WithEnableDdosProtection {
+            /**
+             * Specifies enableDdosProtection.
+             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
+             * @return the next definition stage
+             */
+            WithCreate withEnableDdosProtection(Boolean enableDdosProtection);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify EnableVmProtection.
+         */
+        interface WithEnableVmProtection {
+            /**
+             * Specifies enableVmProtection.
+             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
+             * @return the next definition stage
+             */
+            WithCreate withEnableVmProtection(Boolean enableVmProtection);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify IpAllocations.
+         */
+        interface WithIpAllocations {
+            /**
+             * Specifies ipAllocations.
+             * @param ipAllocations Array of IpAllocation which reference this VNET
+             * @return the next definition stage
+             */
+            WithCreate withIpAllocations(List<SubResource> ipAllocations);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify Subnets.
+         */
+        interface WithSubnets {
+            /**
+             * Specifies subnets.
+             * @param subnets A list of subnets in a Virtual Network
+             * @return the next definition stage
+             */
+            WithCreate withSubnets(List<SubnetInner> subnets);
+        }
+
+        /**
+         * The stage of the virtualnetwork definition allowing to specify VirtualNetworkPeerings.
+         */
+        interface WithVirtualNetworkPeerings {
+            /**
+             * Specifies virtualNetworkPeerings.
+             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
+             * @return the next definition stage
+             */
+            WithCreate withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
+        }
+
+        /**
+         * 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<VirtualNetwork>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAddressSpace, DefinitionStages.WithBgpCommunities, DefinitionStages.WithDdosProtectionPlan, DefinitionStages.WithDhcpOptions, DefinitionStages.WithEnableDdosProtection, DefinitionStages.WithEnableVmProtection, DefinitionStages.WithIpAllocations, DefinitionStages.WithSubnets, DefinitionStages.WithVirtualNetworkPeerings {
+        }
+    }
+    /**
+     * The template for a VirtualNetwork update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetwork>, Resource.UpdateWithTags<Update>, UpdateStages.WithAddressSpace, UpdateStages.WithBgpCommunities, UpdateStages.WithDdosProtectionPlan, UpdateStages.WithDhcpOptions, UpdateStages.WithEnableDdosProtection, UpdateStages.WithEnableVmProtection, UpdateStages.WithIpAllocations, UpdateStages.WithSubnets, UpdateStages.WithVirtualNetworkPeerings {
+    }
+
+    /**
+     * Grouping of VirtualNetwork update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualnetwork update allowing to specify AddressSpace.
+         */
+        interface WithAddressSpace {
+            /**
+             * Specifies addressSpace.
+             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
+             * @return the next update stage
+             */
+            Update withAddressSpace(AddressSpace addressSpace);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify BgpCommunities.
+         */
+        interface WithBgpCommunities {
+            /**
+             * Specifies bgpCommunities.
+             * @param bgpCommunities Bgp Communities sent over ExpressRoute with each route corresponding to a prefix in this VNET
+             * @return the next update stage
+             */
+            Update withBgpCommunities(VirtualNetworkBgpCommunities bgpCommunities);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify DdosProtectionPlan.
+         */
+        interface WithDdosProtectionPlan {
+            /**
+             * Specifies ddosProtectionPlan.
+             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
+             * @return the next update stage
+             */
+            Update withDdosProtectionPlan(SubResource ddosProtectionPlan);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
+         */
+        interface WithDhcpOptions {
+            /**
+             * Specifies dhcpOptions.
+             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
+             * @return the next update stage
+             */
+            Update withDhcpOptions(DhcpOptions dhcpOptions);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
+         */
+        interface WithEnableDdosProtection {
+            /**
+             * Specifies enableDdosProtection.
+             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
+             * @return the next update stage
+             */
+            Update withEnableDdosProtection(Boolean enableDdosProtection);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
+         */
+        interface WithEnableVmProtection {
+            /**
+             * Specifies enableVmProtection.
+             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
+             * @return the next update stage
+             */
+            Update withEnableVmProtection(Boolean enableVmProtection);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify IpAllocations.
+         */
+        interface WithIpAllocations {
+            /**
+             * Specifies ipAllocations.
+             * @param ipAllocations Array of IpAllocation which reference this VNET
+             * @return the next update stage
+             */
+            Update withIpAllocations(List<SubResource> ipAllocations);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify Subnets.
+         */
+        interface WithSubnets {
+            /**
+             * Specifies subnets.
+             * @param subnets A list of subnets in a Virtual Network
+             * @return the next update stage
+             */
+            Update withSubnets(List<SubnetInner> subnets);
+        }
+
+        /**
+         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
+         */
+        interface WithVirtualNetworkPeerings {
+            /**
+             * Specifies virtualNetworkPeerings.
+             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
+             * @return the next update stage
+             */
+            Update withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkBgpCommunities.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkBgpCommunities.java
new file mode 100644
index 000000000000..8e8de900f184
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkBgpCommunities.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Bgp Communities sent over ExpressRoute with each route corresponding to a
+ * prefix in this VNET.
+ */
+public class VirtualNetworkBgpCommunities {
+    /**
+     * The BGP community associated with the virtual network.
+     */
+    @JsonProperty(value = "virtualNetworkCommunity", required = true)
+    private String virtualNetworkCommunity;
+
+    /**
+     * The BGP community associated with the region of the virtual network.
+     */
+    @JsonProperty(value = "regionalCommunity", access = JsonProperty.Access.WRITE_ONLY)
+    private String regionalCommunity;
+
+    /**
+     * Get the BGP community associated with the virtual network.
+     *
+     * @return the virtualNetworkCommunity value
+     */
+    public String virtualNetworkCommunity() {
+        return this.virtualNetworkCommunity;
+    }
+
+    /**
+     * Set the BGP community associated with the virtual network.
+     *
+     * @param virtualNetworkCommunity the virtualNetworkCommunity value to set
+     * @return the VirtualNetworkBgpCommunities object itself.
+     */
+    public VirtualNetworkBgpCommunities withVirtualNetworkCommunity(String virtualNetworkCommunity) {
+        this.virtualNetworkCommunity = virtualNetworkCommunity;
+        return this;
+    }
+
+    /**
+     * Get the BGP community associated with the region of the virtual network.
+     *
+     * @return the regionalCommunity value
+     */
+    public String regionalCommunity() {
+        return this.regionalCommunity;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkConnectionGatewayReference.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkConnectionGatewayReference.java
new file mode 100644
index 000000000000..35a54e453b10
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkConnectionGatewayReference.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A reference to VirtualNetworkGateway or LocalNetworkGateway resource.
+ */
+public class VirtualNetworkConnectionGatewayReference {
+    /**
+     * The ID of VirtualNetworkGateway or LocalNetworkGateway resource.
+     */
+    @JsonProperty(value = "id", required = true)
+    private String id;
+
+    /**
+     * Get the ID of VirtualNetworkGateway or LocalNetworkGateway resource.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the ID of VirtualNetworkGateway or LocalNetworkGateway resource.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkConnectionGatewayReference object itself.
+     */
+    public VirtualNetworkConnectionGatewayReference withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateway.java
new file mode 100644
index 000000000000..a0555bf19a05
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateway.java
@@ -0,0 +1,467 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewayInner;
+
+/**
+ * Type representing VirtualNetworkGateway.
+ */
+public interface VirtualNetworkGateway extends HasInner<VirtualNetworkGatewayInner>, Resource, GroupableResourceCore<NetworkManager, VirtualNetworkGatewayInner>, HasResourceGroup, Refreshable<VirtualNetworkGateway>, Updatable<VirtualNetworkGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the activeActive value.
+     */
+    Boolean activeActive();
+
+    /**
+     * @return the bgpSettings value.
+     */
+    BgpSettings bgpSettings();
+
+    /**
+     * @return the customRoutes value.
+     */
+    AddressSpace customRoutes();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the enableDnsForwarding value.
+     */
+    Boolean enableDnsForwarding();
+
+    /**
+     * @return the enablePrivateIpAddress value.
+     */
+    Boolean enablePrivateIpAddress();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the gatewayDefaultSite value.
+     */
+    SubResource gatewayDefaultSite();
+
+    /**
+     * @return the gatewayType value.
+     */
+    VirtualNetworkGatewayType gatewayType();
+
+    /**
+     * @return the inboundDnsForwardingEndpoint value.
+     */
+    String inboundDnsForwardingEndpoint();
+
+    /**
+     * @return the ipConfigurations value.
+     */
+    List<VirtualNetworkGatewayIPConfiguration> ipConfigurations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the sku value.
+     */
+    VirtualNetworkGatewaySku sku();
+
+    /**
+     * @return the vpnClientConfiguration value.
+     */
+    VpnClientConfiguration vpnClientConfiguration();
+
+    /**
+     * @return the vpnGatewayGeneration value.
+     */
+    VpnGatewayGeneration vpnGatewayGeneration();
+
+    /**
+     * @return the vpnType value.
+     */
+    VpnType vpnType();
+
+    /**
+     * The entirety of the VirtualNetworkGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetworkGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetworkGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualNetworkGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify ActiveActive.
+         */
+        interface WithActiveActive {
+            /**
+             * Specifies activeActive.
+             * @param activeActive ActiveActive flag
+             * @return the next definition stage
+             */
+            WithCreate withActiveActive(Boolean activeActive);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Virtual network gateway's BGP speaker settings
+             * @return the next definition stage
+             */
+            WithCreate withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify CustomRoutes.
+         */
+        interface WithCustomRoutes {
+            /**
+             * Specifies customRoutes.
+             * @param customRoutes The reference to the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient
+             * @return the next definition stage
+             */
+            WithCreate withCustomRoutes(AddressSpace customRoutes);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
+             * @return the next definition stage
+             */
+            WithCreate withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify EnableDnsForwarding.
+         */
+        interface WithEnableDnsForwarding {
+            /**
+             * Specifies enableDnsForwarding.
+             * @param enableDnsForwarding Whether dns forwarding is enabled or not
+             * @return the next definition stage
+             */
+            WithCreate withEnableDnsForwarding(Boolean enableDnsForwarding);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify EnablePrivateIpAddress.
+         */
+        interface WithEnablePrivateIpAddress {
+            /**
+             * Specifies enablePrivateIpAddress.
+             * @param enablePrivateIpAddress Whether private IP needs to be enabled on this gateway for connections or not
+             * @return the next definition stage
+             */
+            WithCreate withEnablePrivateIpAddress(Boolean enablePrivateIpAddress);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify GatewayDefaultSite.
+         */
+        interface WithGatewayDefaultSite {
+            /**
+             * Specifies gatewayDefaultSite.
+             * @param gatewayDefaultSite The reference to the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
+             * @return the next definition stage
+             */
+            WithCreate withGatewayDefaultSite(SubResource gatewayDefaultSite);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify GatewayType.
+         */
+        interface WithGatewayType {
+            /**
+             * Specifies gatewayType.
+             * @param gatewayType The type of this virtual network gateway. Possible values include: 'Vpn', 'ExpressRoute'
+             * @return the next definition stage
+             */
+            WithCreate withGatewayType(VirtualNetworkGatewayType gatewayType);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configurations for virtual network gateway
+             * @return the next definition stage
+             */
+            WithCreate withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The reference to the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
+             * @return the next definition stage
+             */
+            WithCreate withSku(VirtualNetworkGatewaySku sku);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify VpnClientConfiguration.
+         */
+        interface WithVpnClientConfiguration {
+            /**
+             * Specifies vpnClientConfiguration.
+             * @param vpnClientConfiguration The reference to the VpnClientConfiguration resource which represents the P2S VpnClient configurations
+             * @return the next definition stage
+             */
+            WithCreate withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify VpnGatewayGeneration.
+         */
+        interface WithVpnGatewayGeneration {
+            /**
+             * Specifies vpnGatewayGeneration.
+             * @param vpnGatewayGeneration The generation for this VirtualNetworkGateway. Must be None if gatewayType is not VPN. Possible values include: 'None', 'Generation1', 'Generation2'
+             * @return the next definition stage
+             */
+            WithCreate withVpnGatewayGeneration(VpnGatewayGeneration vpnGatewayGeneration);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway definition allowing to specify VpnType.
+         */
+        interface WithVpnType {
+            /**
+             * Specifies vpnType.
+             * @param vpnType The type of this virtual network gateway. Possible values include: 'PolicyBased', 'RouteBased'
+             * @return the next definition stage
+             */
+            WithCreate withVpnType(VpnType vpnType);
+        }
+
+        /**
+         * 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<VirtualNetworkGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithActiveActive, DefinitionStages.WithBgpSettings, DefinitionStages.WithCustomRoutes, DefinitionStages.WithEnableBgp, DefinitionStages.WithEnableDnsForwarding, DefinitionStages.WithEnablePrivateIpAddress, DefinitionStages.WithGatewayDefaultSite, DefinitionStages.WithGatewayType, DefinitionStages.WithIpConfigurations, DefinitionStages.WithSku, DefinitionStages.WithVpnClientConfiguration, DefinitionStages.WithVpnGatewayGeneration, DefinitionStages.WithVpnType {
+        }
+    }
+    /**
+     * The template for a VirtualNetworkGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetworkGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithActiveActive, UpdateStages.WithBgpSettings, UpdateStages.WithCustomRoutes, UpdateStages.WithEnableBgp, UpdateStages.WithEnableDnsForwarding, UpdateStages.WithEnablePrivateIpAddress, UpdateStages.WithGatewayDefaultSite, UpdateStages.WithGatewayType, UpdateStages.WithIpConfigurations, UpdateStages.WithSku, UpdateStages.WithVpnClientConfiguration, UpdateStages.WithVpnGatewayGeneration, UpdateStages.WithVpnType {
+    }
+
+    /**
+     * Grouping of VirtualNetworkGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
+         */
+        interface WithActiveActive {
+            /**
+             * Specifies activeActive.
+             * @param activeActive ActiveActive flag
+             * @return the next update stage
+             */
+            Update withActiveActive(Boolean activeActive);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Virtual network gateway's BGP speaker settings
+             * @return the next update stage
+             */
+            Update withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify CustomRoutes.
+         */
+        interface WithCustomRoutes {
+            /**
+             * Specifies customRoutes.
+             * @param customRoutes The reference to the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient
+             * @return the next update stage
+             */
+            Update withCustomRoutes(AddressSpace customRoutes);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
+             * @return the next update stage
+             */
+            Update withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify EnableDnsForwarding.
+         */
+        interface WithEnableDnsForwarding {
+            /**
+             * Specifies enableDnsForwarding.
+             * @param enableDnsForwarding Whether dns forwarding is enabled or not
+             * @return the next update stage
+             */
+            Update withEnableDnsForwarding(Boolean enableDnsForwarding);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify EnablePrivateIpAddress.
+         */
+        interface WithEnablePrivateIpAddress {
+            /**
+             * Specifies enablePrivateIpAddress.
+             * @param enablePrivateIpAddress Whether private IP needs to be enabled on this gateway for connections or not
+             * @return the next update stage
+             */
+            Update withEnablePrivateIpAddress(Boolean enablePrivateIpAddress);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
+         */
+        interface WithGatewayDefaultSite {
+            /**
+             * Specifies gatewayDefaultSite.
+             * @param gatewayDefaultSite The reference to the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
+             * @return the next update stage
+             */
+            Update withGatewayDefaultSite(SubResource gatewayDefaultSite);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
+         */
+        interface WithGatewayType {
+            /**
+             * Specifies gatewayType.
+             * @param gatewayType The type of this virtual network gateway. Possible values include: 'Vpn', 'ExpressRoute'
+             * @return the next update stage
+             */
+            Update withGatewayType(VirtualNetworkGatewayType gatewayType);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
+         */
+        interface WithIpConfigurations {
+            /**
+             * Specifies ipConfigurations.
+             * @param ipConfigurations IP configurations for virtual network gateway
+             * @return the next update stage
+             */
+            Update withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             * @param sku The reference to the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
+             * @return the next update stage
+             */
+            Update withSku(VirtualNetworkGatewaySku sku);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
+         */
+        interface WithVpnClientConfiguration {
+            /**
+             * Specifies vpnClientConfiguration.
+             * @param vpnClientConfiguration The reference to the VpnClientConfiguration resource which represents the P2S VpnClient configurations
+             * @return the next update stage
+             */
+            Update withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify VpnGatewayGeneration.
+         */
+        interface WithVpnGatewayGeneration {
+            /**
+             * Specifies vpnGatewayGeneration.
+             * @param vpnGatewayGeneration The generation for this VirtualNetworkGateway. Must be None if gatewayType is not VPN. Possible values include: 'None', 'Generation1', 'Generation2'
+             * @return the next update stage
+             */
+            Update withVpnGatewayGeneration(VpnGatewayGeneration vpnGatewayGeneration);
+        }
+
+        /**
+         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
+         */
+        interface WithVpnType {
+            /**
+             * Specifies vpnType.
+             * @param vpnType The type of this virtual network gateway. Possible values include: 'PolicyBased', 'RouteBased'
+             * @return the next update stage
+             */
+            Update withVpnType(VpnType vpnType);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnection.java
new file mode 100644
index 000000000000..8814c595f1d8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnection.java
@@ -0,0 +1,547 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.LocalNetworkGatewayInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewayInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewayConnectionInner;
+
+/**
+ * Type representing VirtualNetworkGatewayConnection.
+ */
+public interface VirtualNetworkGatewayConnection extends HasInner<VirtualNetworkGatewayConnectionInner>, Resource, GroupableResourceCore<NetworkManager, VirtualNetworkGatewayConnectionInner>, HasResourceGroup, Refreshable<VirtualNetworkGatewayConnection>, Updatable<VirtualNetworkGatewayConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the authorizationKey value.
+     */
+    String authorizationKey();
+
+    /**
+     * @return the connectionProtocol value.
+     */
+    VirtualNetworkGatewayConnectionProtocol connectionProtocol();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    VirtualNetworkGatewayConnectionStatus connectionStatus();
+
+    /**
+     * @return the connectionType value.
+     */
+    VirtualNetworkGatewayConnectionType connectionType();
+
+    /**
+     * @return the dpdTimeoutSeconds value.
+     */
+    Integer dpdTimeoutSeconds();
+
+    /**
+     * @return the egressBytesTransferred value.
+     */
+    Long egressBytesTransferred();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteGatewayBypass value.
+     */
+    Boolean expressRouteGatewayBypass();
+
+    /**
+     * @return the ingressBytesTransferred value.
+     */
+    Long ingressBytesTransferred();
+
+    /**
+     * @return the ipsecPolicies value.
+     */
+    List<IpsecPolicy> ipsecPolicies();
+
+    /**
+     * @return the localNetworkGateway2 value.
+     */
+    LocalNetworkGateway localNetworkGateway2();
+
+    /**
+     * @return the peer value.
+     */
+    SubResource peer();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the trafficSelectorPolicies value.
+     */
+    List<TrafficSelectorPolicy> trafficSelectorPolicies();
+
+    /**
+     * @return the tunnelConnectionStatus value.
+     */
+    List<TunnelConnectionHealth> tunnelConnectionStatus();
+
+    /**
+     * @return the useLocalAzureIpAddress value.
+     */
+    Boolean useLocalAzureIpAddress();
+
+    /**
+     * @return the usePolicyBasedTrafficSelectors value.
+     */
+    Boolean usePolicyBasedTrafficSelectors();
+
+    /**
+     * @return the virtualNetworkGateway1 value.
+     */
+    VirtualNetworkGateway virtualNetworkGateway1();
+
+    /**
+     * @return the virtualNetworkGateway2 value.
+     */
+    VirtualNetworkGateway virtualNetworkGateway2();
+
+    /**
+     * The entirety of the VirtualNetworkGatewayConnection definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithConnectionType, DefinitionStages.WithVirtualNetworkGateway1, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetworkGatewayConnection definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetworkGatewayConnection definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualNetworkGatewayConnection definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithConnectionType> {
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ConnectionType.
+         */
+        interface WithConnectionType {
+           /**
+            * Specifies connectionType.
+            * @param connectionType Gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'
+            * @return the next definition stage
+*/
+            WithVirtualNetworkGateway1 withConnectionType(VirtualNetworkGatewayConnectionType connectionType);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify VirtualNetworkGateway1.
+         */
+        interface WithVirtualNetworkGateway1 {
+           /**
+            * Specifies virtualNetworkGateway1.
+            * @param virtualNetworkGateway1 The reference to virtual network gateway resource
+            * @return the next definition stage
+*/
+            WithCreate withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorizationKey
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ConnectionProtocol.
+         */
+        interface WithConnectionProtocol {
+            /**
+             * Specifies connectionProtocol.
+             * @param connectionProtocol Connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'
+             * @return the next definition stage
+             */
+            WithCreate withConnectionProtocol(VirtualNetworkGatewayConnectionProtocol connectionProtocol);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify DpdTimeoutSeconds.
+         */
+        interface WithDpdTimeoutSeconds {
+            /**
+             * Specifies dpdTimeoutSeconds.
+             * @param dpdTimeoutSeconds The dead peer detection timeout of this connection in seconds
+             * @return the next definition stage
+             */
+            WithCreate withDpdTimeoutSeconds(Integer dpdTimeoutSeconds);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp EnableBgp flag
+             * @return the next definition stage
+             */
+            WithCreate withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ExpressRouteGatewayBypass.
+         */
+        interface WithExpressRouteGatewayBypass {
+            /**
+             * Specifies expressRouteGatewayBypass.
+             * @param expressRouteGatewayBypass Bypass ExpressRoute Gateway for data forwarding
+             * @return the next definition stage
+             */
+            WithCreate withExpressRouteGatewayBypass(Boolean expressRouteGatewayBypass);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify IpsecPolicies.
+         */
+        interface WithIpsecPolicies {
+            /**
+             * Specifies ipsecPolicies.
+             * @param ipsecPolicies The IPSec Policies to be considered by this connection
+             * @return the next definition stage
+             */
+            WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify LocalNetworkGateway2.
+         */
+        interface WithLocalNetworkGateway2 {
+            /**
+             * Specifies localNetworkGateway2.
+             * @param localNetworkGateway2 The reference to local network gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Peer.
+         */
+        interface WithPeer {
+            /**
+             * Specifies peer.
+             * @param peer The reference to peerings resource
+             * @return the next definition stage
+             */
+            WithCreate withPeer(SubResource peer);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight The routing weight
+             * @return the next definition stage
+             */
+            WithCreate withRoutingWeight(Integer routingWeight);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The IPSec shared key
+             * @return the next definition stage
+             */
+            WithCreate withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify TrafficSelectorPolicies.
+         */
+        interface WithTrafficSelectorPolicies {
+            /**
+             * Specifies trafficSelectorPolicies.
+             * @param trafficSelectorPolicies The Traffic Selector Policies to be considered by this connection
+             * @return the next definition stage
+             */
+            WithCreate withTrafficSelectorPolicies(List<TrafficSelectorPolicy> trafficSelectorPolicies);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify UseLocalAzureIpAddress.
+         */
+        interface WithUseLocalAzureIpAddress {
+            /**
+             * Specifies useLocalAzureIpAddress.
+             * @param useLocalAzureIpAddress Use private local Azure IP for the connection
+             * @return the next definition stage
+             */
+            WithCreate withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify UsePolicyBasedTrafficSelectors.
+         */
+        interface WithUsePolicyBasedTrafficSelectors {
+            /**
+             * Specifies usePolicyBasedTrafficSelectors.
+             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
+             * @return the next definition stage
+             */
+            WithCreate withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection definition allowing to specify VirtualNetworkGateway2.
+         */
+        interface WithVirtualNetworkGateway2 {
+            /**
+             * Specifies virtualNetworkGateway2.
+             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
+             * @return the next definition stage
+             */
+            WithCreate withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
+        }
+
+        /**
+         * 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<VirtualNetworkGatewayConnection>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAuthorizationKey, DefinitionStages.WithConnectionProtocol, DefinitionStages.WithDpdTimeoutSeconds, DefinitionStages.WithEnableBgp, DefinitionStages.WithExpressRouteGatewayBypass, DefinitionStages.WithIpsecPolicies, DefinitionStages.WithLocalNetworkGateway2, DefinitionStages.WithPeer, DefinitionStages.WithRoutingWeight, DefinitionStages.WithSharedKey, DefinitionStages.WithTrafficSelectorPolicies, DefinitionStages.WithUseLocalAzureIpAddress, DefinitionStages.WithUsePolicyBasedTrafficSelectors, DefinitionStages.WithVirtualNetworkGateway2 {
+        }
+    }
+    /**
+     * The template for a VirtualNetworkGatewayConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetworkGatewayConnection>, Resource.UpdateWithTags<Update>, UpdateStages.WithAuthorizationKey, UpdateStages.WithConnectionProtocol, UpdateStages.WithDpdTimeoutSeconds, UpdateStages.WithEnableBgp, UpdateStages.WithExpressRouteGatewayBypass, UpdateStages.WithIpsecPolicies, UpdateStages.WithLocalNetworkGateway2, UpdateStages.WithPeer, UpdateStages.WithRoutingWeight, UpdateStages.WithSharedKey, UpdateStages.WithTrafficSelectorPolicies, UpdateStages.WithUseLocalAzureIpAddress, UpdateStages.WithUsePolicyBasedTrafficSelectors, UpdateStages.WithVirtualNetworkGateway2 {
+    }
+
+    /**
+     * Grouping of VirtualNetworkGatewayConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorizationKey
+             * @return the next update stage
+             */
+            Update withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify ConnectionProtocol.
+         */
+        interface WithConnectionProtocol {
+            /**
+             * Specifies connectionProtocol.
+             * @param connectionProtocol Connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'
+             * @return the next update stage
+             */
+            Update withConnectionProtocol(VirtualNetworkGatewayConnectionProtocol connectionProtocol);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify DpdTimeoutSeconds.
+         */
+        interface WithDpdTimeoutSeconds {
+            /**
+             * Specifies dpdTimeoutSeconds.
+             * @param dpdTimeoutSeconds The dead peer detection timeout of this connection in seconds
+             * @return the next update stage
+             */
+            Update withDpdTimeoutSeconds(Integer dpdTimeoutSeconds);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp EnableBgp flag
+             * @return the next update stage
+             */
+            Update withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify ExpressRouteGatewayBypass.
+         */
+        interface WithExpressRouteGatewayBypass {
+            /**
+             * Specifies expressRouteGatewayBypass.
+             * @param expressRouteGatewayBypass Bypass ExpressRoute Gateway for data forwarding
+             * @return the next update stage
+             */
+            Update withExpressRouteGatewayBypass(Boolean expressRouteGatewayBypass);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
+         */
+        interface WithIpsecPolicies {
+            /**
+             * Specifies ipsecPolicies.
+             * @param ipsecPolicies The IPSec Policies to be considered by this connection
+             * @return the next update stage
+             */
+            Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
+         */
+        interface WithLocalNetworkGateway2 {
+            /**
+             * Specifies localNetworkGateway2.
+             * @param localNetworkGateway2 The reference to local network gateway resource
+             * @return the next update stage
+             */
+            Update withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
+         */
+        interface WithPeer {
+            /**
+             * Specifies peer.
+             * @param peer The reference to peerings resource
+             * @return the next update stage
+             */
+            Update withPeer(SubResource peer);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight The routing weight
+             * @return the next update stage
+             */
+            Update withRoutingWeight(Integer routingWeight);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey The IPSec shared key
+             * @return the next update stage
+             */
+            Update withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify TrafficSelectorPolicies.
+         */
+        interface WithTrafficSelectorPolicies {
+            /**
+             * Specifies trafficSelectorPolicies.
+             * @param trafficSelectorPolicies The Traffic Selector Policies to be considered by this connection
+             * @return the next update stage
+             */
+            Update withTrafficSelectorPolicies(List<TrafficSelectorPolicy> trafficSelectorPolicies);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify UseLocalAzureIpAddress.
+         */
+        interface WithUseLocalAzureIpAddress {
+            /**
+             * Specifies useLocalAzureIpAddress.
+             * @param useLocalAzureIpAddress Use private local Azure IP for the connection
+             * @return the next update stage
+             */
+            Update withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
+         */
+        interface WithUsePolicyBasedTrafficSelectors {
+            /**
+             * Specifies usePolicyBasedTrafficSelectors.
+             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
+             * @return the next update stage
+             */
+            Update withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
+        }
+
+        /**
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
+         */
+        interface WithVirtualNetworkGateway2 {
+            /**
+             * Specifies virtualNetworkGateway2.
+             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
+             * @return the next update stage
+             */
+            Update withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionListEntity.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionListEntity.java
new file mode 100644
index 000000000000..ff650b100d9b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionListEntity.java
@@ -0,0 +1,153 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewayConnectionListEntityInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import java.util.Map;
+
+/**
+ * Type representing VirtualNetworkGatewayConnectionListEntity.
+ */
+public interface VirtualNetworkGatewayConnectionListEntity extends HasInner<VirtualNetworkGatewayConnectionListEntityInner>, HasManager<NetworkManager> {
+    /**
+     * @return the authorizationKey value.
+     */
+    String authorizationKey();
+
+    /**
+     * @return the connectionProtocol value.
+     */
+    VirtualNetworkGatewayConnectionProtocol connectionProtocol();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    VirtualNetworkGatewayConnectionStatus connectionStatus();
+
+    /**
+     * @return the connectionType value.
+     */
+    VirtualNetworkGatewayConnectionType connectionType();
+
+    /**
+     * @return the egressBytesTransferred value.
+     */
+    Long egressBytesTransferred();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the expressRouteGatewayBypass value.
+     */
+    Boolean expressRouteGatewayBypass();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ingressBytesTransferred value.
+     */
+    Long ingressBytesTransferred();
+
+    /**
+     * @return the ipsecPolicies value.
+     */
+    List<IpsecPolicy> ipsecPolicies();
+
+    /**
+     * @return the localNetworkGateway2 value.
+     */
+    VirtualNetworkConnectionGatewayReference localNetworkGateway2();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peer value.
+     */
+    SubResource peer();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the trafficSelectorPolicies value.
+     */
+    List<TrafficSelectorPolicy> trafficSelectorPolicies();
+
+    /**
+     * @return the tunnelConnectionStatus value.
+     */
+    List<TunnelConnectionHealth> tunnelConnectionStatus();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the usePolicyBasedTrafficSelectors value.
+     */
+    Boolean usePolicyBasedTrafficSelectors();
+
+    /**
+     * @return the virtualNetworkGateway1 value.
+     */
+    VirtualNetworkConnectionGatewayReference virtualNetworkGateway1();
+
+    /**
+     * @return the virtualNetworkGateway2 value.
+     */
+    VirtualNetworkConnectionGatewayReference virtualNetworkGateway2();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionProtocol.java
new file mode 100644
index 000000000000..02063a0aab00
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewayConnectionProtocol.
+ */
+public final class VirtualNetworkGatewayConnectionProtocol extends ExpandableStringEnum<VirtualNetworkGatewayConnectionProtocol> {
+    /** Static value IKEv2 for VirtualNetworkGatewayConnectionProtocol. */
+    public static final VirtualNetworkGatewayConnectionProtocol IKEV2 = fromString("IKEv2");
+
+    /** Static value IKEv1 for VirtualNetworkGatewayConnectionProtocol. */
+    public static final VirtualNetworkGatewayConnectionProtocol IKEV1 = fromString("IKEv1");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewayConnectionProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewayConnectionProtocol
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewayConnectionProtocol fromString(String name) {
+        return fromString(name, VirtualNetworkGatewayConnectionProtocol.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewayConnectionProtocol values
+     */
+    public static Collection<VirtualNetworkGatewayConnectionProtocol> values() {
+        return values(VirtualNetworkGatewayConnectionProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionStatus.java
new file mode 100644
index 000000000000..ecac736791f7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewayConnectionStatus.
+ */
+public final class VirtualNetworkGatewayConnectionStatus extends ExpandableStringEnum<VirtualNetworkGatewayConnectionStatus> {
+    /** Static value Unknown for VirtualNetworkGatewayConnectionStatus. */
+    public static final VirtualNetworkGatewayConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Connecting for VirtualNetworkGatewayConnectionStatus. */
+    public static final VirtualNetworkGatewayConnectionStatus CONNECTING = fromString("Connecting");
+
+    /** Static value Connected for VirtualNetworkGatewayConnectionStatus. */
+    public static final VirtualNetworkGatewayConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value NotConnected for VirtualNetworkGatewayConnectionStatus. */
+    public static final VirtualNetworkGatewayConnectionStatus NOT_CONNECTED = fromString("NotConnected");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewayConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewayConnectionStatus
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewayConnectionStatus fromString(String name) {
+        return fromString(name, VirtualNetworkGatewayConnectionStatus.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewayConnectionStatus values
+     */
+    public static Collection<VirtualNetworkGatewayConnectionStatus> values() {
+        return values(VirtualNetworkGatewayConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionType.java
new file mode 100644
index 000000000000..5d56d4e7d12e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnectionType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewayConnectionType.
+ */
+public final class VirtualNetworkGatewayConnectionType extends ExpandableStringEnum<VirtualNetworkGatewayConnectionType> {
+    /** Static value IPsec for VirtualNetworkGatewayConnectionType. */
+    public static final VirtualNetworkGatewayConnectionType IPSEC = fromString("IPsec");
+
+    /** Static value Vnet2Vnet for VirtualNetworkGatewayConnectionType. */
+    public static final VirtualNetworkGatewayConnectionType VNET2VNET = fromString("Vnet2Vnet");
+
+    /** Static value ExpressRoute for VirtualNetworkGatewayConnectionType. */
+    public static final VirtualNetworkGatewayConnectionType EXPRESS_ROUTE = fromString("ExpressRoute");
+
+    /** Static value VPNClient for VirtualNetworkGatewayConnectionType. */
+    public static final VirtualNetworkGatewayConnectionType VPNCLIENT = fromString("VPNClient");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewayConnectionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewayConnectionType
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewayConnectionType fromString(String name) {
+        return fromString(name, VirtualNetworkGatewayConnectionType.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewayConnectionType values
+     */
+    public static Collection<VirtualNetworkGatewayConnectionType> values() {
+        return values(VirtualNetworkGatewayConnectionType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnections.java
new file mode 100644
index 000000000000..24eb5f528022
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayConnections.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.network.v2020_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.management.network.v2020_04_01.implementation.ConnectionSharedKeyInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewayConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualNetworkGatewayConnections.
+ */
+public interface VirtualNetworkGatewayConnections extends SupportsCreating<VirtualNetworkGatewayConnection.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualNetworkGatewayConnection>, SupportsListingByResourceGroup<VirtualNetworkGatewayConnection>, HasInner<VirtualNetworkGatewayConnectionsInner> {
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionSharedKey> setSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters);
+
+    /**
+     * The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection shared key name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionSharedKey> getSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName);
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConnectionResetSharedKey> resetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength);
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName);
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayIPConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayIPConfiguration.java
new file mode 100644
index 000000000000..9c6de1038163
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayIPConfiguration.java
@@ -0,0 +1,173 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * IP configuration for virtual network gateway.
+ */
+@JsonFlatten
+public class VirtualNetworkGatewayIPConfiguration extends SubResource {
+    /**
+     * The private IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * The reference to the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubResource subnet;
+
+    /**
+     * The reference to the public IP resource.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private SubResource publicIPAddress;
+
+    /**
+     * Private IP Address for this gateway.
+     */
+    @JsonProperty(value = "properties.privateIPAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String privateIPAddress;
+
+    /**
+     * The provisioning state of the virtual network gateway IP configuration
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the VirtualNetworkGatewayIPConfiguration object itself.
+     */
+    public VirtualNetworkGatewayIPConfiguration withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get the reference to the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the reference to the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the VirtualNetworkGatewayIPConfiguration object itself.
+     */
+    public VirtualNetworkGatewayIPConfiguration withSubnet(SubResource subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the reference to the public IP resource.
+     *
+     * @return the publicIPAddress value
+     */
+    public SubResource publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set the reference to the public IP resource.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the VirtualNetworkGatewayIPConfiguration object itself.
+     */
+    public VirtualNetworkGatewayIPConfiguration withPublicIPAddress(SubResource publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get private IP Address for this gateway.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network gateway IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VirtualNetworkGatewayIPConfiguration object itself.
+     */
+    public VirtualNetworkGatewayIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySku.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySku.java
new file mode 100644
index 000000000000..77ff756dbc59
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySku.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VirtualNetworkGatewaySku details.
+ */
+public class VirtualNetworkGatewaySku {
+    /**
+     * Gateway SKU name. Possible values include: 'Basic', 'HighPerformance',
+     * 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4',
+     * 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ',
+     * 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     */
+    @JsonProperty(value = "name")
+    private VirtualNetworkGatewaySkuName name;
+
+    /**
+     * Gateway SKU tier. Possible values include: 'Basic', 'HighPerformance',
+     * 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4',
+     * 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ',
+     * 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     */
+    @JsonProperty(value = "tier")
+    private VirtualNetworkGatewaySkuTier tier;
+
+    /**
+     * The capacity.
+     */
+    @JsonProperty(value = "capacity", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer capacity;
+
+    /**
+     * Get gateway SKU name. Possible values include: 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4', 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ', 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     *
+     * @return the name value
+     */
+    public VirtualNetworkGatewaySkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set gateway SKU name. Possible values include: 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4', 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ', 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     *
+     * @param name the name value to set
+     * @return the VirtualNetworkGatewaySku object itself.
+     */
+    public VirtualNetworkGatewaySku withName(VirtualNetworkGatewaySkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get gateway SKU tier. Possible values include: 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4', 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ', 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     *
+     * @return the tier value
+     */
+    public VirtualNetworkGatewaySkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set gateway SKU tier. Possible values include: 'Basic', 'HighPerformance', 'Standard', 'UltraPerformance', 'VpnGw1', 'VpnGw2', 'VpnGw3', 'VpnGw4', 'VpnGw5', 'VpnGw1AZ', 'VpnGw2AZ', 'VpnGw3AZ', 'VpnGw4AZ', 'VpnGw5AZ', 'ErGw1AZ', 'ErGw2AZ', 'ErGw3AZ'.
+     *
+     * @param tier the tier value to set
+     * @return the VirtualNetworkGatewaySku object itself.
+     */
+    public VirtualNetworkGatewaySku withTier(VirtualNetworkGatewaySkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get the capacity.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuName.java
new file mode 100644
index 000000000000..9b2ff48f14f7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuName.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewaySkuName.
+ */
+public final class VirtualNetworkGatewaySkuName extends ExpandableStringEnum<VirtualNetworkGatewaySkuName> {
+    /** Static value Basic for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName BASIC = fromString("Basic");
+
+    /** Static value HighPerformance for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName HIGH_PERFORMANCE = fromString("HighPerformance");
+
+    /** Static value Standard for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName STANDARD = fromString("Standard");
+
+    /** Static value UltraPerformance for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName ULTRA_PERFORMANCE = fromString("UltraPerformance");
+
+    /** Static value VpnGw1 for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW1 = fromString("VpnGw1");
+
+    /** Static value VpnGw2 for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW2 = fromString("VpnGw2");
+
+    /** Static value VpnGw3 for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW3 = fromString("VpnGw3");
+
+    /** Static value VpnGw4 for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW4 = fromString("VpnGw4");
+
+    /** Static value VpnGw5 for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW5 = fromString("VpnGw5");
+
+    /** Static value VpnGw1AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW1AZ = fromString("VpnGw1AZ");
+
+    /** Static value VpnGw2AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW2AZ = fromString("VpnGw2AZ");
+
+    /** Static value VpnGw3AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW3AZ = fromString("VpnGw3AZ");
+
+    /** Static value VpnGw4AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW4AZ = fromString("VpnGw4AZ");
+
+    /** Static value VpnGw5AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName VPN_GW5AZ = fromString("VpnGw5AZ");
+
+    /** Static value ErGw1AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName ER_GW1AZ = fromString("ErGw1AZ");
+
+    /** Static value ErGw2AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName ER_GW2AZ = fromString("ErGw2AZ");
+
+    /** Static value ErGw3AZ for VirtualNetworkGatewaySkuName. */
+    public static final VirtualNetworkGatewaySkuName ER_GW3AZ = fromString("ErGw3AZ");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewaySkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewaySkuName
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewaySkuName fromString(String name) {
+        return fromString(name, VirtualNetworkGatewaySkuName.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewaySkuName values
+     */
+    public static Collection<VirtualNetworkGatewaySkuName> values() {
+        return values(VirtualNetworkGatewaySkuName.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuTier.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuTier.java
new file mode 100644
index 000000000000..c466526ed595
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewaySkuTier.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewaySkuTier.
+ */
+public final class VirtualNetworkGatewaySkuTier extends ExpandableStringEnum<VirtualNetworkGatewaySkuTier> {
+    /** Static value Basic for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier BASIC = fromString("Basic");
+
+    /** Static value HighPerformance for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier HIGH_PERFORMANCE = fromString("HighPerformance");
+
+    /** Static value Standard for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier STANDARD = fromString("Standard");
+
+    /** Static value UltraPerformance for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier ULTRA_PERFORMANCE = fromString("UltraPerformance");
+
+    /** Static value VpnGw1 for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW1 = fromString("VpnGw1");
+
+    /** Static value VpnGw2 for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW2 = fromString("VpnGw2");
+
+    /** Static value VpnGw3 for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW3 = fromString("VpnGw3");
+
+    /** Static value VpnGw4 for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW4 = fromString("VpnGw4");
+
+    /** Static value VpnGw5 for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW5 = fromString("VpnGw5");
+
+    /** Static value VpnGw1AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW1AZ = fromString("VpnGw1AZ");
+
+    /** Static value VpnGw2AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW2AZ = fromString("VpnGw2AZ");
+
+    /** Static value VpnGw3AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW3AZ = fromString("VpnGw3AZ");
+
+    /** Static value VpnGw4AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW4AZ = fromString("VpnGw4AZ");
+
+    /** Static value VpnGw5AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier VPN_GW5AZ = fromString("VpnGw5AZ");
+
+    /** Static value ErGw1AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier ER_GW1AZ = fromString("ErGw1AZ");
+
+    /** Static value ErGw2AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier ER_GW2AZ = fromString("ErGw2AZ");
+
+    /** Static value ErGw3AZ for VirtualNetworkGatewaySkuTier. */
+    public static final VirtualNetworkGatewaySkuTier ER_GW3AZ = fromString("ErGw3AZ");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewaySkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewaySkuTier
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewaySkuTier fromString(String name) {
+        return fromString(name, VirtualNetworkGatewaySkuTier.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewaySkuTier values
+     */
+    public static Collection<VirtualNetworkGatewaySkuTier> values() {
+        return values(VirtualNetworkGatewaySkuTier.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayType.java
new file mode 100644
index 000000000000..02e1d636309f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGatewayType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkGatewayType.
+ */
+public final class VirtualNetworkGatewayType extends ExpandableStringEnum<VirtualNetworkGatewayType> {
+    /** Static value Vpn for VirtualNetworkGatewayType. */
+    public static final VirtualNetworkGatewayType VPN = fromString("Vpn");
+
+    /** Static value ExpressRoute for VirtualNetworkGatewayType. */
+    public static final VirtualNetworkGatewayType EXPRESS_ROUTE = fromString("ExpressRoute");
+
+    /**
+     * Creates or finds a VirtualNetworkGatewayType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkGatewayType
+     */
+    @JsonCreator
+    public static VirtualNetworkGatewayType fromString(String name) {
+        return fromString(name, VirtualNetworkGatewayType.class);
+    }
+
+    /**
+     * @return known VirtualNetworkGatewayType values
+     */
+    public static Collection<VirtualNetworkGatewayType> values() {
+        return values(VirtualNetworkGatewayType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateways.java
new file mode 100644
index 000000000000..c146846146ce
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkGateways.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.network.v2020_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 rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnClientIPsecParametersInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionListEntity;
+
+/**
+ * Type representing VirtualNetworkGateways.
+ */
+public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualNetworkGateway>, SupportsListingByResourceGroup<VirtualNetworkGateway>, HasInner<VirtualNetworkGatewaysInner> {
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkGateway> resetAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<BgpPeerStatusListResult> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Gets a xml format representation for supported vpn devices.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<GatewayRouteListResult> getLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<GatewayRouteListResult> getAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer);
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnClientIPsecParameters> setVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams);
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnClientIPsecParameters> getVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnClientConnectionHealthDetailListResult> getVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkGatewayConnectionListEntity> listConnectionsAsync(final String resourceGroupName, final String virtualNetworkGatewayName);
+
+    /**
+     * Gets a xml format representation for vpn device configuration script.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection for which the configuration script is generated.
+     * @param parameters Parameters supplied to the generate vpn device script operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeering.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeering.java
new file mode 100644
index 000000000000..c2a7812bed23
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeering.java
@@ -0,0 +1,345 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkPeeringInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing VirtualNetworkPeering.
+ */
+public interface VirtualNetworkPeering extends HasInner<VirtualNetworkPeeringInner>, Indexable, Refreshable<VirtualNetworkPeering>, Updatable<VirtualNetworkPeering.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the allowForwardedTraffic value.
+     */
+    Boolean allowForwardedTraffic();
+
+    /**
+     * @return the allowGatewayTransit value.
+     */
+    Boolean allowGatewayTransit();
+
+    /**
+     * @return the allowVirtualNetworkAccess value.
+     */
+    Boolean allowVirtualNetworkAccess();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peeringState value.
+     */
+    VirtualNetworkPeeringState peeringState();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the remoteAddressSpace value.
+     */
+    AddressSpace remoteAddressSpace();
+
+    /**
+     * @return the remoteVirtualNetwork value.
+     */
+    SubResource remoteVirtualNetwork();
+
+    /**
+     * @return the useRemoteGateways value.
+     */
+    Boolean useRemoteGateways();
+
+    /**
+     * The entirety of the VirtualNetworkPeering definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVirtualNetwork, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetworkPeering definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetworkPeering definition.
+         */
+        interface Blank extends WithVirtualNetwork {
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify VirtualNetwork.
+         */
+        interface WithVirtualNetwork {
+           /**
+            * Specifies resourceGroupName, virtualNetworkName.
+            * @param resourceGroupName The name of the resource group
+            * @param virtualNetworkName The name of the virtual network
+            * @return the next definition stage
+            */
+            WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify AllowForwardedTraffic.
+         */
+        interface WithAllowForwardedTraffic {
+            /**
+             * Specifies allowForwardedTraffic.
+             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network
+             * @return the next definition stage
+             */
+            WithCreate withAllowForwardedTraffic(Boolean allowForwardedTraffic);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify AllowGatewayTransit.
+         */
+        interface WithAllowGatewayTransit {
+            /**
+             * Specifies allowGatewayTransit.
+             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
+             * @return the next definition stage
+             */
+            WithCreate withAllowGatewayTransit(Boolean allowGatewayTransit);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify AllowVirtualNetworkAccess.
+         */
+        interface WithAllowVirtualNetworkAccess {
+            /**
+             * Specifies allowVirtualNetworkAccess.
+             * @param allowVirtualNetworkAccess Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space
+             * @return the next definition stage
+             */
+            WithCreate withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify PeeringState.
+         */
+        interface WithPeeringState {
+            /**
+             * Specifies peeringState.
+             * @param peeringState The status of the virtual network peering. Possible values include: 'Initiated', 'Connected', 'Disconnected'
+             * @return the next definition stage
+             */
+            WithCreate withPeeringState(VirtualNetworkPeeringState peeringState);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify RemoteAddressSpace.
+         */
+        interface WithRemoteAddressSpace {
+            /**
+             * Specifies remoteAddressSpace.
+             * @param remoteAddressSpace The reference to the remote virtual network address space
+             * @return the next definition stage
+             */
+            WithCreate withRemoteAddressSpace(AddressSpace remoteAddressSpace);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify RemoteVirtualNetwork.
+         */
+        interface WithRemoteVirtualNetwork {
+            /**
+             * Specifies remoteVirtualNetwork.
+             * @param remoteVirtualNetwork The reference to the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
+             * @return the next definition stage
+             */
+            WithCreate withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering definition allowing to specify UseRemoteGateways.
+         */
+        interface WithUseRemoteGateways {
+            /**
+             * Specifies useRemoteGateways.
+             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
+             * @return the next definition stage
+             */
+            WithCreate withUseRemoteGateways(Boolean useRemoteGateways);
+        }
+
+        /**
+         * 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<VirtualNetworkPeering>, DefinitionStages.WithAllowForwardedTraffic, DefinitionStages.WithAllowGatewayTransit, DefinitionStages.WithAllowVirtualNetworkAccess, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithPeeringState, DefinitionStages.WithRemoteAddressSpace, DefinitionStages.WithRemoteVirtualNetwork, DefinitionStages.WithUseRemoteGateways {
+        }
+    }
+    /**
+     * The template for a VirtualNetworkPeering update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetworkPeering>, UpdateStages.WithAllowForwardedTraffic, UpdateStages.WithAllowGatewayTransit, UpdateStages.WithAllowVirtualNetworkAccess, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPeeringState, UpdateStages.WithRemoteAddressSpace, UpdateStages.WithRemoteVirtualNetwork, UpdateStages.WithUseRemoteGateways {
+    }
+
+    /**
+     * Grouping of VirtualNetworkPeering update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify AllowForwardedTraffic.
+         */
+        interface WithAllowForwardedTraffic {
+            /**
+             * Specifies allowForwardedTraffic.
+             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network
+             * @return the next update stage
+             */
+            Update withAllowForwardedTraffic(Boolean allowForwardedTraffic);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify AllowGatewayTransit.
+         */
+        interface WithAllowGatewayTransit {
+            /**
+             * Specifies allowGatewayTransit.
+             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
+             * @return the next update stage
+             */
+            Update withAllowGatewayTransit(Boolean allowGatewayTransit);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify AllowVirtualNetworkAccess.
+         */
+        interface WithAllowVirtualNetworkAccess {
+            /**
+             * Specifies allowVirtualNetworkAccess.
+             * @param allowVirtualNetworkAccess Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space
+             * @return the next update stage
+             */
+            Update withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify PeeringState.
+         */
+        interface WithPeeringState {
+            /**
+             * Specifies peeringState.
+             * @param peeringState The status of the virtual network peering. Possible values include: 'Initiated', 'Connected', 'Disconnected'
+             * @return the next update stage
+             */
+            Update withPeeringState(VirtualNetworkPeeringState peeringState);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify RemoteAddressSpace.
+         */
+        interface WithRemoteAddressSpace {
+            /**
+             * Specifies remoteAddressSpace.
+             * @param remoteAddressSpace The reference to the remote virtual network address space
+             * @return the next update stage
+             */
+            Update withRemoteAddressSpace(AddressSpace remoteAddressSpace);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify RemoteVirtualNetwork.
+         */
+        interface WithRemoteVirtualNetwork {
+            /**
+             * Specifies remoteVirtualNetwork.
+             * @param remoteVirtualNetwork The reference to the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
+             * @return the next update stage
+             */
+            Update withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
+        }
+
+        /**
+         * The stage of the virtualnetworkpeering update allowing to specify UseRemoteGateways.
+         */
+        interface WithUseRemoteGateways {
+            /**
+             * Specifies useRemoteGateways.
+             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
+             * @return the next update stage
+             */
+            Update withUseRemoteGateways(Boolean useRemoteGateways);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeeringState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeeringState.java
new file mode 100644
index 000000000000..46cce5efbdad
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeeringState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualNetworkPeeringState.
+ */
+public final class VirtualNetworkPeeringState extends ExpandableStringEnum<VirtualNetworkPeeringState> {
+    /** Static value Initiated for VirtualNetworkPeeringState. */
+    public static final VirtualNetworkPeeringState INITIATED = fromString("Initiated");
+
+    /** Static value Connected for VirtualNetworkPeeringState. */
+    public static final VirtualNetworkPeeringState CONNECTED = fromString("Connected");
+
+    /** Static value Disconnected for VirtualNetworkPeeringState. */
+    public static final VirtualNetworkPeeringState DISCONNECTED = fromString("Disconnected");
+
+    /**
+     * Creates or finds a VirtualNetworkPeeringState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualNetworkPeeringState
+     */
+    @JsonCreator
+    public static VirtualNetworkPeeringState fromString(String name) {
+        return fromString(name, VirtualNetworkPeeringState.class);
+    }
+
+    /**
+     * @return known VirtualNetworkPeeringState values
+     */
+    public static Collection<VirtualNetworkPeeringState> values() {
+        return values(VirtualNetworkPeeringState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeerings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeerings.java
new file mode 100644
index 000000000000..cfdc0a357b7d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkPeerings.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkPeeringsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualNetworkPeerings.
+ */
+public interface VirtualNetworkPeerings extends SupportsCreating<VirtualNetworkPeering.DefinitionStages.Blank>, HasInner<VirtualNetworkPeeringsInner> {
+    /**
+     * Gets the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkPeering> getAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName);
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkPeering> listAsync(final String resourceGroupName, final String virtualNetworkName);
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTap.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTap.java
new file mode 100644
index 000000000000..99870eff2bf2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTap.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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.FrontendIPConfigurationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkTapInner;
+
+/**
+ * Type representing VirtualNetworkTap.
+ */
+public interface VirtualNetworkTap extends HasInner<VirtualNetworkTapInner>, Resource, GroupableResourceCore<NetworkManager, VirtualNetworkTapInner>, HasResourceGroup, Refreshable<VirtualNetworkTap>, Updatable<VirtualNetworkTap.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the destinationLoadBalancerFrontEndIPConfiguration value.
+     */
+    FrontendIPConfiguration destinationLoadBalancerFrontEndIPConfiguration();
+
+    /**
+     * @return the destinationNetworkInterfaceIPConfiguration value.
+     */
+    VirtualMachineScaleSetNetworkInterfaceIPConfiguration destinationNetworkInterfaceIPConfiguration();
+
+    /**
+     * @return the destinationPort value.
+     */
+    Integer destinationPort();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the networkInterfaceTapConfigurations value.
+     */
+    List<NetworkInterfaceTapConfiguration> networkInterfaceTapConfigurations();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceGuid value.
+     */
+    String resourceGuid();
+
+    /**
+     * The entirety of the VirtualNetworkTap definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetworkTap definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetworkTap definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualNetworkTap definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualnetworktap definition allowing to specify DestinationLoadBalancerFrontEndIPConfiguration.
+         */
+        interface WithDestinationLoadBalancerFrontEndIPConfiguration {
+            /**
+             * Specifies destinationLoadBalancerFrontEndIPConfiguration.
+             * @param destinationLoadBalancerFrontEndIPConfiguration The reference to the private IP address on the internal Load Balancer that will receive the tap
+             * @return the next definition stage
+             */
+            WithCreate withDestinationLoadBalancerFrontEndIPConfiguration(FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworktap definition allowing to specify DestinationNetworkInterfaceIPConfiguration.
+         */
+        interface WithDestinationNetworkInterfaceIPConfiguration {
+            /**
+             * Specifies destinationNetworkInterfaceIPConfiguration.
+             * @param destinationNetworkInterfaceIPConfiguration The reference to the private IP Address of the collector nic that will receive the tap
+             * @return the next definition stage
+             */
+            WithCreate withDestinationNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworktap definition allowing to specify DestinationPort.
+         */
+        interface WithDestinationPort {
+            /**
+             * Specifies destinationPort.
+             * @param destinationPort The VXLAN destination port that will receive the tapped traffic
+             * @return the next definition stage
+             */
+            WithCreate withDestinationPort(Integer destinationPort);
+        }
+
+        /**
+         * 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<VirtualNetworkTap>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithDestinationLoadBalancerFrontEndIPConfiguration, DefinitionStages.WithDestinationNetworkInterfaceIPConfiguration, DefinitionStages.WithDestinationPort {
+        }
+    }
+    /**
+     * The template for a VirtualNetworkTap update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetworkTap>, Resource.UpdateWithTags<Update>, UpdateStages.WithDestinationLoadBalancerFrontEndIPConfiguration, UpdateStages.WithDestinationNetworkInterfaceIPConfiguration, UpdateStages.WithDestinationPort {
+    }
+
+    /**
+     * Grouping of VirtualNetworkTap update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualnetworktap update allowing to specify DestinationLoadBalancerFrontEndIPConfiguration.
+         */
+        interface WithDestinationLoadBalancerFrontEndIPConfiguration {
+            /**
+             * Specifies destinationLoadBalancerFrontEndIPConfiguration.
+             * @param destinationLoadBalancerFrontEndIPConfiguration The reference to the private IP address on the internal Load Balancer that will receive the tap
+             * @return the next update stage
+             */
+            Update withDestinationLoadBalancerFrontEndIPConfiguration(FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworktap update allowing to specify DestinationNetworkInterfaceIPConfiguration.
+         */
+        interface WithDestinationNetworkInterfaceIPConfiguration {
+            /**
+             * Specifies destinationNetworkInterfaceIPConfiguration.
+             * @param destinationNetworkInterfaceIPConfiguration The reference to the private IP Address of the collector nic that will receive the tap
+             * @return the next update stage
+             */
+            Update withDestinationNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration);
+        }
+
+        /**
+         * The stage of the virtualnetworktap update allowing to specify DestinationPort.
+         */
+        interface WithDestinationPort {
+            /**
+             * Specifies destinationPort.
+             * @param destinationPort The VXLAN destination port that will receive the tapped traffic
+             * @return the next update stage
+             */
+            Update withDestinationPort(Integer destinationPort);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTaps.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTaps.java
new file mode 100644
index 000000000000..2877df6e4844
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkTaps.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VirtualNetworkTapsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualNetworkTaps.
+ */
+public interface VirtualNetworkTaps extends SupportsCreating<VirtualNetworkTap.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualNetworkTap>, SupportsListingByResourceGroup<VirtualNetworkTap>, SupportsListing<VirtualNetworkTap>, HasInner<VirtualNetworkTapsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsage.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsage.java
new file mode 100644
index 000000000000..618f3c59e7ac
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsage.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkUsageInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing VirtualNetworkUsage.
+ */
+public interface VirtualNetworkUsage extends HasInner<VirtualNetworkUsageInner>, HasManager<NetworkManager> {
+    /**
+     * @return the currentValue value.
+     */
+    Double currentValue();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the limit value.
+     */
+    Double limit();
+
+    /**
+     * @return the name value.
+     */
+    VirtualNetworkUsageName name();
+
+    /**
+     * @return the unit value.
+     */
+    String unit();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsageName.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsageName.java
new file mode 100644
index 000000000000..fe8a2e77a8eb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworkUsageName.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Usage strings container.
+ */
+public class VirtualNetworkUsageName {
+    /**
+     * Localized subnet size and usage string.
+     */
+    @JsonProperty(value = "localizedValue", access = JsonProperty.Access.WRITE_ONLY)
+    private String localizedValue;
+
+    /**
+     * Subnet size and usage string.
+     */
+    @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
+    private String value;
+
+    /**
+     * Get localized subnet size and usage string.
+     *
+     * @return the localizedValue value
+     */
+    public String localizedValue() {
+        return this.localizedValue;
+    }
+
+    /**
+     * Get subnet size and usage string.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworks.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworks.java
new file mode 100644
index 000000000000..84daf42a246c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualNetworks.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.network.v2020_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.network.v2020_04_01.implementation.VirtualNetworksInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkUsage;
+
+/**
+ * Type representing VirtualNetworks.
+ */
+public interface VirtualNetworks extends SupportsCreating<VirtualNetwork.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualNetwork>, SupportsListingByResourceGroup<VirtualNetwork>, SupportsListing<VirtualNetwork>, HasInner<VirtualNetworksInner> {
+    /**
+     * Checks whether a private IP address is available for use.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param ipAddress The private IP address to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<IPAddressAvailabilityResult> checkIPAddressAvailabilityAsync(String resourceGroupName, String virtualNetworkName, String ipAddress);
+
+    /**
+     * Lists usage stats.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkUsage> listUsageAsync(final String resourceGroupName, final String virtualNetworkName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouter.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouter.java
new file mode 100644
index 000000000000..85879270e290
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouter.java
@@ -0,0 +1,201 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualRouterInner;
+
+/**
+ * Type representing VirtualRouter.
+ */
+public interface VirtualRouter extends HasInner<VirtualRouterInner>, Resource, GroupableResourceCore<NetworkManager, VirtualRouterInner>, HasResourceGroup, Refreshable<VirtualRouter>, Updatable<VirtualRouter.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the hostedGateway value.
+     */
+    SubResource hostedGateway();
+
+    /**
+     * @return the hostedSubnet value.
+     */
+    SubResource hostedSubnet();
+
+    /**
+     * @return the peerings value.
+     */
+    List<SubResource> peerings();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the virtualRouterAsn value.
+     */
+    Long virtualRouterAsn();
+
+    /**
+     * @return the virtualRouterIps value.
+     */
+    List<String> virtualRouterIps();
+
+    /**
+     * The entirety of the VirtualRouter definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualRouter definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualRouter definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualRouter definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualrouter definition allowing to specify HostedGateway.
+         */
+        interface WithHostedGateway {
+            /**
+             * Specifies hostedGateway.
+             * @param hostedGateway The Gateway on which VirtualRouter is hosted
+             * @return the next definition stage
+             */
+            WithCreate withHostedGateway(SubResource hostedGateway);
+        }
+
+        /**
+         * The stage of the virtualrouter definition allowing to specify HostedSubnet.
+         */
+        interface WithHostedSubnet {
+            /**
+             * Specifies hostedSubnet.
+             * @param hostedSubnet The Subnet on which VirtualRouter is hosted
+             * @return the next definition stage
+             */
+            WithCreate withHostedSubnet(SubResource hostedSubnet);
+        }
+
+        /**
+         * The stage of the virtualrouter definition allowing to specify VirtualRouterAsn.
+         */
+        interface WithVirtualRouterAsn {
+            /**
+             * Specifies virtualRouterAsn.
+             * @param virtualRouterAsn VirtualRouter ASN
+             * @return the next definition stage
+             */
+            WithCreate withVirtualRouterAsn(Long virtualRouterAsn);
+        }
+
+        /**
+         * The stage of the virtualrouter definition allowing to specify VirtualRouterIps.
+         */
+        interface WithVirtualRouterIps {
+            /**
+             * Specifies virtualRouterIps.
+             * @param virtualRouterIps VirtualRouter IPs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualRouterIps(List<String> virtualRouterIps);
+        }
+
+        /**
+         * 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<VirtualRouter>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithHostedGateway, DefinitionStages.WithHostedSubnet, DefinitionStages.WithVirtualRouterAsn, DefinitionStages.WithVirtualRouterIps {
+        }
+    }
+    /**
+     * The template for a VirtualRouter update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualRouter>, Resource.UpdateWithTags<Update>, UpdateStages.WithHostedGateway, UpdateStages.WithHostedSubnet, UpdateStages.WithVirtualRouterAsn, UpdateStages.WithVirtualRouterIps {
+    }
+
+    /**
+     * Grouping of VirtualRouter update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualrouter update allowing to specify HostedGateway.
+         */
+        interface WithHostedGateway {
+            /**
+             * Specifies hostedGateway.
+             * @param hostedGateway The Gateway on which VirtualRouter is hosted
+             * @return the next update stage
+             */
+            Update withHostedGateway(SubResource hostedGateway);
+        }
+
+        /**
+         * The stage of the virtualrouter update allowing to specify HostedSubnet.
+         */
+        interface WithHostedSubnet {
+            /**
+             * Specifies hostedSubnet.
+             * @param hostedSubnet The Subnet on which VirtualRouter is hosted
+             * @return the next update stage
+             */
+            Update withHostedSubnet(SubResource hostedSubnet);
+        }
+
+        /**
+         * The stage of the virtualrouter update allowing to specify VirtualRouterAsn.
+         */
+        interface WithVirtualRouterAsn {
+            /**
+             * Specifies virtualRouterAsn.
+             * @param virtualRouterAsn VirtualRouter ASN
+             * @return the next update stage
+             */
+            Update withVirtualRouterAsn(Long virtualRouterAsn);
+        }
+
+        /**
+         * The stage of the virtualrouter update allowing to specify VirtualRouterIps.
+         */
+        interface WithVirtualRouterIps {
+            /**
+             * Specifies virtualRouterIps.
+             * @param virtualRouterIps VirtualRouter IPs
+             * @return the next update stage
+             */
+            Update withVirtualRouterIps(List<String> virtualRouterIps);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeering.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeering.java
new file mode 100644
index 000000000000..23e1cf2767f7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeering.java
@@ -0,0 +1,204 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualRouterPeeringInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing VirtualRouterPeering.
+ */
+public interface VirtualRouterPeering extends HasInner<VirtualRouterPeeringInner>, Indexable, Refreshable<VirtualRouterPeering>, Updatable<VirtualRouterPeering.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the peerAsn value.
+     */
+    Long peerAsn();
+
+    /**
+     * @return the peerIp value.
+     */
+    String peerIp();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the VirtualRouterPeering definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVirtualRouter, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualRouterPeering definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualRouterPeering definition.
+         */
+        interface Blank extends WithVirtualRouter {
+        }
+
+        /**
+         * The stage of the virtualrouterpeering definition allowing to specify VirtualRouter.
+         */
+        interface WithVirtualRouter {
+           /**
+            * Specifies resourceGroupName, virtualRouterName.
+            * @param resourceGroupName The name of the resource group
+            * @param virtualRouterName The name of the Virtual Router
+            * @return the next definition stage
+            */
+            WithCreate withExistingVirtualRouter(String resourceGroupName, String virtualRouterName);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name Name of the virtual router peering that is unique within a virtual router
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering definition allowing to specify PeerAsn.
+         */
+        interface WithPeerAsn {
+            /**
+             * Specifies peerAsn.
+             * @param peerAsn Peer ASN
+             * @return the next definition stage
+             */
+            WithCreate withPeerAsn(Long peerAsn);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering definition allowing to specify PeerIp.
+         */
+        interface WithPeerIp {
+            /**
+             * Specifies peerIp.
+             * @param peerIp Peer IP
+             * @return the next definition stage
+             */
+            WithCreate withPeerIp(String peerIp);
+        }
+
+        /**
+         * 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<VirtualRouterPeering>, DefinitionStages.WithId, DefinitionStages.WithName, DefinitionStages.WithPeerAsn, DefinitionStages.WithPeerIp {
+        }
+    }
+    /**
+     * The template for a VirtualRouterPeering update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualRouterPeering>, UpdateStages.WithId, UpdateStages.WithName, UpdateStages.WithPeerAsn, UpdateStages.WithPeerIp {
+    }
+
+    /**
+     * Grouping of VirtualRouterPeering update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualrouterpeering update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name Name of the virtual router peering that is unique within a virtual router
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering update allowing to specify PeerAsn.
+         */
+        interface WithPeerAsn {
+            /**
+             * Specifies peerAsn.
+             * @param peerAsn Peer ASN
+             * @return the next update stage
+             */
+            Update withPeerAsn(Long peerAsn);
+        }
+
+        /**
+         * The stage of the virtualrouterpeering update allowing to specify PeerIp.
+         */
+        interface WithPeerIp {
+            /**
+             * Specifies peerIp.
+             * @param peerIp Peer IP
+             * @return the next update stage
+             */
+            Update withPeerIp(String peerIp);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeerings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeerings.java
new file mode 100644
index 000000000000..9a941230cee4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouterPeerings.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualRouterPeeringsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualRouterPeerings.
+ */
+public interface VirtualRouterPeerings extends SupportsCreating<VirtualRouterPeering.DefinitionStages.Blank>, HasInner<VirtualRouterPeeringsInner> {
+    /**
+     * Gets the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualRouterPeering> getAsync(String resourceGroupName, String virtualRouterName, String peeringName);
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualRouterPeering> listAsync(final String resourceGroupName, final String virtualRouterName);
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String virtualRouterName, String peeringName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouters.java
new file mode 100644
index 000000000000..41e16ae93955
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualRouters.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VirtualRoutersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualRouters.
+ */
+public interface VirtualRouters extends SupportsCreating<VirtualRouter.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualRouter>, SupportsListingByResourceGroup<VirtualRouter>, SupportsListing<VirtualRouter>, HasInner<VirtualRoutersInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWAN.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWAN.java
new file mode 100644
index 000000000000..6a20f16058ca
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWAN.java
@@ -0,0 +1,235 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualWANInner;
+
+/**
+ * Type representing VirtualWAN.
+ */
+public interface VirtualWAN extends HasInner<VirtualWANInner>, Resource, GroupableResourceCore<NetworkManager, VirtualWANInner>, HasResourceGroup, Refreshable<VirtualWAN>, Updatable<VirtualWAN.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the allowBranchToBranchTraffic value.
+     */
+    Boolean allowBranchToBranchTraffic();
+
+    /**
+     * @return the allowVnetToVnetTraffic value.
+     */
+    Boolean allowVnetToVnetTraffic();
+
+    /**
+     * @return the disableVpnEncryption value.
+     */
+    Boolean disableVpnEncryption();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the office365LocalBreakoutCategory value.
+     */
+    OfficeTrafficCategory office365LocalBreakoutCategory();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the virtualHubs value.
+     */
+    List<SubResource> virtualHubs();
+
+    /**
+     * @return the virtualWANType value.
+     */
+    String virtualWANType();
+
+    /**
+     * @return the vpnSites value.
+     */
+    List<SubResource> vpnSites();
+
+    /**
+     * The entirety of the VirtualWAN definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualWAN definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualWAN definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VirtualWAN definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the virtualwan definition allowing to specify AllowBranchToBranchTraffic.
+         */
+        interface WithAllowBranchToBranchTraffic {
+            /**
+             * Specifies allowBranchToBranchTraffic.
+             * @param allowBranchToBranchTraffic True if branch to branch traffic is allowed
+             * @return the next definition stage
+             */
+            WithCreate withAllowBranchToBranchTraffic(Boolean allowBranchToBranchTraffic);
+        }
+
+        /**
+         * The stage of the virtualwan definition allowing to specify AllowVnetToVnetTraffic.
+         */
+        interface WithAllowVnetToVnetTraffic {
+            /**
+             * Specifies allowVnetToVnetTraffic.
+             * @param allowVnetToVnetTraffic True if Vnet to Vnet traffic is allowed
+             * @return the next definition stage
+             */
+            WithCreate withAllowVnetToVnetTraffic(Boolean allowVnetToVnetTraffic);
+        }
+
+        /**
+         * The stage of the virtualwan definition allowing to specify DisableVpnEncryption.
+         */
+        interface WithDisableVpnEncryption {
+            /**
+             * Specifies disableVpnEncryption.
+             * @param disableVpnEncryption Vpn encryption to be disabled or not
+             * @return the next definition stage
+             */
+            WithCreate withDisableVpnEncryption(Boolean disableVpnEncryption);
+        }
+
+        /**
+         * The stage of the virtualwan definition allowing to specify Office365LocalBreakoutCategory.
+         */
+        interface WithOffice365LocalBreakoutCategory {
+            /**
+             * Specifies office365LocalBreakoutCategory.
+             * @param office365LocalBreakoutCategory The office local breakout category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', 'None'
+             * @return the next definition stage
+             */
+            WithCreate withOffice365LocalBreakoutCategory(OfficeTrafficCategory office365LocalBreakoutCategory);
+        }
+
+        /**
+         * The stage of the virtualwan definition allowing to specify VirtualWANType.
+         */
+        interface WithVirtualWANType {
+            /**
+             * Specifies virtualWANType.
+             * @param virtualWANType The type of the VirtualWAN
+             * @return the next definition stage
+             */
+            WithCreate withVirtualWANType(String virtualWANType);
+        }
+
+        /**
+         * 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<VirtualWAN>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAllowBranchToBranchTraffic, DefinitionStages.WithAllowVnetToVnetTraffic, DefinitionStages.WithDisableVpnEncryption, DefinitionStages.WithOffice365LocalBreakoutCategory, DefinitionStages.WithVirtualWANType {
+        }
+    }
+    /**
+     * The template for a VirtualWAN update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualWAN>, Resource.UpdateWithTags<Update>, UpdateStages.WithAllowBranchToBranchTraffic, UpdateStages.WithAllowVnetToVnetTraffic, UpdateStages.WithDisableVpnEncryption, UpdateStages.WithOffice365LocalBreakoutCategory, UpdateStages.WithVirtualWANType {
+    }
+
+    /**
+     * Grouping of VirtualWAN update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the virtualwan update allowing to specify AllowBranchToBranchTraffic.
+         */
+        interface WithAllowBranchToBranchTraffic {
+            /**
+             * Specifies allowBranchToBranchTraffic.
+             * @param allowBranchToBranchTraffic True if branch to branch traffic is allowed
+             * @return the next update stage
+             */
+            Update withAllowBranchToBranchTraffic(Boolean allowBranchToBranchTraffic);
+        }
+
+        /**
+         * The stage of the virtualwan update allowing to specify AllowVnetToVnetTraffic.
+         */
+        interface WithAllowVnetToVnetTraffic {
+            /**
+             * Specifies allowVnetToVnetTraffic.
+             * @param allowVnetToVnetTraffic True if Vnet to Vnet traffic is allowed
+             * @return the next update stage
+             */
+            Update withAllowVnetToVnetTraffic(Boolean allowVnetToVnetTraffic);
+        }
+
+        /**
+         * The stage of the virtualwan update allowing to specify DisableVpnEncryption.
+         */
+        interface WithDisableVpnEncryption {
+            /**
+             * Specifies disableVpnEncryption.
+             * @param disableVpnEncryption Vpn encryption to be disabled or not
+             * @return the next update stage
+             */
+            Update withDisableVpnEncryption(Boolean disableVpnEncryption);
+        }
+
+        /**
+         * The stage of the virtualwan update allowing to specify Office365LocalBreakoutCategory.
+         */
+        interface WithOffice365LocalBreakoutCategory {
+            /**
+             * Specifies office365LocalBreakoutCategory.
+             * @param office365LocalBreakoutCategory The office local breakout category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', 'None'
+             * @return the next update stage
+             */
+            Update withOffice365LocalBreakoutCategory(OfficeTrafficCategory office365LocalBreakoutCategory);
+        }
+
+        /**
+         * The stage of the virtualwan update allowing to specify VirtualWANType.
+         */
+        interface WithVirtualWANType {
+            /**
+             * Specifies virtualWANType.
+             * @param virtualWANType The type of the VirtualWAN
+             * @return the next update stage
+             */
+            Update withVirtualWANType(String virtualWANType);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProvider.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProvider.java
new file mode 100644
index 000000000000..4d73f0a6a99a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProvider.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Collection of SecurityProviders.
+ */
+public class VirtualWanSecurityProvider {
+    /**
+     * Name of the security provider.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Url of the security provider.
+     */
+    @JsonProperty(value = "url")
+    private String url;
+
+    /**
+     * Name of the security provider. Possible values include: 'External',
+     * 'Native'.
+     */
+    @JsonProperty(value = "type")
+    private VirtualWanSecurityProviderType type;
+
+    /**
+     * Get name of the security provider.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the security provider.
+     *
+     * @param name the name value to set
+     * @return the VirtualWanSecurityProvider object itself.
+     */
+    public VirtualWanSecurityProvider withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get url of the security provider.
+     *
+     * @return the url value
+     */
+    public String url() {
+        return this.url;
+    }
+
+    /**
+     * Set url of the security provider.
+     *
+     * @param url the url value to set
+     * @return the VirtualWanSecurityProvider object itself.
+     */
+    public VirtualWanSecurityProvider withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * Get name of the security provider. Possible values include: 'External', 'Native'.
+     *
+     * @return the type value
+     */
+    public VirtualWanSecurityProviderType type() {
+        return this.type;
+    }
+
+    /**
+     * Set name of the security provider. Possible values include: 'External', 'Native'.
+     *
+     * @param type the type value to set
+     * @return the VirtualWanSecurityProvider object itself.
+     */
+    public VirtualWanSecurityProvider withType(VirtualWanSecurityProviderType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProviderType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProviderType.java
new file mode 100644
index 000000000000..2918fd0724a3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanSecurityProviderType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VirtualWanSecurityProviderType.
+ */
+public final class VirtualWanSecurityProviderType extends ExpandableStringEnum<VirtualWanSecurityProviderType> {
+    /** Static value External for VirtualWanSecurityProviderType. */
+    public static final VirtualWanSecurityProviderType EXTERNAL = fromString("External");
+
+    /** Static value Native for VirtualWanSecurityProviderType. */
+    public static final VirtualWanSecurityProviderType NATIVE = fromString("Native");
+
+    /**
+     * Creates or finds a VirtualWanSecurityProviderType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VirtualWanSecurityProviderType
+     */
+    @JsonCreator
+    public static VirtualWanSecurityProviderType fromString(String name) {
+        return fromString(name, VirtualWanSecurityProviderType.class);
+    }
+
+    /**
+     * @return known VirtualWanSecurityProviderType values
+     */
+    public static Collection<VirtualWanSecurityProviderType> values() {
+        return values(VirtualWanSecurityProviderType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanVpnProfileParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanVpnProfileParameters.java
new file mode 100644
index 000000000000..d88278ec08b7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWanVpnProfileParameters.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Virtual Wan Vpn profile parameters Vpn profile generation.
+ */
+public class VirtualWanVpnProfileParameters {
+    /**
+     * VpnServerConfiguration partial resource uri with which VirtualWan is
+     * associated to.
+     */
+    @JsonProperty(value = "vpnServerConfigurationResourceId")
+    private String vpnServerConfigurationResourceId;
+
+    /**
+     * VPN client authentication method. Possible values include: 'EAPTLS',
+     * 'EAPMSCHAPv2'.
+     */
+    @JsonProperty(value = "authenticationMethod")
+    private AuthenticationMethod authenticationMethod;
+
+    /**
+     * Get vpnServerConfiguration partial resource uri with which VirtualWan is associated to.
+     *
+     * @return the vpnServerConfigurationResourceId value
+     */
+    public String vpnServerConfigurationResourceId() {
+        return this.vpnServerConfigurationResourceId;
+    }
+
+    /**
+     * Set vpnServerConfiguration partial resource uri with which VirtualWan is associated to.
+     *
+     * @param vpnServerConfigurationResourceId the vpnServerConfigurationResourceId value to set
+     * @return the VirtualWanVpnProfileParameters object itself.
+     */
+    public VirtualWanVpnProfileParameters withVpnServerConfigurationResourceId(String vpnServerConfigurationResourceId) {
+        this.vpnServerConfigurationResourceId = vpnServerConfigurationResourceId;
+        return this;
+    }
+
+    /**
+     * Get vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @return the authenticationMethod value
+     */
+    public AuthenticationMethod authenticationMethod() {
+        return this.authenticationMethod;
+    }
+
+    /**
+     * Set vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @param authenticationMethod the authenticationMethod value to set
+     * @return the VirtualWanVpnProfileParameters object itself.
+     */
+    public VirtualWanVpnProfileParameters withAuthenticationMethod(AuthenticationMethod authenticationMethod) {
+        this.authenticationMethod = authenticationMethod;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWans.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWans.java
new file mode 100644
index 000000000000..b363ac1bca35
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VirtualWans.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VirtualWansInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VirtualWans.
+ */
+public interface VirtualWans extends SupportsCreating<VirtualWAN.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualWAN>, SupportsListingByResourceGroup<VirtualWAN>, SupportsListing<VirtualWAN>, HasInner<VirtualWansInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VnetRoute.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VnetRoute.java
new file mode 100644
index 000000000000..84d3758a9006
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VnetRoute.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of routes that control routing from VirtualHub into a virtual network
+ * connection.
+ */
+public class VnetRoute {
+    /**
+     * List of all Static Routes.
+     */
+    @JsonProperty(value = "staticRoutes")
+    private List<StaticRoute> staticRoutes;
+
+    /**
+     * Get list of all Static Routes.
+     *
+     * @return the staticRoutes value
+     */
+    public List<StaticRoute> staticRoutes() {
+        return this.staticRoutes;
+    }
+
+    /**
+     * Set list of all Static Routes.
+     *
+     * @param staticRoutes the staticRoutes value to set
+     * @return the VnetRoute object itself.
+     */
+    public VnetRoute withStaticRoutes(List<StaticRoute> staticRoutes) {
+        this.staticRoutes = staticRoutes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnAuthenticationType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnAuthenticationType.java
new file mode 100644
index 000000000000..82af7c34a670
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnAuthenticationType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnAuthenticationType.
+ */
+public final class VpnAuthenticationType extends ExpandableStringEnum<VpnAuthenticationType> {
+    /** Static value Certificate for VpnAuthenticationType. */
+    public static final VpnAuthenticationType CERTIFICATE = fromString("Certificate");
+
+    /** Static value Radius for VpnAuthenticationType. */
+    public static final VpnAuthenticationType RADIUS = fromString("Radius");
+
+    /** Static value AAD for VpnAuthenticationType. */
+    public static final VpnAuthenticationType AAD = fromString("AAD");
+
+    /**
+     * Creates or finds a VpnAuthenticationType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnAuthenticationType
+     */
+    @JsonCreator
+    public static VpnAuthenticationType fromString(String name) {
+        return fromString(name, VpnAuthenticationType.class);
+    }
+
+    /**
+     * @return known VpnAuthenticationType values
+     */
+    public static Collection<VpnAuthenticationType> values() {
+        return values(VpnAuthenticationType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConfiguration.java
new file mode 100644
index 000000000000..a3abc3d29d4a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConfiguration.java
@@ -0,0 +1,310 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VpnClientConfiguration for P2S client.
+ */
+public class VpnClientConfiguration {
+    /**
+     * The reference to the address space resource which represents Address
+     * space for P2S VpnClient.
+     */
+    @JsonProperty(value = "vpnClientAddressPool")
+    private AddressSpace vpnClientAddressPool;
+
+    /**
+     * VpnClientRootCertificate for virtual network gateway.
+     */
+    @JsonProperty(value = "vpnClientRootCertificates")
+    private List<VpnClientRootCertificate> vpnClientRootCertificates;
+
+    /**
+     * VpnClientRevokedCertificate for Virtual network gateway.
+     */
+    @JsonProperty(value = "vpnClientRevokedCertificates")
+    private List<VpnClientRevokedCertificate> vpnClientRevokedCertificates;
+
+    /**
+     * VpnClientProtocols for Virtual network gateway.
+     */
+    @JsonProperty(value = "vpnClientProtocols")
+    private List<VpnClientProtocol> vpnClientProtocols;
+
+    /**
+     * VpnClientIpsecPolicies for virtual network gateway P2S client.
+     */
+    @JsonProperty(value = "vpnClientIpsecPolicies")
+    private List<IpsecPolicy> vpnClientIpsecPolicies;
+
+    /**
+     * The radius server address property of the VirtualNetworkGateway resource
+     * for vpn client connection.
+     */
+    @JsonProperty(value = "radiusServerAddress")
+    private String radiusServerAddress;
+
+    /**
+     * The radius secret property of the VirtualNetworkGateway resource for vpn
+     * client connection.
+     */
+    @JsonProperty(value = "radiusServerSecret")
+    private String radiusServerSecret;
+
+    /**
+     * The radiusServers property for multiple radius server configuration.
+     */
+    @JsonProperty(value = "radiusServers")
+    private List<RadiusServer> radiusServers;
+
+    /**
+     * The AADTenant property of the VirtualNetworkGateway resource for vpn
+     * client connection used for AAD authentication.
+     */
+    @JsonProperty(value = "aadTenant")
+    private String aadTenant;
+
+    /**
+     * The AADAudience property of the VirtualNetworkGateway resource for vpn
+     * client connection used for AAD authentication.
+     */
+    @JsonProperty(value = "aadAudience")
+    private String aadAudience;
+
+    /**
+     * The AADIssuer property of the VirtualNetworkGateway resource for vpn
+     * client connection used for AAD authentication.
+     */
+    @JsonProperty(value = "aadIssuer")
+    private String aadIssuer;
+
+    /**
+     * Get the reference to the address space resource which represents Address space for P2S VpnClient.
+     *
+     * @return the vpnClientAddressPool value
+     */
+    public AddressSpace vpnClientAddressPool() {
+        return this.vpnClientAddressPool;
+    }
+
+    /**
+     * Set the reference to the address space resource which represents Address space for P2S VpnClient.
+     *
+     * @param vpnClientAddressPool the vpnClientAddressPool value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withVpnClientAddressPool(AddressSpace vpnClientAddressPool) {
+        this.vpnClientAddressPool = vpnClientAddressPool;
+        return this;
+    }
+
+    /**
+     * Get vpnClientRootCertificate for virtual network gateway.
+     *
+     * @return the vpnClientRootCertificates value
+     */
+    public List<VpnClientRootCertificate> vpnClientRootCertificates() {
+        return this.vpnClientRootCertificates;
+    }
+
+    /**
+     * Set vpnClientRootCertificate for virtual network gateway.
+     *
+     * @param vpnClientRootCertificates the vpnClientRootCertificates value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withVpnClientRootCertificates(List<VpnClientRootCertificate> vpnClientRootCertificates) {
+        this.vpnClientRootCertificates = vpnClientRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get vpnClientRevokedCertificate for Virtual network gateway.
+     *
+     * @return the vpnClientRevokedCertificates value
+     */
+    public List<VpnClientRevokedCertificate> vpnClientRevokedCertificates() {
+        return this.vpnClientRevokedCertificates;
+    }
+
+    /**
+     * Set vpnClientRevokedCertificate for Virtual network gateway.
+     *
+     * @param vpnClientRevokedCertificates the vpnClientRevokedCertificates value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withVpnClientRevokedCertificates(List<VpnClientRevokedCertificate> vpnClientRevokedCertificates) {
+        this.vpnClientRevokedCertificates = vpnClientRevokedCertificates;
+        return this;
+    }
+
+    /**
+     * Get vpnClientProtocols for Virtual network gateway.
+     *
+     * @return the vpnClientProtocols value
+     */
+    public List<VpnClientProtocol> vpnClientProtocols() {
+        return this.vpnClientProtocols;
+    }
+
+    /**
+     * Set vpnClientProtocols for Virtual network gateway.
+     *
+     * @param vpnClientProtocols the vpnClientProtocols value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withVpnClientProtocols(List<VpnClientProtocol> vpnClientProtocols) {
+        this.vpnClientProtocols = vpnClientProtocols;
+        return this;
+    }
+
+    /**
+     * Get vpnClientIpsecPolicies for virtual network gateway P2S client.
+     *
+     * @return the vpnClientIpsecPolicies value
+     */
+    public List<IpsecPolicy> vpnClientIpsecPolicies() {
+        return this.vpnClientIpsecPolicies;
+    }
+
+    /**
+     * Set vpnClientIpsecPolicies for virtual network gateway P2S client.
+     *
+     * @param vpnClientIpsecPolicies the vpnClientIpsecPolicies value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withVpnClientIpsecPolicies(List<IpsecPolicy> vpnClientIpsecPolicies) {
+        this.vpnClientIpsecPolicies = vpnClientIpsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get the radius server address property of the VirtualNetworkGateway resource for vpn client connection.
+     *
+     * @return the radiusServerAddress value
+     */
+    public String radiusServerAddress() {
+        return this.radiusServerAddress;
+    }
+
+    /**
+     * Set the radius server address property of the VirtualNetworkGateway resource for vpn client connection.
+     *
+     * @param radiusServerAddress the radiusServerAddress value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withRadiusServerAddress(String radiusServerAddress) {
+        this.radiusServerAddress = radiusServerAddress;
+        return this;
+    }
+
+    /**
+     * Get the radius secret property of the VirtualNetworkGateway resource for vpn client connection.
+     *
+     * @return the radiusServerSecret value
+     */
+    public String radiusServerSecret() {
+        return this.radiusServerSecret;
+    }
+
+    /**
+     * Set the radius secret property of the VirtualNetworkGateway resource for vpn client connection.
+     *
+     * @param radiusServerSecret the radiusServerSecret value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withRadiusServerSecret(String radiusServerSecret) {
+        this.radiusServerSecret = radiusServerSecret;
+        return this;
+    }
+
+    /**
+     * Get the radiusServers property for multiple radius server configuration.
+     *
+     * @return the radiusServers value
+     */
+    public List<RadiusServer> radiusServers() {
+        return this.radiusServers;
+    }
+
+    /**
+     * Set the radiusServers property for multiple radius server configuration.
+     *
+     * @param radiusServers the radiusServers value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withRadiusServers(List<RadiusServer> radiusServers) {
+        this.radiusServers = radiusServers;
+        return this;
+    }
+
+    /**
+     * Get the AADTenant property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @return the aadTenant value
+     */
+    public String aadTenant() {
+        return this.aadTenant;
+    }
+
+    /**
+     * Set the AADTenant property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @param aadTenant the aadTenant value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withAadTenant(String aadTenant) {
+        this.aadTenant = aadTenant;
+        return this;
+    }
+
+    /**
+     * Get the AADAudience property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @return the aadAudience value
+     */
+    public String aadAudience() {
+        return this.aadAudience;
+    }
+
+    /**
+     * Set the AADAudience property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @param aadAudience the aadAudience value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withAadAudience(String aadAudience) {
+        this.aadAudience = aadAudience;
+        return this;
+    }
+
+    /**
+     * Get the AADIssuer property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @return the aadIssuer value
+     */
+    public String aadIssuer() {
+        return this.aadIssuer;
+    }
+
+    /**
+     * Set the AADIssuer property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication.
+     *
+     * @param aadIssuer the aadIssuer value to set
+     * @return the VpnClientConfiguration object itself.
+     */
+    public VpnClientConfiguration withAadIssuer(String aadIssuer) {
+        this.aadIssuer = aadIssuer;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealth.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealth.java
new file mode 100644
index 000000000000..4184fde51d46
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealth.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VpnClientConnectionHealth properties.
+ */
+public class VpnClientConnectionHealth {
+    /**
+     * Total of the Ingress Bytes Transferred in this P2S Vpn connection.
+     */
+    @JsonProperty(value = "totalIngressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long totalIngressBytesTransferred;
+
+    /**
+     * Total of the Egress Bytes Transferred in this connection.
+     */
+    @JsonProperty(value = "totalEgressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long totalEgressBytesTransferred;
+
+    /**
+     * The total of p2s vpn clients connected at this time to this
+     * P2SVpnGateway.
+     */
+    @JsonProperty(value = "vpnClientConnectionsCount")
+    private Integer vpnClientConnectionsCount;
+
+    /**
+     * List of allocated ip addresses to the connected p2s vpn clients.
+     */
+    @JsonProperty(value = "allocatedIpAddresses")
+    private List<String> allocatedIpAddresses;
+
+    /**
+     * Get total of the Ingress Bytes Transferred in this P2S Vpn connection.
+     *
+     * @return the totalIngressBytesTransferred value
+     */
+    public Long totalIngressBytesTransferred() {
+        return this.totalIngressBytesTransferred;
+    }
+
+    /**
+     * Get total of the Egress Bytes Transferred in this connection.
+     *
+     * @return the totalEgressBytesTransferred value
+     */
+    public Long totalEgressBytesTransferred() {
+        return this.totalEgressBytesTransferred;
+    }
+
+    /**
+     * Get the total of p2s vpn clients connected at this time to this P2SVpnGateway.
+     *
+     * @return the vpnClientConnectionsCount value
+     */
+    public Integer vpnClientConnectionsCount() {
+        return this.vpnClientConnectionsCount;
+    }
+
+    /**
+     * Set the total of p2s vpn clients connected at this time to this P2SVpnGateway.
+     *
+     * @param vpnClientConnectionsCount the vpnClientConnectionsCount value to set
+     * @return the VpnClientConnectionHealth object itself.
+     */
+    public VpnClientConnectionHealth withVpnClientConnectionsCount(Integer vpnClientConnectionsCount) {
+        this.vpnClientConnectionsCount = vpnClientConnectionsCount;
+        return this;
+    }
+
+    /**
+     * Get list of allocated ip addresses to the connected p2s vpn clients.
+     *
+     * @return the allocatedIpAddresses value
+     */
+    public List<String> allocatedIpAddresses() {
+        return this.allocatedIpAddresses;
+    }
+
+    /**
+     * Set list of allocated ip addresses to the connected p2s vpn clients.
+     *
+     * @param allocatedIpAddresses the allocatedIpAddresses value to set
+     * @return the VpnClientConnectionHealth object itself.
+     */
+    public VpnClientConnectionHealth withAllocatedIpAddresses(List<String> allocatedIpAddresses) {
+        this.allocatedIpAddresses = allocatedIpAddresses;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetail.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetail.java
new file mode 100644
index 000000000000..727d3f543f9c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetail.java
@@ -0,0 +1,197 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VPN client connection health detail.
+ */
+public class VpnClientConnectionHealthDetail {
+    /**
+     * The vpn client Id.
+     */
+    @JsonProperty(value = "vpnConnectionId", access = JsonProperty.Access.WRITE_ONLY)
+    private String vpnConnectionId;
+
+    /**
+     * The duration time of a connected vpn client.
+     */
+    @JsonProperty(value = "vpnConnectionDuration", access = JsonProperty.Access.WRITE_ONLY)
+    private Long vpnConnectionDuration;
+
+    /**
+     * The start time of a connected vpn client.
+     */
+    @JsonProperty(value = "vpnConnectionTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String vpnConnectionTime;
+
+    /**
+     * The public Ip of a connected vpn client.
+     */
+    @JsonProperty(value = "publicIpAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String publicIpAddress;
+
+    /**
+     * The assigned private Ip of a connected vpn client.
+     */
+    @JsonProperty(value = "privateIpAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String privateIpAddress;
+
+    /**
+     * The user name of a connected vpn client.
+     */
+    @JsonProperty(value = "vpnUserName", access = JsonProperty.Access.WRITE_ONLY)
+    private String vpnUserName;
+
+    /**
+     * The max band width.
+     */
+    @JsonProperty(value = "maxBandwidth", access = JsonProperty.Access.WRITE_ONLY)
+    private Long maxBandwidth;
+
+    /**
+     * The egress packets per second.
+     */
+    @JsonProperty(value = "egressPacketsTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressPacketsTransferred;
+
+    /**
+     * The egress bytes per second.
+     */
+    @JsonProperty(value = "egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * The ingress packets per second.
+     */
+    @JsonProperty(value = "ingressPacketsTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressPacketsTransferred;
+
+    /**
+     * The ingress bytes per second.
+     */
+    @JsonProperty(value = "ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * The max packets transferred per second.
+     */
+    @JsonProperty(value = "maxPacketsPerSecond", access = JsonProperty.Access.WRITE_ONLY)
+    private Long maxPacketsPerSecond;
+
+    /**
+     * Get the vpn client Id.
+     *
+     * @return the vpnConnectionId value
+     */
+    public String vpnConnectionId() {
+        return this.vpnConnectionId;
+    }
+
+    /**
+     * Get the duration time of a connected vpn client.
+     *
+     * @return the vpnConnectionDuration value
+     */
+    public Long vpnConnectionDuration() {
+        return this.vpnConnectionDuration;
+    }
+
+    /**
+     * Get the start time of a connected vpn client.
+     *
+     * @return the vpnConnectionTime value
+     */
+    public String vpnConnectionTime() {
+        return this.vpnConnectionTime;
+    }
+
+    /**
+     * Get the public Ip of a connected vpn client.
+     *
+     * @return the publicIpAddress value
+     */
+    public String publicIpAddress() {
+        return this.publicIpAddress;
+    }
+
+    /**
+     * Get the assigned private Ip of a connected vpn client.
+     *
+     * @return the privateIpAddress value
+     */
+    public String privateIpAddress() {
+        return this.privateIpAddress;
+    }
+
+    /**
+     * Get the user name of a connected vpn client.
+     *
+     * @return the vpnUserName value
+     */
+    public String vpnUserName() {
+        return this.vpnUserName;
+    }
+
+    /**
+     * Get the max band width.
+     *
+     * @return the maxBandwidth value
+     */
+    public Long maxBandwidth() {
+        return this.maxBandwidth;
+    }
+
+    /**
+     * Get the egress packets per second.
+     *
+     * @return the egressPacketsTransferred value
+     */
+    public Long egressPacketsTransferred() {
+        return this.egressPacketsTransferred;
+    }
+
+    /**
+     * Get the egress bytes per second.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get the ingress packets per second.
+     *
+     * @return the ingressPacketsTransferred value
+     */
+    public Long ingressPacketsTransferred() {
+        return this.ingressPacketsTransferred;
+    }
+
+    /**
+     * Get the ingress bytes per second.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get the max packets transferred per second.
+     *
+     * @return the maxPacketsPerSecond value
+     */
+    public Long maxPacketsPerSecond() {
+        return this.maxPacketsPerSecond;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetailListResult.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetailListResult.java
new file mode 100644
index 000000000000..d07fa2123908
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientConnectionHealthDetailListResult.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnClientConnectionHealthDetailListResultInner;
+import java.util.List;
+
+/**
+ * Type representing VpnClientConnectionHealthDetailListResult.
+ */
+public interface VpnClientConnectionHealthDetailListResult extends HasInner<VpnClientConnectionHealthDetailListResultInner>, HasManager<NetworkManager> {
+    /**
+     * @return the value value.
+     */
+    List<VpnClientConnectionHealthDetail> value();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientIPsecParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientIPsecParameters.java
new file mode 100644
index 000000000000..5cb7f01914b0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientIPsecParameters.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnClientIPsecParametersInner;
+
+/**
+ * Type representing VpnClientIPsecParameters.
+ */
+public interface VpnClientIPsecParameters extends HasInner<VpnClientIPsecParametersInner>, HasManager<NetworkManager> {
+    /**
+     * @return the dhGroup value.
+     */
+    DhGroup dhGroup();
+
+    /**
+     * @return the ikeEncryption value.
+     */
+    IkeEncryption ikeEncryption();
+
+    /**
+     * @return the ikeIntegrity value.
+     */
+    IkeIntegrity ikeIntegrity();
+
+    /**
+     * @return the ipsecEncryption value.
+     */
+    IpsecEncryption ipsecEncryption();
+
+    /**
+     * @return the ipsecIntegrity value.
+     */
+    IpsecIntegrity ipsecIntegrity();
+
+    /**
+     * @return the pfsGroup value.
+     */
+    PfsGroup pfsGroup();
+
+    /**
+     * @return the saDataSizeKilobytes value.
+     */
+    int saDataSizeKilobytes();
+
+    /**
+     * @return the saLifeTimeSeconds value.
+     */
+    int saLifeTimeSeconds();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientParameters.java
new file mode 100644
index 000000000000..be75c21d1abe
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientParameters.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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Vpn Client Parameters for package generation.
+ */
+public class VpnClientParameters {
+    /**
+     * VPN client Processor Architecture. Possible values include: 'Amd64',
+     * 'X86'.
+     */
+    @JsonProperty(value = "processorArchitecture")
+    private ProcessorArchitecture processorArchitecture;
+
+    /**
+     * VPN client authentication method. Possible values include: 'EAPTLS',
+     * 'EAPMSCHAPv2'.
+     */
+    @JsonProperty(value = "authenticationMethod")
+    private AuthenticationMethod authenticationMethod;
+
+    /**
+     * The public certificate data for the radius server authentication
+     * certificate as a Base-64 encoded string. Required only if external
+     * radius authentication has been configured with EAPTLS authentication.
+     */
+    @JsonProperty(value = "radiusServerAuthCertificate")
+    private String radiusServerAuthCertificate;
+
+    /**
+     * A list of client root certificates public certificate data encoded as
+     * Base-64 strings. Optional parameter for external radius based
+     * authentication with EAPTLS.
+     */
+    @JsonProperty(value = "clientRootCertificates")
+    private List<String> clientRootCertificates;
+
+    /**
+     * Get vPN client Processor Architecture. Possible values include: 'Amd64', 'X86'.
+     *
+     * @return the processorArchitecture value
+     */
+    public ProcessorArchitecture processorArchitecture() {
+        return this.processorArchitecture;
+    }
+
+    /**
+     * Set vPN client Processor Architecture. Possible values include: 'Amd64', 'X86'.
+     *
+     * @param processorArchitecture the processorArchitecture value to set
+     * @return the VpnClientParameters object itself.
+     */
+    public VpnClientParameters withProcessorArchitecture(ProcessorArchitecture processorArchitecture) {
+        this.processorArchitecture = processorArchitecture;
+        return this;
+    }
+
+    /**
+     * Get vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @return the authenticationMethod value
+     */
+    public AuthenticationMethod authenticationMethod() {
+        return this.authenticationMethod;
+    }
+
+    /**
+     * Set vPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'.
+     *
+     * @param authenticationMethod the authenticationMethod value to set
+     * @return the VpnClientParameters object itself.
+     */
+    public VpnClientParameters withAuthenticationMethod(AuthenticationMethod authenticationMethod) {
+        this.authenticationMethod = authenticationMethod;
+        return this;
+    }
+
+    /**
+     * Get the public certificate data for the radius server authentication certificate as a Base-64 encoded string. Required only if external radius authentication has been configured with EAPTLS authentication.
+     *
+     * @return the radiusServerAuthCertificate value
+     */
+    public String radiusServerAuthCertificate() {
+        return this.radiusServerAuthCertificate;
+    }
+
+    /**
+     * Set the public certificate data for the radius server authentication certificate as a Base-64 encoded string. Required only if external radius authentication has been configured with EAPTLS authentication.
+     *
+     * @param radiusServerAuthCertificate the radiusServerAuthCertificate value to set
+     * @return the VpnClientParameters object itself.
+     */
+    public VpnClientParameters withRadiusServerAuthCertificate(String radiusServerAuthCertificate) {
+        this.radiusServerAuthCertificate = radiusServerAuthCertificate;
+        return this;
+    }
+
+    /**
+     * Get a list of client root certificates public certificate data encoded as Base-64 strings. Optional parameter for external radius based authentication with EAPTLS.
+     *
+     * @return the clientRootCertificates value
+     */
+    public List<String> clientRootCertificates() {
+        return this.clientRootCertificates;
+    }
+
+    /**
+     * Set a list of client root certificates public certificate data encoded as Base-64 strings. Optional parameter for external radius based authentication with EAPTLS.
+     *
+     * @param clientRootCertificates the clientRootCertificates value to set
+     * @return the VpnClientParameters object itself.
+     */
+    public VpnClientParameters withClientRootCertificates(List<String> clientRootCertificates) {
+        this.clientRootCertificates = clientRootCertificates;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientProtocol.java
new file mode 100644
index 000000000000..c32309033fbb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnClientProtocol.
+ */
+public final class VpnClientProtocol extends ExpandableStringEnum<VpnClientProtocol> {
+    /** Static value IkeV2 for VpnClientProtocol. */
+    public static final VpnClientProtocol IKE_V2 = fromString("IkeV2");
+
+    /** Static value SSTP for VpnClientProtocol. */
+    public static final VpnClientProtocol SSTP = fromString("SSTP");
+
+    /** Static value OpenVPN for VpnClientProtocol. */
+    public static final VpnClientProtocol OPEN_VPN = fromString("OpenVPN");
+
+    /**
+     * Creates or finds a VpnClientProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnClientProtocol
+     */
+    @JsonCreator
+    public static VpnClientProtocol fromString(String name) {
+        return fromString(name, VpnClientProtocol.class);
+    }
+
+    /**
+     * @return known VpnClientProtocol values
+     */
+    public static Collection<VpnClientProtocol> values() {
+        return values(VpnClientProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRevokedCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRevokedCertificate.java
new file mode 100644
index 000000000000..7f10aac8f9b5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRevokedCertificate.java
@@ -0,0 +1,104 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * VPN client revoked certificate of virtual network gateway.
+ */
+@JsonFlatten
+public class VpnClientRevokedCertificate extends SubResource {
+    /**
+     * The revoked VPN client certificate thumbprint.
+     */
+    @JsonProperty(value = "properties.thumbprint")
+    private String thumbprint;
+
+    /**
+     * The provisioning state of the VPN client revoked certificate resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the revoked VPN client certificate thumbprint.
+     *
+     * @return the thumbprint value
+     */
+    public String thumbprint() {
+        return this.thumbprint;
+    }
+
+    /**
+     * Set the revoked VPN client certificate thumbprint.
+     *
+     * @param thumbprint the thumbprint value to set
+     * @return the VpnClientRevokedCertificate object itself.
+     */
+    public VpnClientRevokedCertificate withThumbprint(String thumbprint) {
+        this.thumbprint = thumbprint;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN client revoked certificate resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VpnClientRevokedCertificate object itself.
+     */
+    public VpnClientRevokedCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRootCertificate.java
new file mode 100644
index 000000000000..b9d05f77b960
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnClientRootCertificate.java
@@ -0,0 +1,104 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * VPN client root certificate of virtual network gateway.
+ */
+@JsonFlatten
+public class VpnClientRootCertificate extends SubResource {
+    /**
+     * The certificate public data.
+     */
+    @JsonProperty(value = "properties.publicCertData", required = true)
+    private String publicCertData;
+
+    /**
+     * The provisioning state of the VPN client root certificate resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the certificate public data.
+     *
+     * @return the publicCertData value
+     */
+    public String publicCertData() {
+        return this.publicCertData;
+    }
+
+    /**
+     * Set the certificate public data.
+     *
+     * @param publicCertData the publicCertData value to set
+     * @return the VpnClientRootCertificate object itself.
+     */
+    public VpnClientRootCertificate withPublicCertData(String publicCertData) {
+        this.publicCertData = publicCertData;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN client root certificate resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VpnClientRootCertificate object itself.
+     */
+    public VpnClientRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnection.java
new file mode 100644
index 000000000000..3697174e2375
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnection.java
@@ -0,0 +1,589 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkConnectionInner;
+
+/**
+ * Type representing VpnConnection.
+ */
+public interface VpnConnection extends HasInner<VpnConnectionInner>, Indexable, Refreshable<VpnConnection>, Updatable<VpnConnection.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the connectionBandwidth value.
+     */
+    Integer connectionBandwidth();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    VpnConnectionStatus connectionStatus();
+
+    /**
+     * @return the dpdTimeoutSeconds value.
+     */
+    Integer dpdTimeoutSeconds();
+
+    /**
+     * @return the egressBytesTransferred value.
+     */
+    Long egressBytesTransferred();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the enableInternetSecurity value.
+     */
+    Boolean enableInternetSecurity();
+
+    /**
+     * @return the enableRateLimiting value.
+     */
+    Boolean enableRateLimiting();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ingressBytesTransferred value.
+     */
+    Long ingressBytesTransferred();
+
+    /**
+     * @return the ipsecPolicies value.
+     */
+    List<IpsecPolicy> ipsecPolicies();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the remoteVpnSite value.
+     */
+    SubResource remoteVpnSite();
+
+    /**
+     * @return the routingConfiguration value.
+     */
+    RoutingConfiguration routingConfiguration();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the useLocalAzureIpAddress value.
+     */
+    Boolean useLocalAzureIpAddress();
+
+    /**
+     * @return the usePolicyBasedTrafficSelectors value.
+     */
+    Boolean usePolicyBasedTrafficSelectors();
+
+    /**
+     * @return the vpnConnectionProtocolType value.
+     */
+    VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType();
+
+    /**
+     * @return the vpnLinkConnections value.
+     */
+    List<VpnConnectionVpnGatewayVpnSiteLinkConnection> vpnLinkConnections();
+
+    /**
+     * The entirety of the VpnConnection definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithVpnGateway, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VpnConnection definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VpnConnection definition.
+         */
+        interface Blank extends WithVpnGateway {
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify VpnGateway.
+         */
+        interface WithVpnGateway {
+           /**
+            * Specifies resourceGroupName, gatewayName.
+            * @param resourceGroupName The resource group name of the VpnGateway
+            * @param gatewayName The name of the gateway
+            * @return the next definition stage
+            */
+            WithCreate withExistingVpnGateway(String resourceGroupName, String gatewayName);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify ConnectionBandwidth.
+         */
+        interface WithConnectionBandwidth {
+            /**
+             * Specifies connectionBandwidth.
+             * @param connectionBandwidth Expected bandwidth in MBPS
+             * @return the next definition stage
+             */
+            WithCreate withConnectionBandwidth(Integer connectionBandwidth);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify ConnectionStatus.
+         */
+        interface WithConnectionStatus {
+            /**
+             * Specifies connectionStatus.
+             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
+             * @return the next definition stage
+             */
+            WithCreate withConnectionStatus(VpnConnectionStatus connectionStatus);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify DpdTimeoutSeconds.
+         */
+        interface WithDpdTimeoutSeconds {
+            /**
+             * Specifies dpdTimeoutSeconds.
+             * @param dpdTimeoutSeconds The dead peer detection timeout for a vpn connection in seconds
+             * @return the next definition stage
+             */
+            WithCreate withDpdTimeoutSeconds(Integer dpdTimeoutSeconds);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp EnableBgp flag
+             * @return the next definition stage
+             */
+            WithCreate withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify EnableInternetSecurity.
+         */
+        interface WithEnableInternetSecurity {
+            /**
+             * Specifies enableInternetSecurity.
+             * @param enableInternetSecurity Enable internet security
+             * @return the next definition stage
+             */
+            WithCreate withEnableInternetSecurity(Boolean enableInternetSecurity);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify EnableRateLimiting.
+         */
+        interface WithEnableRateLimiting {
+            /**
+             * Specifies enableRateLimiting.
+             * @param enableRateLimiting EnableBgp flag
+             * @return the next definition stage
+             */
+            WithCreate withEnableRateLimiting(Boolean enableRateLimiting);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next definition stage
+             */
+            WithCreate withId(String id);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify IpsecPolicies.
+         */
+        interface WithIpsecPolicies {
+            /**
+             * Specifies ipsecPolicies.
+             * @param ipsecPolicies The IPSec Policies to be considered by this connection
+             * @return the next definition stage
+             */
+            WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next definition stage
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify RemoteVpnSite.
+         */
+        interface WithRemoteVpnSite {
+            /**
+             * Specifies remoteVpnSite.
+             * @param remoteVpnSite Id of the connected vpn site
+             * @return the next definition stage
+             */
+            WithCreate withRemoteVpnSite(SubResource remoteVpnSite);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify RoutingConfiguration.
+         */
+        interface WithRoutingConfiguration {
+            /**
+             * Specifies routingConfiguration.
+             * @param routingConfiguration The Routing Configuration indicating the associated and propagated route tables on this connection
+             * @return the next definition stage
+             */
+            WithCreate withRoutingConfiguration(RoutingConfiguration routingConfiguration);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight Routing weight for vpn connection
+             * @return the next definition stage
+             */
+            WithCreate withRoutingWeight(Integer routingWeight);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey SharedKey for the vpn connection
+             * @return the next definition stage
+             */
+            WithCreate withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify UseLocalAzureIpAddress.
+         */
+        interface WithUseLocalAzureIpAddress {
+            /**
+             * Specifies useLocalAzureIpAddress.
+             * @param useLocalAzureIpAddress Use local azure ip to initiate connection
+             * @return the next definition stage
+             */
+            WithCreate withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify UsePolicyBasedTrafficSelectors.
+         */
+        interface WithUsePolicyBasedTrafficSelectors {
+            /**
+             * Specifies usePolicyBasedTrafficSelectors.
+             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
+             * @return the next definition stage
+             */
+            WithCreate withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify VpnConnectionProtocolType.
+         */
+        interface WithVpnConnectionProtocolType {
+            /**
+             * Specifies vpnConnectionProtocolType.
+             * @param vpnConnectionProtocolType Connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'
+             * @return the next definition stage
+             */
+            WithCreate withVpnConnectionProtocolType(VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType);
+        }
+
+        /**
+         * The stage of the vpnconnection definition allowing to specify VpnLinkConnections.
+         */
+        interface WithVpnLinkConnections {
+            /**
+             * Specifies vpnLinkConnections.
+             * @param vpnLinkConnections List of all vpn site link connections to the gateway
+             * @return the next definition stage
+             */
+            WithCreate withVpnLinkConnections(List<VpnSiteLinkConnectionInner> vpnLinkConnections);
+        }
+
+        /**
+         * 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<VpnConnection>, DefinitionStages.WithConnectionBandwidth, DefinitionStages.WithConnectionStatus, DefinitionStages.WithDpdTimeoutSeconds, DefinitionStages.WithEnableBgp, DefinitionStages.WithEnableInternetSecurity, DefinitionStages.WithEnableRateLimiting, DefinitionStages.WithId, DefinitionStages.WithIpsecPolicies, DefinitionStages.WithName, DefinitionStages.WithRemoteVpnSite, DefinitionStages.WithRoutingConfiguration, DefinitionStages.WithRoutingWeight, DefinitionStages.WithSharedKey, DefinitionStages.WithUseLocalAzureIpAddress, DefinitionStages.WithUsePolicyBasedTrafficSelectors, DefinitionStages.WithVpnConnectionProtocolType, DefinitionStages.WithVpnLinkConnections {
+        }
+    }
+    /**
+     * The template for a VpnConnection update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VpnConnection>, UpdateStages.WithConnectionBandwidth, UpdateStages.WithConnectionStatus, UpdateStages.WithDpdTimeoutSeconds, UpdateStages.WithEnableBgp, UpdateStages.WithEnableInternetSecurity, UpdateStages.WithEnableRateLimiting, UpdateStages.WithId, UpdateStages.WithIpsecPolicies, UpdateStages.WithName, UpdateStages.WithRemoteVpnSite, UpdateStages.WithRoutingConfiguration, UpdateStages.WithRoutingWeight, UpdateStages.WithSharedKey, UpdateStages.WithUseLocalAzureIpAddress, UpdateStages.WithUsePolicyBasedTrafficSelectors, UpdateStages.WithVpnConnectionProtocolType, UpdateStages.WithVpnLinkConnections {
+    }
+
+    /**
+     * Grouping of VpnConnection update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the vpnconnection update allowing to specify ConnectionBandwidth.
+         */
+        interface WithConnectionBandwidth {
+            /**
+             * Specifies connectionBandwidth.
+             * @param connectionBandwidth Expected bandwidth in MBPS
+             * @return the next update stage
+             */
+            Update withConnectionBandwidth(Integer connectionBandwidth);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify ConnectionStatus.
+         */
+        interface WithConnectionStatus {
+            /**
+             * Specifies connectionStatus.
+             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
+             * @return the next update stage
+             */
+            Update withConnectionStatus(VpnConnectionStatus connectionStatus);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify DpdTimeoutSeconds.
+         */
+        interface WithDpdTimeoutSeconds {
+            /**
+             * Specifies dpdTimeoutSeconds.
+             * @param dpdTimeoutSeconds The dead peer detection timeout for a vpn connection in seconds
+             * @return the next update stage
+             */
+            Update withDpdTimeoutSeconds(Integer dpdTimeoutSeconds);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify EnableBgp.
+         */
+        interface WithEnableBgp {
+            /**
+             * Specifies enableBgp.
+             * @param enableBgp EnableBgp flag
+             * @return the next update stage
+             */
+            Update withEnableBgp(Boolean enableBgp);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify EnableInternetSecurity.
+         */
+        interface WithEnableInternetSecurity {
+            /**
+             * Specifies enableInternetSecurity.
+             * @param enableInternetSecurity Enable internet security
+             * @return the next update stage
+             */
+            Update withEnableInternetSecurity(Boolean enableInternetSecurity);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify EnableRateLimiting.
+         */
+        interface WithEnableRateLimiting {
+            /**
+             * Specifies enableRateLimiting.
+             * @param enableRateLimiting EnableBgp flag
+             * @return the next update stage
+             */
+            Update withEnableRateLimiting(Boolean enableRateLimiting);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify Id.
+         */
+        interface WithId {
+            /**
+             * Specifies id.
+             * @param id Resource ID
+             * @return the next update stage
+             */
+            Update withId(String id);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify IpsecPolicies.
+         */
+        interface WithIpsecPolicies {
+            /**
+             * Specifies ipsecPolicies.
+             * @param ipsecPolicies The IPSec Policies to be considered by this connection
+             * @return the next update stage
+             */
+            Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
+             * @return the next update stage
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify RemoteVpnSite.
+         */
+        interface WithRemoteVpnSite {
+            /**
+             * Specifies remoteVpnSite.
+             * @param remoteVpnSite Id of the connected vpn site
+             * @return the next update stage
+             */
+            Update withRemoteVpnSite(SubResource remoteVpnSite);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify RoutingConfiguration.
+         */
+        interface WithRoutingConfiguration {
+            /**
+             * Specifies routingConfiguration.
+             * @param routingConfiguration The Routing Configuration indicating the associated and propagated route tables on this connection
+             * @return the next update stage
+             */
+            Update withRoutingConfiguration(RoutingConfiguration routingConfiguration);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify RoutingWeight.
+         */
+        interface WithRoutingWeight {
+            /**
+             * Specifies routingWeight.
+             * @param routingWeight Routing weight for vpn connection
+             * @return the next update stage
+             */
+            Update withRoutingWeight(Integer routingWeight);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify SharedKey.
+         */
+        interface WithSharedKey {
+            /**
+             * Specifies sharedKey.
+             * @param sharedKey SharedKey for the vpn connection
+             * @return the next update stage
+             */
+            Update withSharedKey(String sharedKey);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify UseLocalAzureIpAddress.
+         */
+        interface WithUseLocalAzureIpAddress {
+            /**
+             * Specifies useLocalAzureIpAddress.
+             * @param useLocalAzureIpAddress Use local azure ip to initiate connection
+             * @return the next update stage
+             */
+            Update withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify UsePolicyBasedTrafficSelectors.
+         */
+        interface WithUsePolicyBasedTrafficSelectors {
+            /**
+             * Specifies usePolicyBasedTrafficSelectors.
+             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
+             * @return the next update stage
+             */
+            Update withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify VpnConnectionProtocolType.
+         */
+        interface WithVpnConnectionProtocolType {
+            /**
+             * Specifies vpnConnectionProtocolType.
+             * @param vpnConnectionProtocolType Connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'
+             * @return the next update stage
+             */
+            Update withVpnConnectionProtocolType(VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType);
+        }
+
+        /**
+         * The stage of the vpnconnection update allowing to specify VpnLinkConnections.
+         */
+        interface WithVpnLinkConnections {
+            /**
+             * Specifies vpnLinkConnections.
+             * @param vpnLinkConnections List of all vpn site link connections to the gateway
+             * @return the next update stage
+             */
+            Update withVpnLinkConnections(List<VpnSiteLinkConnectionInner> vpnLinkConnections);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionStatus.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionStatus.java
new file mode 100644
index 000000000000..80e790257c4d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionStatus.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnConnectionStatus.
+ */
+public final class VpnConnectionStatus extends ExpandableStringEnum<VpnConnectionStatus> {
+    /** Static value Unknown for VpnConnectionStatus. */
+    public static final VpnConnectionStatus UNKNOWN = fromString("Unknown");
+
+    /** Static value Connecting for VpnConnectionStatus. */
+    public static final VpnConnectionStatus CONNECTING = fromString("Connecting");
+
+    /** Static value Connected for VpnConnectionStatus. */
+    public static final VpnConnectionStatus CONNECTED = fromString("Connected");
+
+    /** Static value NotConnected for VpnConnectionStatus. */
+    public static final VpnConnectionStatus NOT_CONNECTED = fromString("NotConnected");
+
+    /**
+     * Creates or finds a VpnConnectionStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnConnectionStatus
+     */
+    @JsonCreator
+    public static VpnConnectionStatus fromString(String name) {
+        return fromString(name, VpnConnectionStatus.class);
+    }
+
+    /**
+     * @return known VpnConnectionStatus values
+     */
+    public static Collection<VpnConnectionStatus> values() {
+        return values(VpnConnectionStatus.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnection.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnection.java
new file mode 100644
index 000000000000..578d4a75781a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnection.java
@@ -0,0 +1,114 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkConnectionInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing VpnConnectionVpnGatewayVpnSiteLinkConnection.
+ */
+public interface VpnConnectionVpnGatewayVpnSiteLinkConnection extends HasInner<VpnSiteLinkConnectionInner>, Indexable, Refreshable<VpnConnectionVpnGatewayVpnSiteLinkConnection>, HasManager<NetworkManager> {
+    /**
+     * @return the connectionBandwidth value.
+     */
+    Integer connectionBandwidth();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    VpnConnectionStatus connectionStatus();
+
+    /**
+     * @return the egressBytesTransferred value.
+     */
+    Long egressBytesTransferred();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the enableRateLimiting value.
+     */
+    Boolean enableRateLimiting();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ingressBytesTransferred value.
+     */
+    Long ingressBytesTransferred();
+
+    /**
+     * @return the ipsecPolicies value.
+     */
+    List<IpsecPolicy> ipsecPolicies();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the useLocalAzureIpAddress value.
+     */
+    Boolean useLocalAzureIpAddress();
+
+    /**
+     * @return the usePolicyBasedTrafficSelectors value.
+     */
+    Boolean usePolicyBasedTrafficSelectors();
+
+    /**
+     * @return the vpnConnectionProtocolType value.
+     */
+    VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType();
+
+    /**
+     * @return the vpnSiteLink value.
+     */
+    SubResource vpnSiteLink();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnectionModel.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnectionModel.java
new file mode 100644
index 000000000000..143992048f0e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnectionVpnGatewayVpnSiteLinkConnectionModel.java
@@ -0,0 +1,112 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkConnectionInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Type representing VpnConnectionVpnGatewayVpnSiteLinkConnectionModel.
+ */
+public interface VpnConnectionVpnGatewayVpnSiteLinkConnectionModel extends HasInner<VpnSiteLinkConnectionInner>, HasManager<NetworkManager> {
+    /**
+     * @return the connectionBandwidth value.
+     */
+    Integer connectionBandwidth();
+
+    /**
+     * @return the connectionStatus value.
+     */
+    VpnConnectionStatus connectionStatus();
+
+    /**
+     * @return the egressBytesTransferred value.
+     */
+    Long egressBytesTransferred();
+
+    /**
+     * @return the enableBgp value.
+     */
+    Boolean enableBgp();
+
+    /**
+     * @return the enableRateLimiting value.
+     */
+    Boolean enableRateLimiting();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ingressBytesTransferred value.
+     */
+    Long ingressBytesTransferred();
+
+    /**
+     * @return the ipsecPolicies value.
+     */
+    List<IpsecPolicy> ipsecPolicies();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the routingWeight value.
+     */
+    Integer routingWeight();
+
+    /**
+     * @return the sharedKey value.
+     */
+    String sharedKey();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the useLocalAzureIpAddress value.
+     */
+    Boolean useLocalAzureIpAddress();
+
+    /**
+     * @return the usePolicyBasedTrafficSelectors value.
+     */
+    Boolean usePolicyBasedTrafficSelectors();
+
+    /**
+     * @return the vpnConnectionProtocolType value.
+     */
+    VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType();
+
+    /**
+     * @return the vpnSiteLink value.
+     */
+    SubResource vpnSiteLink();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnections.java
new file mode 100644
index 000000000000..67551181a285
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnConnections.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnConnections.
+ */
+public interface VpnConnections extends SupportsCreating<VpnConnection.DefinitionStages.Blank>, HasInner<VpnConnectionsInner> {
+    /**
+     * Retrieves the details of a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnConnection> getAsync(String resourceGroupName, String gatewayName, String connectionName);
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnConnection> listByVpnGatewayAsync(final String resourceGroupName, final String gatewayName);
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String gatewayName, String connectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnDeviceScriptParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnDeviceScriptParameters.java
new file mode 100644
index 000000000000..c8615b454e57
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnDeviceScriptParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Vpn device configuration script generation parameters.
+ */
+public class VpnDeviceScriptParameters {
+    /**
+     * The vendor for the vpn device.
+     */
+    @JsonProperty(value = "vendor")
+    private String vendor;
+
+    /**
+     * The device family for the vpn device.
+     */
+    @JsonProperty(value = "deviceFamily")
+    private String deviceFamily;
+
+    /**
+     * The firmware version for the vpn device.
+     */
+    @JsonProperty(value = "firmwareVersion")
+    private String firmwareVersion;
+
+    /**
+     * Get the vendor for the vpn device.
+     *
+     * @return the vendor value
+     */
+    public String vendor() {
+        return this.vendor;
+    }
+
+    /**
+     * Set the vendor for the vpn device.
+     *
+     * @param vendor the vendor value to set
+     * @return the VpnDeviceScriptParameters object itself.
+     */
+    public VpnDeviceScriptParameters withVendor(String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+    /**
+     * Get the device family for the vpn device.
+     *
+     * @return the deviceFamily value
+     */
+    public String deviceFamily() {
+        return this.deviceFamily;
+    }
+
+    /**
+     * Set the device family for the vpn device.
+     *
+     * @param deviceFamily the deviceFamily value to set
+     * @return the VpnDeviceScriptParameters object itself.
+     */
+    public VpnDeviceScriptParameters withDeviceFamily(String deviceFamily) {
+        this.deviceFamily = deviceFamily;
+        return this;
+    }
+
+    /**
+     * Get the firmware version for the vpn device.
+     *
+     * @return the firmwareVersion value
+     */
+    public String firmwareVersion() {
+        return this.firmwareVersion;
+    }
+
+    /**
+     * Set the firmware version for the vpn device.
+     *
+     * @param firmwareVersion the firmwareVersion value to set
+     * @return the VpnDeviceScriptParameters object itself.
+     */
+    public VpnDeviceScriptParameters withFirmwareVersion(String firmwareVersion) {
+        this.firmwareVersion = firmwareVersion;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateway.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateway.java
new file mode 100644
index 000000000000..0dae2729236d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateway.java
@@ -0,0 +1,197 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnConnectionInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnGatewayInner;
+
+/**
+ * Type representing VpnGateway.
+ */
+public interface VpnGateway extends HasInner<VpnGatewayInner>, Resource, GroupableResourceCore<NetworkManager, VpnGatewayInner>, HasResourceGroup, Refreshable<VpnGateway>, Updatable<VpnGateway.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the bgpSettings value.
+     */
+    BgpSettings bgpSettings();
+
+    /**
+     * @return the connections value.
+     */
+    List<VpnConnection> connections();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the virtualHub value.
+     */
+    SubResource virtualHub();
+
+    /**
+     * @return the vpnGatewayScaleUnit value.
+     */
+    Integer vpnGatewayScaleUnit();
+
+    /**
+     * The entirety of the VpnGateway definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VpnGateway definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VpnGateway definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VpnGateway definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the vpngateway definition allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Local network gateway's BGP speaker settings
+             * @return the next definition stage
+             */
+            WithCreate withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the vpngateway definition allowing to specify Connections.
+         */
+        interface WithConnections {
+            /**
+             * Specifies connections.
+             * @param connections List of all vpn connections to the gateway
+             * @return the next definition stage
+             */
+            WithCreate withConnections(List<VpnConnectionInner> connections);
+        }
+
+        /**
+         * The stage of the vpngateway definition allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The VirtualHub to which the gateway belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the vpngateway definition allowing to specify VpnGatewayScaleUnit.
+         */
+        interface WithVpnGatewayScaleUnit {
+            /**
+             * Specifies vpnGatewayScaleUnit.
+             * @param vpnGatewayScaleUnit The scale unit for this vpn gateway
+             * @return the next definition stage
+             */
+            WithCreate withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit);
+        }
+
+        /**
+         * 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<VpnGateway>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBgpSettings, DefinitionStages.WithConnections, DefinitionStages.WithVirtualHub, DefinitionStages.WithVpnGatewayScaleUnit {
+        }
+    }
+    /**
+     * The template for a VpnGateway update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VpnGateway>, Resource.UpdateWithTags<Update>, UpdateStages.WithBgpSettings, UpdateStages.WithConnections, UpdateStages.WithVirtualHub, UpdateStages.WithVpnGatewayScaleUnit {
+    }
+
+    /**
+     * Grouping of VpnGateway update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the vpngateway update allowing to specify BgpSettings.
+         */
+        interface WithBgpSettings {
+            /**
+             * Specifies bgpSettings.
+             * @param bgpSettings Local network gateway's BGP speaker settings
+             * @return the next update stage
+             */
+            Update withBgpSettings(BgpSettings bgpSettings);
+        }
+
+        /**
+         * The stage of the vpngateway update allowing to specify Connections.
+         */
+        interface WithConnections {
+            /**
+             * Specifies connections.
+             * @param connections List of all vpn connections to the gateway
+             * @return the next update stage
+             */
+            Update withConnections(List<VpnConnectionInner> connections);
+        }
+
+        /**
+         * The stage of the vpngateway update allowing to specify VirtualHub.
+         */
+        interface WithVirtualHub {
+            /**
+             * Specifies virtualHub.
+             * @param virtualHub The VirtualHub to which the gateway belongs
+             * @return the next update stage
+             */
+            Update withVirtualHub(SubResource virtualHub);
+        }
+
+        /**
+         * The stage of the vpngateway update allowing to specify VpnGatewayScaleUnit.
+         */
+        interface WithVpnGatewayScaleUnit {
+            /**
+             * Specifies vpnGatewayScaleUnit.
+             * @param vpnGatewayScaleUnit The scale unit for this vpn gateway
+             * @return the next update stage
+             */
+            Update withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayGeneration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayGeneration.java
new file mode 100644
index 000000000000..4e6cae1ee25b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayGeneration.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnGatewayGeneration.
+ */
+public final class VpnGatewayGeneration extends ExpandableStringEnum<VpnGatewayGeneration> {
+    /** Static value None for VpnGatewayGeneration. */
+    public static final VpnGatewayGeneration NONE = fromString("None");
+
+    /** Static value Generation1 for VpnGatewayGeneration. */
+    public static final VpnGatewayGeneration GENERATION1 = fromString("Generation1");
+
+    /** Static value Generation2 for VpnGatewayGeneration. */
+    public static final VpnGatewayGeneration GENERATION2 = fromString("Generation2");
+
+    /**
+     * Creates or finds a VpnGatewayGeneration from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnGatewayGeneration
+     */
+    @JsonCreator
+    public static VpnGatewayGeneration fromString(String name) {
+        return fromString(name, VpnGatewayGeneration.class);
+    }
+
+    /**
+     * @return known VpnGatewayGeneration values
+     */
+    public static Collection<VpnGatewayGeneration> values() {
+        return values(VpnGatewayGeneration.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayTunnelingProtocol.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayTunnelingProtocol.java
new file mode 100644
index 000000000000..65ad5c8fb79d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGatewayTunnelingProtocol.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnGatewayTunnelingProtocol.
+ */
+public final class VpnGatewayTunnelingProtocol extends ExpandableStringEnum<VpnGatewayTunnelingProtocol> {
+    /** Static value IkeV2 for VpnGatewayTunnelingProtocol. */
+    public static final VpnGatewayTunnelingProtocol IKE_V2 = fromString("IkeV2");
+
+    /** Static value OpenVPN for VpnGatewayTunnelingProtocol. */
+    public static final VpnGatewayTunnelingProtocol OPEN_VPN = fromString("OpenVPN");
+
+    /**
+     * Creates or finds a VpnGatewayTunnelingProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnGatewayTunnelingProtocol
+     */
+    @JsonCreator
+    public static VpnGatewayTunnelingProtocol fromString(String name) {
+        return fromString(name, VpnGatewayTunnelingProtocol.class);
+    }
+
+    /**
+     * @return known VpnGatewayTunnelingProtocol values
+     */
+    public static Collection<VpnGatewayTunnelingProtocol> values() {
+        return values(VpnGatewayTunnelingProtocol.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateways.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateways.java
new file mode 100644
index 000000000000..2adb0ffb6d3a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnGateways.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.network.v2020_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.network.v2020_04_01.implementation.VpnGatewaysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnGateways.
+ */
+public interface VpnGateways extends SupportsCreating<VpnGateway.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VpnGateway>, SupportsListingByResourceGroup<VpnGateway>, SupportsListing<VpnGateway>, HasInner<VpnGatewaysInner> {
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnGateway> resetAsync(String resourceGroupName, String gatewayName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkBgpSettings.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkBgpSettings.java
new file mode 100644
index 000000000000..c352c1d3a19f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkBgpSettings.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * BGP settings details for a link.
+ */
+public class VpnLinkBgpSettings {
+    /**
+     * The BGP speaker's ASN.
+     */
+    @JsonProperty(value = "asn")
+    private Long asn;
+
+    /**
+     * The BGP peering address and BGP identifier of this BGP speaker.
+     */
+    @JsonProperty(value = "bgpPeeringAddress")
+    private String bgpPeeringAddress;
+
+    /**
+     * Get the BGP speaker's ASN.
+     *
+     * @return the asn value
+     */
+    public Long asn() {
+        return this.asn;
+    }
+
+    /**
+     * Set the BGP speaker's ASN.
+     *
+     * @param asn the asn value to set
+     * @return the VpnLinkBgpSettings object itself.
+     */
+    public VpnLinkBgpSettings withAsn(Long asn) {
+        this.asn = asn;
+        return this;
+    }
+
+    /**
+     * Get the BGP peering address and BGP identifier of this BGP speaker.
+     *
+     * @return the bgpPeeringAddress value
+     */
+    public String bgpPeeringAddress() {
+        return this.bgpPeeringAddress;
+    }
+
+    /**
+     * Set the BGP peering address and BGP identifier of this BGP speaker.
+     *
+     * @param bgpPeeringAddress the bgpPeeringAddress value to set
+     * @return the VpnLinkBgpSettings object itself.
+     */
+    public VpnLinkBgpSettings withBgpPeeringAddress(String bgpPeeringAddress) {
+        this.bgpPeeringAddress = bgpPeeringAddress;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkConnections.java
new file mode 100644
index 000000000000..7a956b0c1b9a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkConnections.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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnLinkConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnLinkConnections.
+ */
+public interface VpnLinkConnections extends HasInner<VpnLinkConnectionsInner> {
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnConnectionVpnGatewayVpnSiteLinkConnectionModel> listByVpnConnectionAsync(final String resourceGroupName, final String gatewayName, final String connectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkProviderProperties.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkProviderProperties.java
new file mode 100644
index 000000000000..1d00cd73c011
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnLinkProviderProperties.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of properties of a link provider.
+ */
+public class VpnLinkProviderProperties {
+    /**
+     * Name of the link provider.
+     */
+    @JsonProperty(value = "linkProviderName")
+    private String linkProviderName;
+
+    /**
+     * Link speed.
+     */
+    @JsonProperty(value = "linkSpeedInMbps")
+    private Integer linkSpeedInMbps;
+
+    /**
+     * Get name of the link provider.
+     *
+     * @return the linkProviderName value
+     */
+    public String linkProviderName() {
+        return this.linkProviderName;
+    }
+
+    /**
+     * Set name of the link provider.
+     *
+     * @param linkProviderName the linkProviderName value to set
+     * @return the VpnLinkProviderProperties object itself.
+     */
+    public VpnLinkProviderProperties withLinkProviderName(String linkProviderName) {
+        this.linkProviderName = linkProviderName;
+        return this;
+    }
+
+    /**
+     * Get link speed.
+     *
+     * @return the linkSpeedInMbps value
+     */
+    public Integer linkSpeedInMbps() {
+        return this.linkSpeedInMbps;
+    }
+
+    /**
+     * Set link speed.
+     *
+     * @param linkSpeedInMbps the linkSpeedInMbps value to set
+     * @return the VpnLinkProviderProperties object itself.
+     */
+    public VpnLinkProviderProperties withLinkSpeedInMbps(Integer linkSpeedInMbps) {
+        this.linkSpeedInMbps = linkSpeedInMbps;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStartParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStartParameters.java
new file mode 100644
index 000000000000..55b319c5a382
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStartParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Start packet capture parameters on virtual network gateway.
+ */
+public class VpnPacketCaptureStartParameters {
+    /**
+     * Start Packet capture parameters.
+     */
+    @JsonProperty(value = "filterData")
+    private String filterData;
+
+    /**
+     * Get start Packet capture parameters.
+     *
+     * @return the filterData value
+     */
+    public String filterData() {
+        return this.filterData;
+    }
+
+    /**
+     * Set start Packet capture parameters.
+     *
+     * @param filterData the filterData value to set
+     * @return the VpnPacketCaptureStartParameters object itself.
+     */
+    public VpnPacketCaptureStartParameters withFilterData(String filterData) {
+        this.filterData = filterData;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStopParameters.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStopParameters.java
new file mode 100644
index 000000000000..6d13af2ecdf4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnPacketCaptureStopParameters.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Stop packet capture parameters.
+ */
+public class VpnPacketCaptureStopParameters {
+    /**
+     * SAS url for packet capture on virtual network gateway.
+     */
+    @JsonProperty(value = "sasUrl")
+    private String sasUrl;
+
+    /**
+     * Get sAS url for packet capture on virtual network gateway.
+     *
+     * @return the sasUrl value
+     */
+    public String sasUrl() {
+        return this.sasUrl;
+    }
+
+    /**
+     * Set sAS url for packet capture on virtual network gateway.
+     *
+     * @param sasUrl the sasUrl value to set
+     * @return the VpnPacketCaptureStopParameters object itself.
+     */
+    public VpnPacketCaptureStopParameters withSasUrl(String sasUrl) {
+        this.sasUrl = sasUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnProfileResponse.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnProfileResponse.java
new file mode 100644
index 000000000000..97abb9e5cdbf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnProfileResponse.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnProfileResponseInner;
+
+/**
+ * Type representing VpnProfileResponse.
+ */
+public interface VpnProfileResponse extends HasInner<VpnProfileResponseInner>, HasManager<NetworkManager> {
+    /**
+     * @return the profileUrl value.
+     */
+    String profileUrl();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusClientRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusClientRootCertificate.java
new file mode 100644
index 000000000000..c5eaa9a00abf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusClientRootCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the Radius client root certificate of VpnServerConfiguration.
+ */
+public class VpnServerConfigRadiusClientRootCertificate {
+    /**
+     * The certificate name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The Radius client root certificate thumbprint.
+     */
+    @JsonProperty(value = "thumbprint")
+    private String thumbprint;
+
+    /**
+     * Get the certificate name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the certificate name.
+     *
+     * @param name the name value to set
+     * @return the VpnServerConfigRadiusClientRootCertificate object itself.
+     */
+    public VpnServerConfigRadiusClientRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the Radius client root certificate thumbprint.
+     *
+     * @return the thumbprint value
+     */
+    public String thumbprint() {
+        return this.thumbprint;
+    }
+
+    /**
+     * Set the Radius client root certificate thumbprint.
+     *
+     * @param thumbprint the thumbprint value to set
+     * @return the VpnServerConfigRadiusClientRootCertificate object itself.
+     */
+    public VpnServerConfigRadiusClientRootCertificate withThumbprint(String thumbprint) {
+        this.thumbprint = thumbprint;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusServerRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusServerRootCertificate.java
new file mode 100644
index 000000000000..b75ed56a2873
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigRadiusServerRootCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of Radius Server root certificate of VpnServerConfiguration.
+ */
+public class VpnServerConfigRadiusServerRootCertificate {
+    /**
+     * The certificate name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The certificate public data.
+     */
+    @JsonProperty(value = "publicCertData")
+    private String publicCertData;
+
+    /**
+     * Get the certificate name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the certificate name.
+     *
+     * @param name the name value to set
+     * @return the VpnServerConfigRadiusServerRootCertificate object itself.
+     */
+    public VpnServerConfigRadiusServerRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the certificate public data.
+     *
+     * @return the publicCertData value
+     */
+    public String publicCertData() {
+        return this.publicCertData;
+    }
+
+    /**
+     * Set the certificate public data.
+     *
+     * @param publicCertData the publicCertData value to set
+     * @return the VpnServerConfigRadiusServerRootCertificate object itself.
+     */
+    public VpnServerConfigRadiusServerRootCertificate withPublicCertData(String publicCertData) {
+        this.publicCertData = publicCertData;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRevokedCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRevokedCertificate.java
new file mode 100644
index 000000000000..498522839ba9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRevokedCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of the revoked VPN client certificate of VpnServerConfiguration.
+ */
+public class VpnServerConfigVpnClientRevokedCertificate {
+    /**
+     * The certificate name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The revoked VPN client certificate thumbprint.
+     */
+    @JsonProperty(value = "thumbprint")
+    private String thumbprint;
+
+    /**
+     * Get the certificate name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the certificate name.
+     *
+     * @param name the name value to set
+     * @return the VpnServerConfigVpnClientRevokedCertificate object itself.
+     */
+    public VpnServerConfigVpnClientRevokedCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the revoked VPN client certificate thumbprint.
+     *
+     * @return the thumbprint value
+     */
+    public String thumbprint() {
+        return this.thumbprint;
+    }
+
+    /**
+     * Set the revoked VPN client certificate thumbprint.
+     *
+     * @param thumbprint the thumbprint value to set
+     * @return the VpnServerConfigVpnClientRevokedCertificate object itself.
+     */
+    public VpnServerConfigVpnClientRevokedCertificate withThumbprint(String thumbprint) {
+        this.thumbprint = thumbprint;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRootCertificate.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRootCertificate.java
new file mode 100644
index 000000000000..35878f87906b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigVpnClientRootCertificate.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of VPN client root certificate of VpnServerConfiguration.
+ */
+public class VpnServerConfigVpnClientRootCertificate {
+    /**
+     * The certificate name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The certificate public data.
+     */
+    @JsonProperty(value = "publicCertData")
+    private String publicCertData;
+
+    /**
+     * Get the certificate name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the certificate name.
+     *
+     * @param name the name value to set
+     * @return the VpnServerConfigVpnClientRootCertificate object itself.
+     */
+    public VpnServerConfigVpnClientRootCertificate withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the certificate public data.
+     *
+     * @return the publicCertData value
+     */
+    public String publicCertData() {
+        return this.publicCertData;
+    }
+
+    /**
+     * Set the certificate public data.
+     *
+     * @param publicCertData the publicCertData value to set
+     * @return the VpnServerConfigVpnClientRootCertificate object itself.
+     */
+    public VpnServerConfigVpnClientRootCertificate withPublicCertData(String publicCertData) {
+        this.publicCertData = publicCertData;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfiguration.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfiguration.java
new file mode 100644
index 000000000000..b1d30fa1c282
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfiguration.java
@@ -0,0 +1,437 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnServerConfigurationInner;
+
+/**
+ * Type representing VpnServerConfiguration.
+ */
+public interface VpnServerConfiguration extends HasInner<VpnServerConfigurationInner>, Resource, GroupableResourceCore<NetworkManager, VpnServerConfigurationInner>, HasResourceGroup, Refreshable<VpnServerConfiguration>, Updatable<VpnServerConfiguration.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the aadAuthenticationParameters value.
+     */
+    AadAuthenticationParameters aadAuthenticationParameters();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the p2SVpnGateways value.
+     */
+    List<P2SVpnGateway> p2SVpnGateways();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the radiusClientRootCertificates value.
+     */
+    List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates();
+
+    /**
+     * @return the radiusServerAddress value.
+     */
+    String radiusServerAddress();
+
+    /**
+     * @return the radiusServerRootCertificates value.
+     */
+    List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates();
+
+    /**
+     * @return the radiusServers value.
+     */
+    List<RadiusServer> radiusServers();
+
+    /**
+     * @return the radiusServerSecret value.
+     */
+    String radiusServerSecret();
+
+    /**
+     * @return the vpnAuthenticationTypes value.
+     */
+    List<VpnAuthenticationType> vpnAuthenticationTypes();
+
+    /**
+     * @return the vpnClientIpsecPolicies value.
+     */
+    List<IpsecPolicy> vpnClientIpsecPolicies();
+
+    /**
+     * @return the vpnClientRevokedCertificates value.
+     */
+    List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates();
+
+    /**
+     * @return the vpnClientRootCertificates value.
+     */
+    List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates();
+
+    /**
+     * @return the vpnProtocols value.
+     */
+    List<VpnGatewayTunnelingProtocol> vpnProtocols();
+
+    /**
+     * @return the vpnServerConfigurationName value.
+     */
+    String vpnServerConfigurationName();
+
+    /**
+     * @return the vpnServerConfigurationPropertiesEtag value.
+     */
+    String vpnServerConfigurationPropertiesEtag();
+
+    /**
+     * The entirety of the VpnServerConfiguration definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VpnServerConfiguration definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VpnServerConfiguration definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VpnServerConfiguration definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify AadAuthenticationParameters.
+         */
+        interface WithAadAuthenticationParameters {
+            /**
+             * Specifies aadAuthenticationParameters.
+             * @param aadAuthenticationParameters The set of aad vpn authentication parameters
+             * @return the next definition stage
+             */
+            WithCreate withAadAuthenticationParameters(AadAuthenticationParameters aadAuthenticationParameters);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify RadiusClientRootCertificates.
+         */
+        interface WithRadiusClientRootCertificates {
+            /**
+             * Specifies radiusClientRootCertificates.
+             * @param radiusClientRootCertificates Radius client root certificate of VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withRadiusClientRootCertificates(List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify RadiusServerAddress.
+         */
+        interface WithRadiusServerAddress {
+            /**
+             * Specifies radiusServerAddress.
+             * @param radiusServerAddress The radius server address property of the VpnServerConfiguration resource for point to site client connection
+             * @return the next definition stage
+             */
+            WithCreate withRadiusServerAddress(String radiusServerAddress);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify RadiusServerRootCertificates.
+         */
+        interface WithRadiusServerRootCertificates {
+            /**
+             * Specifies radiusServerRootCertificates.
+             * @param radiusServerRootCertificates Radius Server root certificate of VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withRadiusServerRootCertificates(List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify RadiusServers.
+         */
+        interface WithRadiusServers {
+            /**
+             * Specifies radiusServers.
+             * @param radiusServers Multiple Radius Server configuration for VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withRadiusServers(List<RadiusServer> radiusServers);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify RadiusServerSecret.
+         */
+        interface WithRadiusServerSecret {
+            /**
+             * Specifies radiusServerSecret.
+             * @param radiusServerSecret The radius secret property of the VpnServerConfiguration resource for point to site client connection
+             * @return the next definition stage
+             */
+            WithCreate withRadiusServerSecret(String radiusServerSecret);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnAuthenticationTypes.
+         */
+        interface WithVpnAuthenticationTypes {
+            /**
+             * Specifies vpnAuthenticationTypes.
+             * @param vpnAuthenticationTypes VPN authentication types for the VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withVpnAuthenticationTypes(List<VpnAuthenticationType> vpnAuthenticationTypes);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnClientIpsecPolicies.
+         */
+        interface WithVpnClientIpsecPolicies {
+            /**
+             * Specifies vpnClientIpsecPolicies.
+             * @param vpnClientIpsecPolicies VpnClientIpsecPolicies for VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withVpnClientIpsecPolicies(List<IpsecPolicy> vpnClientIpsecPolicies);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnClientRevokedCertificates.
+         */
+        interface WithVpnClientRevokedCertificates {
+            /**
+             * Specifies vpnClientRevokedCertificates.
+             * @param vpnClientRevokedCertificates VPN client revoked certificate of VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withVpnClientRevokedCertificates(List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnClientRootCertificates.
+         */
+        interface WithVpnClientRootCertificates {
+            /**
+             * Specifies vpnClientRootCertificates.
+             * @param vpnClientRootCertificates VPN client root certificate of VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withVpnClientRootCertificates(List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnProtocols.
+         */
+        interface WithVpnProtocols {
+            /**
+             * Specifies vpnProtocols.
+             * @param vpnProtocols VPN protocols for the VpnServerConfiguration
+             * @return the next definition stage
+             */
+            WithCreate withVpnProtocols(List<VpnGatewayTunnelingProtocol> vpnProtocols);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration definition allowing to specify VpnServerConfigurationName.
+         */
+        interface WithVpnServerConfigurationName {
+            /**
+             * Specifies vpnServerConfigurationName.
+             * @param vpnServerConfigurationName The name of the VpnServerConfiguration that is unique within a resource group
+             * @return the next definition stage
+             */
+            WithCreate withVpnServerConfigurationName(String vpnServerConfigurationName);
+        }
+
+        /**
+         * 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<VpnServerConfiguration>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAadAuthenticationParameters, DefinitionStages.WithRadiusClientRootCertificates, DefinitionStages.WithRadiusServerAddress, DefinitionStages.WithRadiusServerRootCertificates, DefinitionStages.WithRadiusServers, DefinitionStages.WithRadiusServerSecret, DefinitionStages.WithVpnAuthenticationTypes, DefinitionStages.WithVpnClientIpsecPolicies, DefinitionStages.WithVpnClientRevokedCertificates, DefinitionStages.WithVpnClientRootCertificates, DefinitionStages.WithVpnProtocols, DefinitionStages.WithVpnServerConfigurationName {
+        }
+    }
+    /**
+     * The template for a VpnServerConfiguration update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VpnServerConfiguration>, Resource.UpdateWithTags<Update>, UpdateStages.WithAadAuthenticationParameters, UpdateStages.WithRadiusClientRootCertificates, UpdateStages.WithRadiusServerAddress, UpdateStages.WithRadiusServerRootCertificates, UpdateStages.WithRadiusServers, UpdateStages.WithRadiusServerSecret, UpdateStages.WithVpnAuthenticationTypes, UpdateStages.WithVpnClientIpsecPolicies, UpdateStages.WithVpnClientRevokedCertificates, UpdateStages.WithVpnClientRootCertificates, UpdateStages.WithVpnProtocols, UpdateStages.WithVpnServerConfigurationName {
+    }
+
+    /**
+     * Grouping of VpnServerConfiguration update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify AadAuthenticationParameters.
+         */
+        interface WithAadAuthenticationParameters {
+            /**
+             * Specifies aadAuthenticationParameters.
+             * @param aadAuthenticationParameters The set of aad vpn authentication parameters
+             * @return the next update stage
+             */
+            Update withAadAuthenticationParameters(AadAuthenticationParameters aadAuthenticationParameters);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify RadiusClientRootCertificates.
+         */
+        interface WithRadiusClientRootCertificates {
+            /**
+             * Specifies radiusClientRootCertificates.
+             * @param radiusClientRootCertificates Radius client root certificate of VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withRadiusClientRootCertificates(List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify RadiusServerAddress.
+         */
+        interface WithRadiusServerAddress {
+            /**
+             * Specifies radiusServerAddress.
+             * @param radiusServerAddress The radius server address property of the VpnServerConfiguration resource for point to site client connection
+             * @return the next update stage
+             */
+            Update withRadiusServerAddress(String radiusServerAddress);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify RadiusServerRootCertificates.
+         */
+        interface WithRadiusServerRootCertificates {
+            /**
+             * Specifies radiusServerRootCertificates.
+             * @param radiusServerRootCertificates Radius Server root certificate of VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withRadiusServerRootCertificates(List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify RadiusServers.
+         */
+        interface WithRadiusServers {
+            /**
+             * Specifies radiusServers.
+             * @param radiusServers Multiple Radius Server configuration for VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withRadiusServers(List<RadiusServer> radiusServers);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify RadiusServerSecret.
+         */
+        interface WithRadiusServerSecret {
+            /**
+             * Specifies radiusServerSecret.
+             * @param radiusServerSecret The radius secret property of the VpnServerConfiguration resource for point to site client connection
+             * @return the next update stage
+             */
+            Update withRadiusServerSecret(String radiusServerSecret);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnAuthenticationTypes.
+         */
+        interface WithVpnAuthenticationTypes {
+            /**
+             * Specifies vpnAuthenticationTypes.
+             * @param vpnAuthenticationTypes VPN authentication types for the VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withVpnAuthenticationTypes(List<VpnAuthenticationType> vpnAuthenticationTypes);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnClientIpsecPolicies.
+         */
+        interface WithVpnClientIpsecPolicies {
+            /**
+             * Specifies vpnClientIpsecPolicies.
+             * @param vpnClientIpsecPolicies VpnClientIpsecPolicies for VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withVpnClientIpsecPolicies(List<IpsecPolicy> vpnClientIpsecPolicies);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnClientRevokedCertificates.
+         */
+        interface WithVpnClientRevokedCertificates {
+            /**
+             * Specifies vpnClientRevokedCertificates.
+             * @param vpnClientRevokedCertificates VPN client revoked certificate of VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withVpnClientRevokedCertificates(List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnClientRootCertificates.
+         */
+        interface WithVpnClientRootCertificates {
+            /**
+             * Specifies vpnClientRootCertificates.
+             * @param vpnClientRootCertificates VPN client root certificate of VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withVpnClientRootCertificates(List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnProtocols.
+         */
+        interface WithVpnProtocols {
+            /**
+             * Specifies vpnProtocols.
+             * @param vpnProtocols VPN protocols for the VpnServerConfiguration
+             * @return the next update stage
+             */
+            Update withVpnProtocols(List<VpnGatewayTunnelingProtocol> vpnProtocols);
+        }
+
+        /**
+         * The stage of the vpnserverconfiguration update allowing to specify VpnServerConfigurationName.
+         */
+        interface WithVpnServerConfigurationName {
+            /**
+             * Specifies vpnServerConfigurationName.
+             * @param vpnServerConfigurationName The name of the VpnServerConfiguration that is unique within a resource group
+             * @return the next update stage
+             */
+            Update withVpnServerConfigurationName(String vpnServerConfigurationName);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurations.java
new file mode 100644
index 000000000000..c00d16b31887
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurations.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VpnServerConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnServerConfigurations.
+ */
+public interface VpnServerConfigurations extends SupportsCreating<VpnServerConfiguration.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VpnServerConfiguration>, SupportsListingByResourceGroup<VpnServerConfiguration>, SupportsListing<VpnServerConfiguration>, HasInner<VpnServerConfigurationsInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsAssociatedWithVirtualWans.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsAssociatedWithVirtualWans.java
new file mode 100644
index 000000000000..a4824eb47fe0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsAssociatedWithVirtualWans.java
@@ -0,0 +1,29 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnServerConfigurationsAssociatedWithVirtualWansInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnServerConfigurationsAssociatedWithVirtualWans.
+ */
+public interface VpnServerConfigurationsAssociatedWithVirtualWans extends HasInner<VpnServerConfigurationsAssociatedWithVirtualWansInner> {
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnServerConfigurationsResponse> listAsync(String resourceGroupName, String virtualWANName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsResponse.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsResponse.java
new file mode 100644
index 000000000000..d09d8109b308
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnServerConfigurationsResponse.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnServerConfigurationsResponseInner;
+import java.util.List;
+
+/**
+ * Type representing VpnServerConfigurationsResponse.
+ */
+public interface VpnServerConfigurationsResponse extends HasInner<VpnServerConfigurationsResponseInner>, HasManager<NetworkManager> {
+    /**
+     * @return the vpnServerConfigurationResourceIds value.
+     */
+    List<String> vpnServerConfigurationResourceIds();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSite.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSite.java
new file mode 100644
index 000000000000..8640e9b63e2c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSite.java
@@ -0,0 +1,313 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteInner;
+
+/**
+ * Type representing VpnSite.
+ */
+public interface VpnSite extends HasInner<VpnSiteInner>, Resource, GroupableResourceCore<NetworkManager, VpnSiteInner>, HasResourceGroup, Refreshable<VpnSite>, Updatable<VpnSite.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the addressSpace value.
+     */
+    AddressSpace addressSpace();
+
+    /**
+     * @return the bgpProperties value.
+     */
+    BgpSettings bgpProperties();
+
+    /**
+     * @return the deviceProperties value.
+     */
+    DeviceProperties deviceProperties();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the ipAddress value.
+     */
+    String ipAddress();
+
+    /**
+     * @return the isSecuritySite value.
+     */
+    Boolean isSecuritySite();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the siteKey value.
+     */
+    String siteKey();
+
+    /**
+     * @return the virtualWan value.
+     */
+    SubResource virtualWan();
+
+    /**
+     * @return the vpnSiteLinks value.
+     */
+    List<VpnSiteLink> vpnSiteLinks();
+
+    /**
+     * The entirety of the VpnSite definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VpnSite definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VpnSite definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the VpnSite definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify AddressSpace.
+         */
+        interface WithAddressSpace {
+            /**
+             * Specifies addressSpace.
+             * @param addressSpace The AddressSpace that contains an array of IP address ranges
+             * @return the next definition stage
+             */
+            WithCreate withAddressSpace(AddressSpace addressSpace);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify BgpProperties.
+         */
+        interface WithBgpProperties {
+            /**
+             * Specifies bgpProperties.
+             * @param bgpProperties The set of bgp properties
+             * @return the next definition stage
+             */
+            WithCreate withBgpProperties(BgpSettings bgpProperties);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify DeviceProperties.
+         */
+        interface WithDeviceProperties {
+            /**
+             * Specifies deviceProperties.
+             * @param deviceProperties The device properties
+             * @return the next definition stage
+             */
+            WithCreate withDeviceProperties(DeviceProperties deviceProperties);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify IpAddress.
+         */
+        interface WithIpAddress {
+            /**
+             * Specifies ipAddress.
+             * @param ipAddress The ip-address for the vpn-site
+             * @return the next definition stage
+             */
+            WithCreate withIpAddress(String ipAddress);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify IsSecuritySite.
+         */
+        interface WithIsSecuritySite {
+            /**
+             * Specifies isSecuritySite.
+             * @param isSecuritySite IsSecuritySite flag
+             * @return the next definition stage
+             */
+            WithCreate withIsSecuritySite(Boolean isSecuritySite);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify SiteKey.
+         */
+        interface WithSiteKey {
+            /**
+             * Specifies siteKey.
+             * @param siteKey The key for vpn-site that can be used for connections
+             * @return the next definition stage
+             */
+            WithCreate withSiteKey(String siteKey);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify VirtualWan.
+         */
+        interface WithVirtualWan {
+            /**
+             * Specifies virtualWan.
+             * @param virtualWan The VirtualWAN to which the vpnSite belongs
+             * @return the next definition stage
+             */
+            WithCreate withVirtualWan(SubResource virtualWan);
+        }
+
+        /**
+         * The stage of the vpnsite definition allowing to specify VpnSiteLinks.
+         */
+        interface WithVpnSiteLinks {
+            /**
+             * Specifies vpnSiteLinks.
+             * @param vpnSiteLinks List of all vpn site links
+             * @return the next definition stage
+             */
+            WithCreate withVpnSiteLinks(List<VpnSiteLinkInner> vpnSiteLinks);
+        }
+
+        /**
+         * 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<VpnSite>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAddressSpace, DefinitionStages.WithBgpProperties, DefinitionStages.WithDeviceProperties, DefinitionStages.WithIpAddress, DefinitionStages.WithIsSecuritySite, DefinitionStages.WithSiteKey, DefinitionStages.WithVirtualWan, DefinitionStages.WithVpnSiteLinks {
+        }
+    }
+    /**
+     * The template for a VpnSite update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VpnSite>, Resource.UpdateWithTags<Update>, UpdateStages.WithAddressSpace, UpdateStages.WithBgpProperties, UpdateStages.WithDeviceProperties, UpdateStages.WithIpAddress, UpdateStages.WithIsSecuritySite, UpdateStages.WithSiteKey, UpdateStages.WithVirtualWan, UpdateStages.WithVpnSiteLinks {
+    }
+
+    /**
+     * Grouping of VpnSite update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the vpnsite update allowing to specify AddressSpace.
+         */
+        interface WithAddressSpace {
+            /**
+             * Specifies addressSpace.
+             * @param addressSpace The AddressSpace that contains an array of IP address ranges
+             * @return the next update stage
+             */
+            Update withAddressSpace(AddressSpace addressSpace);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify BgpProperties.
+         */
+        interface WithBgpProperties {
+            /**
+             * Specifies bgpProperties.
+             * @param bgpProperties The set of bgp properties
+             * @return the next update stage
+             */
+            Update withBgpProperties(BgpSettings bgpProperties);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify DeviceProperties.
+         */
+        interface WithDeviceProperties {
+            /**
+             * Specifies deviceProperties.
+             * @param deviceProperties The device properties
+             * @return the next update stage
+             */
+            Update withDeviceProperties(DeviceProperties deviceProperties);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify IpAddress.
+         */
+        interface WithIpAddress {
+            /**
+             * Specifies ipAddress.
+             * @param ipAddress The ip-address for the vpn-site
+             * @return the next update stage
+             */
+            Update withIpAddress(String ipAddress);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify IsSecuritySite.
+         */
+        interface WithIsSecuritySite {
+            /**
+             * Specifies isSecuritySite.
+             * @param isSecuritySite IsSecuritySite flag
+             * @return the next update stage
+             */
+            Update withIsSecuritySite(Boolean isSecuritySite);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify SiteKey.
+         */
+        interface WithSiteKey {
+            /**
+             * Specifies siteKey.
+             * @param siteKey The key for vpn-site that can be used for connections
+             * @return the next update stage
+             */
+            Update withSiteKey(String siteKey);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify VirtualWan.
+         */
+        interface WithVirtualWan {
+            /**
+             * Specifies virtualWan.
+             * @param virtualWan The VirtualWAN to which the vpnSite belongs
+             * @return the next update stage
+             */
+            Update withVirtualWan(SubResource virtualWan);
+        }
+
+        /**
+         * The stage of the vpnsite update allowing to specify VpnSiteLinks.
+         */
+        interface WithVpnSiteLinks {
+            /**
+             * Specifies vpnSiteLinks.
+             * @param vpnSiteLinks List of all vpn site links
+             * @return the next update stage
+             */
+            Update withVpnSiteLinks(List<VpnSiteLinkInner> vpnSiteLinks);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteId.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteId.java
new file mode 100644
index 000000000000..1c84cbeeefa2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteId.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.network.v2020_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VpnSite Resource.
+ */
+public class VpnSiteId {
+    /**
+     * The resource-uri of the vpn-site for which config is to be fetched.
+     */
+    @JsonProperty(value = "vpnSite", access = JsonProperty.Access.WRITE_ONLY)
+    private String vpnSite;
+
+    /**
+     * Get the resource-uri of the vpn-site for which config is to be fetched.
+     *
+     * @return the vpnSite value
+     */
+    public String vpnSite() {
+        return this.vpnSite;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLink.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLink.java
new file mode 100644
index 000000000000..46b7ce369228
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLink.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.network.v2020_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkInner;
+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.network.v2020_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing VpnSiteLink.
+ */
+public interface VpnSiteLink extends HasInner<VpnSiteLinkInner>, Indexable, Refreshable<VpnSiteLink>, HasManager<NetworkManager> {
+    /**
+     * @return the bgpProperties value.
+     */
+    VpnLinkBgpSettings bgpProperties();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the fqdn value.
+     */
+    String fqdn();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipAddress value.
+     */
+    String ipAddress();
+
+    /**
+     * @return the linkProperties value.
+     */
+    VpnLinkProviderProperties linkProperties();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinkConnections.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinkConnections.java
new file mode 100644
index 000000000000..9977ff5a2ecd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinkConnections.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinkConnectionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnSiteLinkConnections.
+ */
+public interface VpnSiteLinkConnections extends HasInner<VpnSiteLinkConnectionsInner> {
+    /**
+     * Retrieves the details of a vpn site link connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @param linkConnectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnConnectionVpnGatewayVpnSiteLinkConnection> getAsync(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinks.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinks.java
new file mode 100644
index 000000000000..2042951d2223
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSiteLinks.java
@@ -0,0 +1,40 @@
+/**
+ * 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.network.v2020_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSiteLinksInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnSiteLinks.
+ */
+public interface VpnSiteLinks extends HasInner<VpnSiteLinksInner> {
+    /**
+     * Retrieves the details of a VPN site link.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @param vpnSiteLinkName The name of the VpnSiteLink being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnSiteLink> getAsync(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName);
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VpnSiteLink> listByVpnSiteAsync(final String resourceGroupName, final String vpnSiteName);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSites.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSites.java
new file mode 100644
index 000000000000..94d9ca80fe55
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSites.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.VpnSitesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnSites.
+ */
+public interface VpnSites extends SupportsCreating<VpnSite.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VpnSite>, SupportsListingByResourceGroup<VpnSite>, SupportsListing<VpnSite>, HasInner<VpnSitesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSitesConfigurations.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSitesConfigurations.java
new file mode 100644
index 000000000000..67aede79baf9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnSitesConfigurations.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.network.v2020_04_01;
+
+import rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.VpnSitesConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing VpnSitesConfigurations.
+ */
+public interface VpnSitesConfigurations extends HasInner<VpnSitesConfigurationsInner> {
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable downloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request);
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnType.java
new file mode 100644
index 000000000000..99cd210a2879
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/VpnType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for VpnType.
+ */
+public final class VpnType extends ExpandableStringEnum<VpnType> {
+    /** Static value PolicyBased for VpnType. */
+    public static final VpnType POLICY_BASED = fromString("PolicyBased");
+
+    /** Static value RouteBased for VpnType. */
+    public static final VpnType ROUTE_BASED = fromString("RouteBased");
+
+    /**
+     * Creates or finds a VpnType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding VpnType
+     */
+    @JsonCreator
+    public static VpnType fromString(String name) {
+        return fromString(name, VpnType.class);
+    }
+
+    /**
+     * @return known VpnType values
+     */
+    public static Collection<VpnType> values() {
+        return values(VpnType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallAction.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallAction.java
new file mode 100644
index 000000000000..04614980db41
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallAction.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallAction.
+ */
+public final class WebApplicationFirewallAction extends ExpandableStringEnum<WebApplicationFirewallAction> {
+    /** Static value Allow for WebApplicationFirewallAction. */
+    public static final WebApplicationFirewallAction ALLOW = fromString("Allow");
+
+    /** Static value Block for WebApplicationFirewallAction. */
+    public static final WebApplicationFirewallAction BLOCK = fromString("Block");
+
+    /** Static value Log for WebApplicationFirewallAction. */
+    public static final WebApplicationFirewallAction LOG = fromString("Log");
+
+    /**
+     * Creates or finds a WebApplicationFirewallAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallAction
+     */
+    @JsonCreator
+    public static WebApplicationFirewallAction fromString(String name) {
+        return fromString(name, WebApplicationFirewallAction.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallAction values
+     */
+    public static Collection<WebApplicationFirewallAction> values() {
+        return values(WebApplicationFirewallAction.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallCustomRule.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallCustomRule.java
new file mode 100644
index 000000000000..02953ba2cf2a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallCustomRule.java
@@ -0,0 +1,165 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines contents of a web application rule.
+ */
+public class WebApplicationFirewallCustomRule {
+    /**
+     * The name of the resource that is unique within a policy. This name can
+     * be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Priority of the rule. Rules with a lower value will be evaluated before
+     * rules with a higher value.
+     */
+    @JsonProperty(value = "priority", required = true)
+    private int priority;
+
+    /**
+     * The rule type. Possible values include: 'MatchRule', 'Invalid'.
+     */
+    @JsonProperty(value = "ruleType", required = true)
+    private WebApplicationFirewallRuleType ruleType;
+
+    /**
+     * List of match conditions.
+     */
+    @JsonProperty(value = "matchConditions", required = true)
+    private List<MatchCondition> matchConditions;
+
+    /**
+     * Type of Actions. Possible values include: 'Allow', 'Block', 'Log'.
+     */
+    @JsonProperty(value = "action", required = true)
+    private WebApplicationFirewallAction action;
+
+    /**
+     * Get the name of the resource that is unique within a policy. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a policy. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the WebApplicationFirewallCustomRule object itself.
+     */
+    public WebApplicationFirewallCustomRule withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get priority of the rule. Rules with a lower value will be evaluated before rules with a higher value.
+     *
+     * @return the priority value
+     */
+    public int priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the rule. Rules with a lower value will be evaluated before rules with a higher value.
+     *
+     * @param priority the priority value to set
+     * @return the WebApplicationFirewallCustomRule object itself.
+     */
+    public WebApplicationFirewallCustomRule withPriority(int priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the rule type. Possible values include: 'MatchRule', 'Invalid'.
+     *
+     * @return the ruleType value
+     */
+    public WebApplicationFirewallRuleType ruleType() {
+        return this.ruleType;
+    }
+
+    /**
+     * Set the rule type. Possible values include: 'MatchRule', 'Invalid'.
+     *
+     * @param ruleType the ruleType value to set
+     * @return the WebApplicationFirewallCustomRule object itself.
+     */
+    public WebApplicationFirewallCustomRule withRuleType(WebApplicationFirewallRuleType ruleType) {
+        this.ruleType = ruleType;
+        return this;
+    }
+
+    /**
+     * Get list of match conditions.
+     *
+     * @return the matchConditions value
+     */
+    public List<MatchCondition> matchConditions() {
+        return this.matchConditions;
+    }
+
+    /**
+     * Set list of match conditions.
+     *
+     * @param matchConditions the matchConditions value to set
+     * @return the WebApplicationFirewallCustomRule object itself.
+     */
+    public WebApplicationFirewallCustomRule withMatchConditions(List<MatchCondition> matchConditions) {
+        this.matchConditions = matchConditions;
+        return this;
+    }
+
+    /**
+     * Get type of Actions. Possible values include: 'Allow', 'Block', 'Log'.
+     *
+     * @return the action value
+     */
+    public WebApplicationFirewallAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set type of Actions. Possible values include: 'Allow', 'Block', 'Log'.
+     *
+     * @param action the action value to set
+     * @return the WebApplicationFirewallCustomRule object itself.
+     */
+    public WebApplicationFirewallCustomRule withAction(WebApplicationFirewallAction action) {
+        this.action = action;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallEnabledState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallEnabledState.java
new file mode 100644
index 000000000000..014c9ba36b6f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallEnabledState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallEnabledState.
+ */
+public final class WebApplicationFirewallEnabledState extends ExpandableStringEnum<WebApplicationFirewallEnabledState> {
+    /** Static value Disabled for WebApplicationFirewallEnabledState. */
+    public static final WebApplicationFirewallEnabledState DISABLED = fromString("Disabled");
+
+    /** Static value Enabled for WebApplicationFirewallEnabledState. */
+    public static final WebApplicationFirewallEnabledState ENABLED = fromString("Enabled");
+
+    /**
+     * Creates or finds a WebApplicationFirewallEnabledState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallEnabledState
+     */
+    @JsonCreator
+    public static WebApplicationFirewallEnabledState fromString(String name) {
+        return fromString(name, WebApplicationFirewallEnabledState.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallEnabledState values
+     */
+    public static Collection<WebApplicationFirewallEnabledState> values() {
+        return values(WebApplicationFirewallEnabledState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMatchVariable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMatchVariable.java
new file mode 100644
index 000000000000..107580afc870
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMatchVariable.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallMatchVariable.
+ */
+public final class WebApplicationFirewallMatchVariable extends ExpandableStringEnum<WebApplicationFirewallMatchVariable> {
+    /** Static value RemoteAddr for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REMOTE_ADDR = fromString("RemoteAddr");
+
+    /** Static value RequestMethod for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REQUEST_METHOD = fromString("RequestMethod");
+
+    /** Static value QueryString for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable QUERY_STRING = fromString("QueryString");
+
+    /** Static value PostArgs for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable POST_ARGS = fromString("PostArgs");
+
+    /** Static value RequestUri for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REQUEST_URI = fromString("RequestUri");
+
+    /** Static value RequestHeaders for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REQUEST_HEADERS = fromString("RequestHeaders");
+
+    /** Static value RequestBody for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REQUEST_BODY = fromString("RequestBody");
+
+    /** Static value RequestCookies for WebApplicationFirewallMatchVariable. */
+    public static final WebApplicationFirewallMatchVariable REQUEST_COOKIES = fromString("RequestCookies");
+
+    /**
+     * Creates or finds a WebApplicationFirewallMatchVariable from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallMatchVariable
+     */
+    @JsonCreator
+    public static WebApplicationFirewallMatchVariable fromString(String name) {
+        return fromString(name, WebApplicationFirewallMatchVariable.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallMatchVariable values
+     */
+    public static Collection<WebApplicationFirewallMatchVariable> values() {
+        return values(WebApplicationFirewallMatchVariable.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMode.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMode.java
new file mode 100644
index 000000000000..18cd232149c4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallMode.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallMode.
+ */
+public final class WebApplicationFirewallMode extends ExpandableStringEnum<WebApplicationFirewallMode> {
+    /** Static value Prevention for WebApplicationFirewallMode. */
+    public static final WebApplicationFirewallMode PREVENTION = fromString("Prevention");
+
+    /** Static value Detection for WebApplicationFirewallMode. */
+    public static final WebApplicationFirewallMode DETECTION = fromString("Detection");
+
+    /**
+     * Creates or finds a WebApplicationFirewallMode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallMode
+     */
+    @JsonCreator
+    public static WebApplicationFirewallMode fromString(String name) {
+        return fromString(name, WebApplicationFirewallMode.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallMode values
+     */
+    public static Collection<WebApplicationFirewallMode> values() {
+        return values(WebApplicationFirewallMode.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallOperator.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallOperator.java
new file mode 100644
index 000000000000..a5ea8d8481b9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallOperator.java
@@ -0,0 +1,68 @@
+/**
+ * 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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallOperator.
+ */
+public final class WebApplicationFirewallOperator extends ExpandableStringEnum<WebApplicationFirewallOperator> {
+    /** Static value IPMatch for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator IPMATCH = fromString("IPMatch");
+
+    /** Static value Equal for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator EQUAL = fromString("Equal");
+
+    /** Static value Contains for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator CONTAINS = fromString("Contains");
+
+    /** Static value LessThan for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator LESS_THAN = fromString("LessThan");
+
+    /** Static value GreaterThan for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator GREATER_THAN = fromString("GreaterThan");
+
+    /** Static value LessThanOrEqual for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator LESS_THAN_OR_EQUAL = fromString("LessThanOrEqual");
+
+    /** Static value GreaterThanOrEqual for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator GREATER_THAN_OR_EQUAL = fromString("GreaterThanOrEqual");
+
+    /** Static value BeginsWith for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator BEGINS_WITH = fromString("BeginsWith");
+
+    /** Static value EndsWith for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator ENDS_WITH = fromString("EndsWith");
+
+    /** Static value Regex for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator REGEX = fromString("Regex");
+
+    /** Static value GeoMatch for WebApplicationFirewallOperator. */
+    public static final WebApplicationFirewallOperator GEO_MATCH = fromString("GeoMatch");
+
+    /**
+     * Creates or finds a WebApplicationFirewallOperator from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallOperator
+     */
+    @JsonCreator
+    public static WebApplicationFirewallOperator fromString(String name) {
+        return fromString(name, WebApplicationFirewallOperator.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallOperator values
+     */
+    public static Collection<WebApplicationFirewallOperator> values() {
+        return values(WebApplicationFirewallOperator.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicies.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicies.java
new file mode 100644
index 000000000000..60e97771cf1c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicies.java
@@ -0,0 +1,25 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.WebApplicationFirewallPoliciesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing WebApplicationFirewallPolicies.
+ */
+public interface WebApplicationFirewallPolicies extends SupportsCreating<WebApplicationFirewallPolicy.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<WebApplicationFirewallPolicy>, SupportsListingByResourceGroup<WebApplicationFirewallPolicy>, SupportsListing<WebApplicationFirewallPolicy>, HasInner<WebApplicationFirewallPoliciesInner> {
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicy.java
new file mode 100644
index 000000000000..713b632ba474
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicy.java
@@ -0,0 +1,175 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.implementation.NetworkManager;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.implementation.WebApplicationFirewallPolicyInner;
+
+/**
+ * Type representing WebApplicationFirewallPolicy.
+ */
+public interface WebApplicationFirewallPolicy extends HasInner<WebApplicationFirewallPolicyInner>, Resource, GroupableResourceCore<NetworkManager, WebApplicationFirewallPolicyInner>, HasResourceGroup, Refreshable<WebApplicationFirewallPolicy>, Updatable<WebApplicationFirewallPolicy.Update>, HasManager<NetworkManager> {
+    /**
+     * @return the applicationGateways value.
+     */
+    List<ApplicationGateway> applicationGateways();
+
+    /**
+     * @return the customRules value.
+     */
+    List<WebApplicationFirewallCustomRule> customRules();
+
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the httpListeners value.
+     */
+    List<SubResource> httpListeners();
+
+    /**
+     * @return the managedRules value.
+     */
+    ManagedRulesDefinition managedRules();
+
+    /**
+     * @return the pathBasedRules value.
+     */
+    List<SubResource> pathBasedRules();
+
+    /**
+     * @return the policySettings value.
+     */
+    PolicySettings policySettings();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningState provisioningState();
+
+    /**
+     * @return the resourceState value.
+     */
+    WebApplicationFirewallPolicyResourceState resourceState();
+
+    /**
+     * The entirety of the WebApplicationFirewallPolicy definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithManagedRules, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of WebApplicationFirewallPolicy definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a WebApplicationFirewallPolicy definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the WebApplicationFirewallPolicy definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithManagedRules> {
+        }
+
+        /**
+         * The stage of the webapplicationfirewallpolicy definition allowing to specify ManagedRules.
+         */
+        interface WithManagedRules {
+           /**
+            * Specifies managedRules.
+            * @param managedRules Describes the managedRules structure
+            * @return the next definition stage
+*/
+            WithCreate withManagedRules(ManagedRulesDefinition managedRules);
+        }
+
+        /**
+         * The stage of the webapplicationfirewallpolicy definition allowing to specify CustomRules.
+         */
+        interface WithCustomRules {
+            /**
+             * Specifies customRules.
+             * @param customRules The custom rules inside the policy
+             * @return the next definition stage
+             */
+            WithCreate withCustomRules(List<WebApplicationFirewallCustomRule> customRules);
+        }
+
+        /**
+         * The stage of the webapplicationfirewallpolicy definition allowing to specify PolicySettings.
+         */
+        interface WithPolicySettings {
+            /**
+             * Specifies policySettings.
+             * @param policySettings The PolicySettings for policy
+             * @return the next definition stage
+             */
+            WithCreate withPolicySettings(PolicySettings policySettings);
+        }
+
+        /**
+         * 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<WebApplicationFirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCustomRules, DefinitionStages.WithPolicySettings {
+        }
+    }
+    /**
+     * The template for a WebApplicationFirewallPolicy update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<WebApplicationFirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithCustomRules, UpdateStages.WithPolicySettings {
+    }
+
+    /**
+     * Grouping of WebApplicationFirewallPolicy update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the webapplicationfirewallpolicy update allowing to specify CustomRules.
+         */
+        interface WithCustomRules {
+            /**
+             * Specifies customRules.
+             * @param customRules The custom rules inside the policy
+             * @return the next update stage
+             */
+            Update withCustomRules(List<WebApplicationFirewallCustomRule> customRules);
+        }
+
+        /**
+         * The stage of the webapplicationfirewallpolicy update allowing to specify PolicySettings.
+         */
+        interface WithPolicySettings {
+            /**
+             * Specifies policySettings.
+             * @param policySettings The PolicySettings for policy
+             * @return the next update stage
+             */
+            Update withPolicySettings(PolicySettings policySettings);
+        }
+
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicyResourceState.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicyResourceState.java
new file mode 100644
index 000000000000..16ec64326301
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallPolicyResourceState.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallPolicyResourceState.
+ */
+public final class WebApplicationFirewallPolicyResourceState extends ExpandableStringEnum<WebApplicationFirewallPolicyResourceState> {
+    /** Static value Creating for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState CREATING = fromString("Creating");
+
+    /** Static value Enabling for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState ENABLING = fromString("Enabling");
+
+    /** Static value Enabled for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState ENABLED = fromString("Enabled");
+
+    /** Static value Disabling for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState DISABLING = fromString("Disabling");
+
+    /** Static value Disabled for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState DISABLED = fromString("Disabled");
+
+    /** Static value Deleting for WebApplicationFirewallPolicyResourceState. */
+    public static final WebApplicationFirewallPolicyResourceState DELETING = fromString("Deleting");
+
+    /**
+     * Creates or finds a WebApplicationFirewallPolicyResourceState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallPolicyResourceState
+     */
+    @JsonCreator
+    public static WebApplicationFirewallPolicyResourceState fromString(String name) {
+        return fromString(name, WebApplicationFirewallPolicyResourceState.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallPolicyResourceState values
+     */
+    public static Collection<WebApplicationFirewallPolicyResourceState> values() {
+        return values(WebApplicationFirewallPolicyResourceState.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallRuleType.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallRuleType.java
new file mode 100644
index 000000000000..4ac1551d7f88
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallRuleType.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallRuleType.
+ */
+public final class WebApplicationFirewallRuleType extends ExpandableStringEnum<WebApplicationFirewallRuleType> {
+    /** Static value MatchRule for WebApplicationFirewallRuleType. */
+    public static final WebApplicationFirewallRuleType MATCH_RULE = fromString("MatchRule");
+
+    /** Static value Invalid for WebApplicationFirewallRuleType. */
+    public static final WebApplicationFirewallRuleType INVALID = fromString("Invalid");
+
+    /**
+     * Creates or finds a WebApplicationFirewallRuleType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallRuleType
+     */
+    @JsonCreator
+    public static WebApplicationFirewallRuleType fromString(String name) {
+        return fromString(name, WebApplicationFirewallRuleType.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallRuleType values
+     */
+    public static Collection<WebApplicationFirewallRuleType> values() {
+        return values(WebApplicationFirewallRuleType.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallTransform.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallTransform.java
new file mode 100644
index 000000000000..f6cb38bc7aec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/WebApplicationFirewallTransform.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.network.v2020_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for WebApplicationFirewallTransform.
+ */
+public final class WebApplicationFirewallTransform extends ExpandableStringEnum<WebApplicationFirewallTransform> {
+    /** Static value Lowercase for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform LOWERCASE = fromString("Lowercase");
+
+    /** Static value Trim for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform TRIM = fromString("Trim");
+
+    /** Static value UrlDecode for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform URL_DECODE = fromString("UrlDecode");
+
+    /** Static value UrlEncode for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform URL_ENCODE = fromString("UrlEncode");
+
+    /** Static value RemoveNulls for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform REMOVE_NULLS = fromString("RemoveNulls");
+
+    /** Static value HtmlEntityDecode for WebApplicationFirewallTransform. */
+    public static final WebApplicationFirewallTransform HTML_ENTITY_DECODE = fromString("HtmlEntityDecode");
+
+    /**
+     * Creates or finds a WebApplicationFirewallTransform from its string representation.
+     * @param name a name to look for
+     * @return the corresponding WebApplicationFirewallTransform
+     */
+    @JsonCreator
+    public static WebApplicationFirewallTransform fromString(String name) {
+        return fromString(name, WebApplicationFirewallTransform.class);
+    }
+
+    /**
+     * @return known WebApplicationFirewallTransform values
+     */
+    public static Collection<WebApplicationFirewallTransform> values() {
+        return values(WebApplicationFirewallTransform.class);
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsImpl.java
new file mode 100644
index 000000000000..6f194b0cd0c8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAvailableSslOptions;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCipherSuite;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPolicyName;
+import com.microsoft.azure.SubResource;
+import java.util.Map;
+
+class ApplicationGatewayAvailableSslOptionsImpl extends WrapperImpl<ApplicationGatewayAvailableSslOptionsInner> implements ApplicationGatewayAvailableSslOptions {
+    private final NetworkManager manager;
+    ApplicationGatewayAvailableSslOptionsImpl(ApplicationGatewayAvailableSslOptionsInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ApplicationGatewaySslCipherSuite> availableCipherSuites() {
+        return this.inner().availableCipherSuites();
+    }
+
+    @Override
+    public List<ApplicationGatewaySslProtocol> availableProtocols() {
+        return this.inner().availableProtocols();
+    }
+
+    @Override
+    public ApplicationGatewaySslPolicyName defaultPolicy() {
+        return this.inner().defaultPolicy();
+    }
+
+    @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<SubResource> predefinedPolicies() {
+        return this.inner().predefinedPolicies();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsInner.java
new file mode 100644
index 000000000000..f5679e6e8dfa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableSslOptionsInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPolicyName;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCipherSuite;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslProtocol;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Response for ApplicationGatewayAvailableSslOptions API service call.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ApplicationGatewayAvailableSslOptionsInner extends Resource {
+    /**
+     * List of available Ssl predefined policy.
+     */
+    @JsonProperty(value = "properties.predefinedPolicies")
+    private List<SubResource> predefinedPolicies;
+
+    /**
+     * Name of the Ssl predefined policy applied by default to application
+     * gateway. Possible values include: 'AppGwSslPolicy20150501',
+     * 'AppGwSslPolicy20170401', 'AppGwSslPolicy20170401S'.
+     */
+    @JsonProperty(value = "properties.defaultPolicy")
+    private ApplicationGatewaySslPolicyName defaultPolicy;
+
+    /**
+     * List of available Ssl cipher suites.
+     */
+    @JsonProperty(value = "properties.availableCipherSuites")
+    private List<ApplicationGatewaySslCipherSuite> availableCipherSuites;
+
+    /**
+     * List of available Ssl protocols.
+     */
+    @JsonProperty(value = "properties.availableProtocols")
+    private List<ApplicationGatewaySslProtocol> availableProtocols;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get list of available Ssl predefined policy.
+     *
+     * @return the predefinedPolicies value
+     */
+    public List<SubResource> predefinedPolicies() {
+        return this.predefinedPolicies;
+    }
+
+    /**
+     * Set list of available Ssl predefined policy.
+     *
+     * @param predefinedPolicies the predefinedPolicies value to set
+     * @return the ApplicationGatewayAvailableSslOptionsInner object itself.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner withPredefinedPolicies(List<SubResource> predefinedPolicies) {
+        this.predefinedPolicies = predefinedPolicies;
+        return this;
+    }
+
+    /**
+     * Get name of the Ssl predefined policy applied by default to application gateway. Possible values include: 'AppGwSslPolicy20150501', 'AppGwSslPolicy20170401', 'AppGwSslPolicy20170401S'.
+     *
+     * @return the defaultPolicy value
+     */
+    public ApplicationGatewaySslPolicyName defaultPolicy() {
+        return this.defaultPolicy;
+    }
+
+    /**
+     * Set name of the Ssl predefined policy applied by default to application gateway. Possible values include: 'AppGwSslPolicy20150501', 'AppGwSslPolicy20170401', 'AppGwSslPolicy20170401S'.
+     *
+     * @param defaultPolicy the defaultPolicy value to set
+     * @return the ApplicationGatewayAvailableSslOptionsInner object itself.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner withDefaultPolicy(ApplicationGatewaySslPolicyName defaultPolicy) {
+        this.defaultPolicy = defaultPolicy;
+        return this;
+    }
+
+    /**
+     * Get list of available Ssl cipher suites.
+     *
+     * @return the availableCipherSuites value
+     */
+    public List<ApplicationGatewaySslCipherSuite> availableCipherSuites() {
+        return this.availableCipherSuites;
+    }
+
+    /**
+     * Set list of available Ssl cipher suites.
+     *
+     * @param availableCipherSuites the availableCipherSuites value to set
+     * @return the ApplicationGatewayAvailableSslOptionsInner object itself.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner withAvailableCipherSuites(List<ApplicationGatewaySslCipherSuite> availableCipherSuites) {
+        this.availableCipherSuites = availableCipherSuites;
+        return this;
+    }
+
+    /**
+     * Get list of available Ssl protocols.
+     *
+     * @return the availableProtocols value
+     */
+    public List<ApplicationGatewaySslProtocol> availableProtocols() {
+        return this.availableProtocols;
+    }
+
+    /**
+     * Set list of available Ssl protocols.
+     *
+     * @param availableProtocols the availableProtocols value to set
+     * @return the ApplicationGatewayAvailableSslOptionsInner object itself.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner withAvailableProtocols(List<ApplicationGatewaySslProtocol> availableProtocols) {
+        this.availableProtocols = availableProtocols;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ApplicationGatewayAvailableSslOptionsInner object itself.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultImpl.java
new file mode 100644
index 000000000000..f555d16e1224
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAvailableWafRuleSetsResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFirewallRuleSet;
+
+class ApplicationGatewayAvailableWafRuleSetsResultImpl extends WrapperImpl<ApplicationGatewayAvailableWafRuleSetsResultInner> implements ApplicationGatewayAvailableWafRuleSetsResult {
+    private final NetworkManager manager;
+    ApplicationGatewayAvailableWafRuleSetsResultImpl(ApplicationGatewayAvailableWafRuleSetsResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ApplicationGatewayFirewallRuleSet> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultInner.java
new file mode 100644
index 000000000000..a016bc2cdfdb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayAvailableWafRuleSetsResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFirewallRuleSet;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ApplicationGatewayAvailableWafRuleSets API service call.
+ */
+public class ApplicationGatewayAvailableWafRuleSetsResultInner {
+    /**
+     * The list of application gateway rule sets.
+     */
+    @JsonProperty(value = "value")
+    private List<ApplicationGatewayFirewallRuleSet> value;
+
+    /**
+     * Get the list of application gateway rule sets.
+     *
+     * @return the value value
+     */
+    public List<ApplicationGatewayFirewallRuleSet> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the list of application gateway rule sets.
+     *
+     * @param value the value value to set
+     * @return the ApplicationGatewayAvailableWafRuleSetsResultInner object itself.
+     */
+    public ApplicationGatewayAvailableWafRuleSetsResultInner withValue(List<ApplicationGatewayFirewallRuleSet> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthImpl.java
new file mode 100644
index 000000000000..48510d641195
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealth;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthPool;
+
+class ApplicationGatewayBackendHealthImpl extends WrapperImpl<ApplicationGatewayBackendHealthInner> implements ApplicationGatewayBackendHealth {
+    private final NetworkManager manager;
+    ApplicationGatewayBackendHealthImpl(ApplicationGatewayBackendHealthInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ApplicationGatewayBackendHealthPool> backendAddressPools() {
+        return this.inner().backendAddressPools();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthInner.java
new file mode 100644
index 000000000000..5712c11171a3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthPool;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ApplicationGatewayBackendHealth API service call.
+ */
+public class ApplicationGatewayBackendHealthInner {
+    /**
+     * A list of ApplicationGatewayBackendHealthPool resources.
+     */
+    @JsonProperty(value = "backendAddressPools")
+    private List<ApplicationGatewayBackendHealthPool> backendAddressPools;
+
+    /**
+     * Get a list of ApplicationGatewayBackendHealthPool resources.
+     *
+     * @return the backendAddressPools value
+     */
+    public List<ApplicationGatewayBackendHealthPool> backendAddressPools() {
+        return this.backendAddressPools;
+    }
+
+    /**
+     * Set a list of ApplicationGatewayBackendHealthPool resources.
+     *
+     * @param backendAddressPools the backendAddressPools value to set
+     * @return the ApplicationGatewayBackendHealthInner object itself.
+     */
+    public ApplicationGatewayBackendHealthInner withBackendAddressPools(List<ApplicationGatewayBackendHealthPool> backendAddressPools) {
+        this.backendAddressPools = backendAddressPools;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandImpl.java
new file mode 100644
index 000000000000..845c9aa7f30a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthOnDemand;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthHttpSettings;
+
+class ApplicationGatewayBackendHealthOnDemandImpl extends WrapperImpl<ApplicationGatewayBackendHealthOnDemandInner> implements ApplicationGatewayBackendHealthOnDemand {
+    private final NetworkManager manager;
+    ApplicationGatewayBackendHealthOnDemandImpl(ApplicationGatewayBackendHealthOnDemandInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ApplicationGatewayBackendAddressPool backendAddressPool() {
+        return this.inner().backendAddressPool();
+    }
+
+    @Override
+    public ApplicationGatewayBackendHealthHttpSettings backendHealthHttpSettings() {
+        return this.inner().backendHealthHttpSettings();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandInner.java
new file mode 100644
index 000000000000..e3f11d98beaa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayBackendHealthOnDemandInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthHttpSettings;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Result of on demand test probe.
+ */
+public class ApplicationGatewayBackendHealthOnDemandInner {
+    /**
+     * Reference to an ApplicationGatewayBackendAddressPool resource.
+     */
+    @JsonProperty(value = "backendAddressPool")
+    private ApplicationGatewayBackendAddressPool backendAddressPool;
+
+    /**
+     * Application gateway BackendHealthHttp settings.
+     */
+    @JsonProperty(value = "backendHealthHttpSettings")
+    private ApplicationGatewayBackendHealthHttpSettings backendHealthHttpSettings;
+
+    /**
+     * Get reference to an ApplicationGatewayBackendAddressPool resource.
+     *
+     * @return the backendAddressPool value
+     */
+    public ApplicationGatewayBackendAddressPool backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set reference to an ApplicationGatewayBackendAddressPool resource.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the ApplicationGatewayBackendHealthOnDemandInner object itself.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner withBackendAddressPool(ApplicationGatewayBackendAddressPool backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get application gateway BackendHealthHttp settings.
+     *
+     * @return the backendHealthHttpSettings value
+     */
+    public ApplicationGatewayBackendHealthHttpSettings backendHealthHttpSettings() {
+        return this.backendHealthHttpSettings;
+    }
+
+    /**
+     * Set application gateway BackendHealthHttp settings.
+     *
+     * @param backendHealthHttpSettings the backendHealthHttpSettings value to set
+     * @return the ApplicationGatewayBackendHealthOnDemandInner object itself.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner withBackendHealthHttpSettings(ApplicationGatewayBackendHealthHttpSettings backendHealthHttpSettings) {
+        this.backendHealthHttpSettings = backendHealthHttpSettings;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayImpl.java
new file mode 100644
index 000000000000..200026f43d4b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayImpl.java
@@ -0,0 +1,365 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGateway;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySku;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayOperationalState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAuthenticationCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayTrustedRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFrontendPort;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayProbe;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHttpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayHttpListener;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayUrlPathMap;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRequestRoutingRule;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRewriteRuleSet;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRedirectConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayWebApplicationFirewallConfiguration;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAutoscaleConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayCustomError;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+
+class ApplicationGatewayImpl extends GroupableResourceCoreImpl<ApplicationGateway, ApplicationGatewayInner, ApplicationGatewayImpl, NetworkManager> implements ApplicationGateway, ApplicationGateway.Definition, ApplicationGateway.Update {
+    ApplicationGatewayImpl(String name, ApplicationGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ApplicationGateway> createResourceAsync() {
+        ApplicationGatewaysInner client = this.manager().inner().applicationGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ApplicationGateway> updateResourceAsync() {
+        ApplicationGatewaysInner client = this.manager().inner().applicationGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ApplicationGatewayInner> getInnerAsync() {
+        ApplicationGatewaysInner client = this.manager().inner().applicationGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates() {
+        return this.inner().authenticationCertificates();
+    }
+
+    @Override
+    public ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration() {
+        return this.inner().autoscaleConfiguration();
+    }
+
+    @Override
+    public List<ApplicationGatewayBackendAddressPool> backendAddressPools() {
+        return this.inner().backendAddressPools();
+    }
+
+    @Override
+    public List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection() {
+        return this.inner().backendHttpSettingsCollection();
+    }
+
+    @Override
+    public List<ApplicationGatewayCustomError> customErrorConfigurations() {
+        return this.inner().customErrorConfigurations();
+    }
+
+    @Override
+    public Boolean enableFips() {
+        return this.inner().enableFips();
+    }
+
+    @Override
+    public Boolean enableHttp2() {
+        return this.inner().enableHttp2();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource firewallPolicy() {
+        return this.inner().firewallPolicy();
+    }
+
+    @Override
+    public Boolean forceFirewallPolicyAssociation() {
+        return this.inner().forceFirewallPolicyAssociation();
+    }
+
+    @Override
+    public List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations() {
+        return this.inner().frontendIPConfigurations();
+    }
+
+    @Override
+    public List<ApplicationGatewayFrontendPort> frontendPorts() {
+        return this.inner().frontendPorts();
+    }
+
+    @Override
+    public List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations() {
+        return this.inner().gatewayIPConfigurations();
+    }
+
+    @Override
+    public List<ApplicationGatewayHttpListener> httpListeners() {
+        return this.inner().httpListeners();
+    }
+
+    @Override
+    public ManagedServiceIdentity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public ApplicationGatewayOperationalState operationalState() {
+        return this.inner().operationalState();
+    }
+
+    @Override
+    public List<ApplicationGatewayProbe> probes() {
+        return this.inner().probes();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<ApplicationGatewayRedirectConfiguration> redirectConfigurations() {
+        return this.inner().redirectConfigurations();
+    }
+
+    @Override
+    public List<ApplicationGatewayRequestRoutingRule> requestRoutingRules() {
+        return this.inner().requestRoutingRules();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets() {
+        return this.inner().rewriteRuleSets();
+    }
+
+    @Override
+    public ApplicationGatewaySku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public List<ApplicationGatewaySslCertificate> sslCertificates() {
+        return this.inner().sslCertificates();
+    }
+
+    @Override
+    public ApplicationGatewaySslPolicy sslPolicy() {
+        return this.inner().sslPolicy();
+    }
+
+    @Override
+    public List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates() {
+        return this.inner().trustedRootCertificates();
+    }
+
+    @Override
+    public List<ApplicationGatewayUrlPathMap> urlPathMaps() {
+        return this.inner().urlPathMaps();
+    }
+
+    @Override
+    public ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration() {
+        return this.inner().webApplicationFirewallConfiguration();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+    @Override
+    public ApplicationGatewayImpl withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates) {
+        this.inner().withAuthenticationCertificates(authenticationCertificates);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration) {
+        this.inner().withAutoscaleConfiguration(autoscaleConfiguration);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools) {
+        this.inner().withBackendAddressPools(backendAddressPools);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection) {
+        this.inner().withBackendHttpSettingsCollection(backendHttpSettingsCollection);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withCustomErrorConfigurations(List<ApplicationGatewayCustomError> customErrorConfigurations) {
+        this.inner().withCustomErrorConfigurations(customErrorConfigurations);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withEnableFips(Boolean enableFips) {
+        this.inner().withEnableFips(enableFips);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withEnableHttp2(Boolean enableHttp2) {
+        this.inner().withEnableHttp2(enableHttp2);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withFirewallPolicy(SubResource firewallPolicy) {
+        this.inner().withFirewallPolicy(firewallPolicy);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withForceFirewallPolicyAssociation(Boolean forceFirewallPolicyAssociation) {
+        this.inner().withForceFirewallPolicyAssociation(forceFirewallPolicyAssociation);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations) {
+        this.inner().withFrontendIPConfigurations(frontendIPConfigurations);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts) {
+        this.inner().withFrontendPorts(frontendPorts);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations) {
+        this.inner().withGatewayIPConfigurations(gatewayIPConfigurations);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners) {
+        this.inner().withHttpListeners(httpListeners);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withIdentity(ManagedServiceIdentity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withProbes(List<ApplicationGatewayProbe> probes) {
+        this.inner().withProbes(probes);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations) {
+        this.inner().withRedirectConfigurations(redirectConfigurations);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules) {
+        this.inner().withRequestRoutingRules(requestRoutingRules);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withRewriteRuleSets(List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets) {
+        this.inner().withRewriteRuleSets(rewriteRuleSets);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withSku(ApplicationGatewaySku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates) {
+        this.inner().withSslCertificates(sslCertificates);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withSslPolicy(ApplicationGatewaySslPolicy sslPolicy) {
+        this.inner().withSslPolicy(sslPolicy);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withTrustedRootCertificates(List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates) {
+        this.inner().withTrustedRootCertificates(trustedRootCertificates);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps) {
+        this.inner().withUrlPathMaps(urlPathMaps);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration) {
+        this.inner().withWebApplicationFirewallConfiguration(webApplicationFirewallConfiguration);
+        return this;
+    }
+
+    @Override
+    public ApplicationGatewayImpl withZones(List<String> zones) {
+        this.inner().withZones(zones);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayInner.java
new file mode 100644
index 000000000000..b7b4b282fb62
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewayInner.java
@@ -0,0 +1,808 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySku;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayOperationalState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAuthenticationCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayTrustedRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayFrontendPort;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayProbe;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHttpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayHttpListener;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayUrlPathMap;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRequestRoutingRule;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRewriteRuleSet;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayRedirectConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayWebApplicationFirewallConfiguration;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAutoscaleConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayCustomError;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Application gateway resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ApplicationGatewayInner extends Resource {
+    /**
+     * SKU of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.sku")
+    private ApplicationGatewaySku sku;
+
+    /**
+     * SSL policy of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.sslPolicy")
+    private ApplicationGatewaySslPolicy sslPolicy;
+
+    /**
+     * Operational state of the application gateway resource. Possible values
+     * include: 'Stopped', 'Starting', 'Running', 'Stopping'.
+     */
+    @JsonProperty(value = "properties.operationalState", access = JsonProperty.Access.WRITE_ONLY)
+    private ApplicationGatewayOperationalState operationalState;
+
+    /**
+     * Subnets of the application gateway resource. For default limits, see
+     * [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.gatewayIPConfigurations")
+    private List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations;
+
+    /**
+     * Authentication certificates of the application gateway resource. For
+     * default limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.authenticationCertificates")
+    private List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates;
+
+    /**
+     * Trusted Root certificates of the application gateway resource. For
+     * default limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.trustedRootCertificates")
+    private List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates;
+
+    /**
+     * SSL certificates of the application gateway resource. For default
+     * limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.sslCertificates")
+    private List<ApplicationGatewaySslCertificate> sslCertificates;
+
+    /**
+     * Frontend IP addresses of the application gateway resource. For default
+     * limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.frontendIPConfigurations")
+    private List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations;
+
+    /**
+     * Frontend ports of the application gateway resource. For default limits,
+     * see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.frontendPorts")
+    private List<ApplicationGatewayFrontendPort> frontendPorts;
+
+    /**
+     * Probes of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.probes")
+    private List<ApplicationGatewayProbe> probes;
+
+    /**
+     * Backend address pool of the application gateway resource. For default
+     * limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.backendAddressPools")
+    private List<ApplicationGatewayBackendAddressPool> backendAddressPools;
+
+    /**
+     * Backend http settings of the application gateway resource. For default
+     * limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.backendHttpSettingsCollection")
+    private List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection;
+
+    /**
+     * Http listeners of the application gateway resource. For default limits,
+     * see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.httpListeners")
+    private List<ApplicationGatewayHttpListener> httpListeners;
+
+    /**
+     * URL path map of the application gateway resource. For default limits,
+     * see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.urlPathMaps")
+    private List<ApplicationGatewayUrlPathMap> urlPathMaps;
+
+    /**
+     * Request routing rules of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.requestRoutingRules")
+    private List<ApplicationGatewayRequestRoutingRule> requestRoutingRules;
+
+    /**
+     * Rewrite rules for the application gateway resource.
+     */
+    @JsonProperty(value = "properties.rewriteRuleSets")
+    private List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets;
+
+    /**
+     * Redirect configurations of the application gateway resource. For default
+     * limits, see [Application Gateway
+     * limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     */
+    @JsonProperty(value = "properties.redirectConfigurations")
+    private List<ApplicationGatewayRedirectConfiguration> redirectConfigurations;
+
+    /**
+     * Web application firewall configuration.
+     */
+    @JsonProperty(value = "properties.webApplicationFirewallConfiguration")
+    private ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration;
+
+    /**
+     * Reference to the FirewallPolicy resource.
+     */
+    @JsonProperty(value = "properties.firewallPolicy")
+    private SubResource firewallPolicy;
+
+    /**
+     * Whether HTTP2 is enabled on the application gateway resource.
+     */
+    @JsonProperty(value = "properties.enableHttp2")
+    private Boolean enableHttp2;
+
+    /**
+     * Whether FIPS is enabled on the application gateway resource.
+     */
+    @JsonProperty(value = "properties.enableFips")
+    private Boolean enableFips;
+
+    /**
+     * Autoscale Configuration.
+     */
+    @JsonProperty(value = "properties.autoscaleConfiguration")
+    private ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration;
+
+    /**
+     * The resource GUID property of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the application gateway resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Custom error configurations of the application gateway resource.
+     */
+    @JsonProperty(value = "properties.customErrorConfigurations")
+    private List<ApplicationGatewayCustomError> customErrorConfigurations;
+
+    /**
+     * If true, associates a firewall policy with an application gateway
+     * regardless whether the policy differs from the WAF Config.
+     */
+    @JsonProperty(value = "properties.forceFirewallPolicyAssociation")
+    private Boolean forceFirewallPolicyAssociation;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * A list of availability zones denoting where the resource needs to come
+     * from.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * The identity of the application gateway, if configured.
+     */
+    @JsonProperty(value = "identity")
+    private ManagedServiceIdentity identity;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get sKU of the application gateway resource.
+     *
+     * @return the sku value
+     */
+    public ApplicationGatewaySku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set sKU of the application gateway resource.
+     *
+     * @param sku the sku value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withSku(ApplicationGatewaySku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get sSL policy of the application gateway resource.
+     *
+     * @return the sslPolicy value
+     */
+    public ApplicationGatewaySslPolicy sslPolicy() {
+        return this.sslPolicy;
+    }
+
+    /**
+     * Set sSL policy of the application gateway resource.
+     *
+     * @param sslPolicy the sslPolicy value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withSslPolicy(ApplicationGatewaySslPolicy sslPolicy) {
+        this.sslPolicy = sslPolicy;
+        return this;
+    }
+
+    /**
+     * Get operational state of the application gateway resource. Possible values include: 'Stopped', 'Starting', 'Running', 'Stopping'.
+     *
+     * @return the operationalState value
+     */
+    public ApplicationGatewayOperationalState operationalState() {
+        return this.operationalState;
+    }
+
+    /**
+     * Get subnets of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the gatewayIPConfigurations value
+     */
+    public List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations() {
+        return this.gatewayIPConfigurations;
+    }
+
+    /**
+     * Set subnets of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param gatewayIPConfigurations the gatewayIPConfigurations value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations) {
+        this.gatewayIPConfigurations = gatewayIPConfigurations;
+        return this;
+    }
+
+    /**
+     * Get authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the authenticationCertificates value
+     */
+    public List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates() {
+        return this.authenticationCertificates;
+    }
+
+    /**
+     * Set authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param authenticationCertificates the authenticationCertificates value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates) {
+        this.authenticationCertificates = authenticationCertificates;
+        return this;
+    }
+
+    /**
+     * Get trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the trustedRootCertificates value
+     */
+    public List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates() {
+        return this.trustedRootCertificates;
+    }
+
+    /**
+     * Set trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param trustedRootCertificates the trustedRootCertificates value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withTrustedRootCertificates(List<ApplicationGatewayTrustedRootCertificate> trustedRootCertificates) {
+        this.trustedRootCertificates = trustedRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get sSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the sslCertificates value
+     */
+    public List<ApplicationGatewaySslCertificate> sslCertificates() {
+        return this.sslCertificates;
+    }
+
+    /**
+     * Set sSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param sslCertificates the sslCertificates value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates) {
+        this.sslCertificates = sslCertificates;
+        return this;
+    }
+
+    /**
+     * Get frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the frontendIPConfigurations value
+     */
+    public List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations() {
+        return this.frontendIPConfigurations;
+    }
+
+    /**
+     * Set frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param frontendIPConfigurations the frontendIPConfigurations value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations) {
+        this.frontendIPConfigurations = frontendIPConfigurations;
+        return this;
+    }
+
+    /**
+     * Get frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the frontendPorts value
+     */
+    public List<ApplicationGatewayFrontendPort> frontendPorts() {
+        return this.frontendPorts;
+    }
+
+    /**
+     * Set frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param frontendPorts the frontendPorts value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts) {
+        this.frontendPorts = frontendPorts;
+        return this;
+    }
+
+    /**
+     * Get probes of the application gateway resource.
+     *
+     * @return the probes value
+     */
+    public List<ApplicationGatewayProbe> probes() {
+        return this.probes;
+    }
+
+    /**
+     * Set probes of the application gateway resource.
+     *
+     * @param probes the probes value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withProbes(List<ApplicationGatewayProbe> probes) {
+        this.probes = probes;
+        return this;
+    }
+
+    /**
+     * Get backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the backendAddressPools value
+     */
+    public List<ApplicationGatewayBackendAddressPool> backendAddressPools() {
+        return this.backendAddressPools;
+    }
+
+    /**
+     * Set backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param backendAddressPools the backendAddressPools value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools) {
+        this.backendAddressPools = backendAddressPools;
+        return this;
+    }
+
+    /**
+     * Get backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the backendHttpSettingsCollection value
+     */
+    public List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection() {
+        return this.backendHttpSettingsCollection;
+    }
+
+    /**
+     * Set backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param backendHttpSettingsCollection the backendHttpSettingsCollection value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection) {
+        this.backendHttpSettingsCollection = backendHttpSettingsCollection;
+        return this;
+    }
+
+    /**
+     * Get http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the httpListeners value
+     */
+    public List<ApplicationGatewayHttpListener> httpListeners() {
+        return this.httpListeners;
+    }
+
+    /**
+     * Set http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param httpListeners the httpListeners value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners) {
+        this.httpListeners = httpListeners;
+        return this;
+    }
+
+    /**
+     * Get uRL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the urlPathMaps value
+     */
+    public List<ApplicationGatewayUrlPathMap> urlPathMaps() {
+        return this.urlPathMaps;
+    }
+
+    /**
+     * Set uRL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param urlPathMaps the urlPathMaps value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps) {
+        this.urlPathMaps = urlPathMaps;
+        return this;
+    }
+
+    /**
+     * Get request routing rules of the application gateway resource.
+     *
+     * @return the requestRoutingRules value
+     */
+    public List<ApplicationGatewayRequestRoutingRule> requestRoutingRules() {
+        return this.requestRoutingRules;
+    }
+
+    /**
+     * Set request routing rules of the application gateway resource.
+     *
+     * @param requestRoutingRules the requestRoutingRules value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules) {
+        this.requestRoutingRules = requestRoutingRules;
+        return this;
+    }
+
+    /**
+     * Get rewrite rules for the application gateway resource.
+     *
+     * @return the rewriteRuleSets value
+     */
+    public List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets() {
+        return this.rewriteRuleSets;
+    }
+
+    /**
+     * Set rewrite rules for the application gateway resource.
+     *
+     * @param rewriteRuleSets the rewriteRuleSets value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withRewriteRuleSets(List<ApplicationGatewayRewriteRuleSet> rewriteRuleSets) {
+        this.rewriteRuleSets = rewriteRuleSets;
+        return this;
+    }
+
+    /**
+     * Get redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @return the redirectConfigurations value
+     */
+    public List<ApplicationGatewayRedirectConfiguration> redirectConfigurations() {
+        return this.redirectConfigurations;
+    }
+
+    /**
+     * Set redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).
+     *
+     * @param redirectConfigurations the redirectConfigurations value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations) {
+        this.redirectConfigurations = redirectConfigurations;
+        return this;
+    }
+
+    /**
+     * Get web application firewall configuration.
+     *
+     * @return the webApplicationFirewallConfiguration value
+     */
+    public ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration() {
+        return this.webApplicationFirewallConfiguration;
+    }
+
+    /**
+     * Set web application firewall configuration.
+     *
+     * @param webApplicationFirewallConfiguration the webApplicationFirewallConfiguration value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration) {
+        this.webApplicationFirewallConfiguration = webApplicationFirewallConfiguration;
+        return this;
+    }
+
+    /**
+     * Get reference to the FirewallPolicy resource.
+     *
+     * @return the firewallPolicy value
+     */
+    public SubResource firewallPolicy() {
+        return this.firewallPolicy;
+    }
+
+    /**
+     * Set reference to the FirewallPolicy resource.
+     *
+     * @param firewallPolicy the firewallPolicy value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withFirewallPolicy(SubResource firewallPolicy) {
+        this.firewallPolicy = firewallPolicy;
+        return this;
+    }
+
+    /**
+     * Get whether HTTP2 is enabled on the application gateway resource.
+     *
+     * @return the enableHttp2 value
+     */
+    public Boolean enableHttp2() {
+        return this.enableHttp2;
+    }
+
+    /**
+     * Set whether HTTP2 is enabled on the application gateway resource.
+     *
+     * @param enableHttp2 the enableHttp2 value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withEnableHttp2(Boolean enableHttp2) {
+        this.enableHttp2 = enableHttp2;
+        return this;
+    }
+
+    /**
+     * Get whether FIPS is enabled on the application gateway resource.
+     *
+     * @return the enableFips value
+     */
+    public Boolean enableFips() {
+        return this.enableFips;
+    }
+
+    /**
+     * Set whether FIPS is enabled on the application gateway resource.
+     *
+     * @param enableFips the enableFips value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withEnableFips(Boolean enableFips) {
+        this.enableFips = enableFips;
+        return this;
+    }
+
+    /**
+     * Get autoscale Configuration.
+     *
+     * @return the autoscaleConfiguration value
+     */
+    public ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration() {
+        return this.autoscaleConfiguration;
+    }
+
+    /**
+     * Set autoscale Configuration.
+     *
+     * @param autoscaleConfiguration the autoscaleConfiguration value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration) {
+        this.autoscaleConfiguration = autoscaleConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the application gateway resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the application gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get custom error configurations of the application gateway resource.
+     *
+     * @return the customErrorConfigurations value
+     */
+    public List<ApplicationGatewayCustomError> customErrorConfigurations() {
+        return this.customErrorConfigurations;
+    }
+
+    /**
+     * Set custom error configurations of the application gateway resource.
+     *
+     * @param customErrorConfigurations the customErrorConfigurations value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withCustomErrorConfigurations(List<ApplicationGatewayCustomError> customErrorConfigurations) {
+        this.customErrorConfigurations = customErrorConfigurations;
+        return this;
+    }
+
+    /**
+     * Get if true, associates a firewall policy with an application gateway regardless whether the policy differs from the WAF Config.
+     *
+     * @return the forceFirewallPolicyAssociation value
+     */
+    public Boolean forceFirewallPolicyAssociation() {
+        return this.forceFirewallPolicyAssociation;
+    }
+
+    /**
+     * Set if true, associates a firewall policy with an application gateway regardless whether the policy differs from the WAF Config.
+     *
+     * @param forceFirewallPolicyAssociation the forceFirewallPolicyAssociation value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withForceFirewallPolicyAssociation(Boolean forceFirewallPolicyAssociation) {
+        this.forceFirewallPolicyAssociation = forceFirewallPolicyAssociation;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get a list of availability zones denoting where the resource needs to come from.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting where the resource needs to come from.
+     *
+     * @param zones the zones value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the identity of the application gateway, if configured.
+     *
+     * @return the identity value
+     */
+    public ManagedServiceIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the identity of the application gateway, if configured.
+     *
+     * @param identity the identity value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withIdentity(ManagedServiceIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ApplicationGatewayInner object itself.
+     */
+    public ApplicationGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyImpl.java
new file mode 100644
index 000000000000..6d1170d82e1b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyImpl.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.
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPredefinedPolicy;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCipherSuite;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslProtocol;
+
+class ApplicationGatewaySslPredefinedPolicyImpl extends WrapperImpl<ApplicationGatewaySslPredefinedPolicyInner> implements ApplicationGatewaySslPredefinedPolicy {
+    private final NetworkManager manager;
+    ApplicationGatewaySslPredefinedPolicyImpl(ApplicationGatewaySslPredefinedPolicyInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ApplicationGatewaySslCipherSuite> cipherSuites() {
+        return this.inner().cipherSuites();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public ApplicationGatewaySslProtocol minProtocolVersion() {
+        return this.inner().minProtocolVersion();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyInner.java
new file mode 100644
index 000000000000..f96d0220e25c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaySslPredefinedPolicyInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslCipherSuite;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslProtocol;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * An Ssl predefined policy.
+ */
+@JsonFlatten
+public class ApplicationGatewaySslPredefinedPolicyInner extends SubResource {
+    /**
+     * Name of the Ssl predefined policy.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Ssl cipher suites to be enabled in the specified order for application
+     * gateway.
+     */
+    @JsonProperty(value = "properties.cipherSuites")
+    private List<ApplicationGatewaySslCipherSuite> cipherSuites;
+
+    /**
+     * Minimum version of Ssl protocol to be supported on application gateway.
+     * Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     */
+    @JsonProperty(value = "properties.minProtocolVersion")
+    private ApplicationGatewaySslProtocol minProtocolVersion;
+
+    /**
+     * Get name of the Ssl predefined policy.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the Ssl predefined policy.
+     *
+     * @param name the name value to set
+     * @return the ApplicationGatewaySslPredefinedPolicyInner object itself.
+     */
+    public ApplicationGatewaySslPredefinedPolicyInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get ssl cipher suites to be enabled in the specified order for application gateway.
+     *
+     * @return the cipherSuites value
+     */
+    public List<ApplicationGatewaySslCipherSuite> cipherSuites() {
+        return this.cipherSuites;
+    }
+
+    /**
+     * Set ssl cipher suites to be enabled in the specified order for application gateway.
+     *
+     * @param cipherSuites the cipherSuites value to set
+     * @return the ApplicationGatewaySslPredefinedPolicyInner object itself.
+     */
+    public ApplicationGatewaySslPredefinedPolicyInner withCipherSuites(List<ApplicationGatewaySslCipherSuite> cipherSuites) {
+        this.cipherSuites = cipherSuites;
+        return this;
+    }
+
+    /**
+     * Get minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     *
+     * @return the minProtocolVersion value
+     */
+    public ApplicationGatewaySslProtocol minProtocolVersion() {
+        return this.minProtocolVersion;
+    }
+
+    /**
+     * Set minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv1_0', 'TLSv1_1', 'TLSv1_2'.
+     *
+     * @param minProtocolVersion the minProtocolVersion value to set
+     * @return the ApplicationGatewaySslPredefinedPolicyInner object itself.
+     */
+    public ApplicationGatewaySslPredefinedPolicyInner withMinProtocolVersion(ApplicationGatewaySslProtocol minProtocolVersion) {
+        this.minProtocolVersion = minProtocolVersion;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysImpl.java
new file mode 100644
index 000000000000..7e11639e6832
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysImpl.java
@@ -0,0 +1,268 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGateways;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGateway;
+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 java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealth;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendHealthOnDemand;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAvailableWafRuleSetsResult;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayOnDemandProbe;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayAvailableSslOptions;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewaySslPredefinedPolicy;
+
+class ApplicationGatewaysImpl extends GroupableResourcesCoreImpl<ApplicationGateway, ApplicationGatewayImpl, ApplicationGatewayInner, ApplicationGatewaysInner, NetworkManager>  implements ApplicationGateways {
+    protected ApplicationGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().applicationGateways(), manager);
+    }
+
+    @Override
+    protected Observable<ApplicationGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ApplicationGatewaysInner 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<ApplicationGateway> listByResourceGroup(String resourceGroupName) {
+        ApplicationGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ApplicationGateway> listByResourceGroupAsync(String resourceGroupName) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ApplicationGatewayInner>, Iterable<ApplicationGatewayInner>>() {
+            @Override
+            public Iterable<ApplicationGatewayInner> call(Page<ApplicationGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ApplicationGatewayInner, ApplicationGateway>() {
+            @Override
+            public ApplicationGateway call(ApplicationGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ApplicationGateway> list() {
+        ApplicationGatewaysInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ApplicationGateway> listAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ApplicationGatewayInner>, Iterable<ApplicationGatewayInner>>() {
+            @Override
+            public Iterable<ApplicationGatewayInner> call(Page<ApplicationGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ApplicationGatewayInner, ApplicationGateway>() {
+            @Override
+            public ApplicationGateway call(ApplicationGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ApplicationGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Completable startAsync(String resourceGroupName, String applicationGatewayName) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.startAsync(resourceGroupName, applicationGatewayName).toCompletable();
+    }
+
+    @Override
+    public Completable stopAsync(String resourceGroupName, String applicationGatewayName) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.stopAsync(resourceGroupName, applicationGatewayName).toCompletable();
+    }
+
+    @Override
+    public Observable<ApplicationGatewayBackendHealth> backendHealthAsync(String resourceGroupName, String applicationGatewayName) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.backendHealthAsync(resourceGroupName, applicationGatewayName)
+        .map(new Func1<ApplicationGatewayBackendHealthInner, ApplicationGatewayBackendHealth>() {
+            @Override
+            public ApplicationGatewayBackendHealth call(ApplicationGatewayBackendHealthInner inner) {
+                return new ApplicationGatewayBackendHealthImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ApplicationGatewayBackendHealthOnDemand> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.backendHealthOnDemandAsync(resourceGroupName, applicationGatewayName, probeRequest)
+        .map(new Func1<ApplicationGatewayBackendHealthOnDemandInner, ApplicationGatewayBackendHealthOnDemand>() {
+            @Override
+            public ApplicationGatewayBackendHealthOnDemand call(ApplicationGatewayBackendHealthOnDemandInner inner) {
+                return new ApplicationGatewayBackendHealthOnDemandImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<String> listAvailableServerVariablesAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableServerVariablesAsync()
+        .flatMap(new Func1<List<String>, Observable<String>>() {
+            @Override
+            public Observable<String> call(List<String> innerList) {
+                return Observable.from(innerList);
+            }
+        });}
+
+    @Override
+    public Observable<String> listAvailableRequestHeadersAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableRequestHeadersAsync()
+        .flatMap(new Func1<List<String>, Observable<String>>() {
+            @Override
+            public Observable<String> call(List<String> innerList) {
+                return Observable.from(innerList);
+            }
+        });}
+
+    @Override
+    public Observable<String> listAvailableResponseHeadersAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableResponseHeadersAsync()
+        .flatMap(new Func1<List<String>, Observable<String>>() {
+            @Override
+            public Observable<String> call(List<String> innerList) {
+                return Observable.from(innerList);
+            }
+        });}
+
+    @Override
+    public Observable<ApplicationGatewayAvailableWafRuleSetsResult> listAvailableWafRuleSetsAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableWafRuleSetsAsync()
+        .map(new Func1<ApplicationGatewayAvailableWafRuleSetsResultInner, ApplicationGatewayAvailableWafRuleSetsResult>() {
+            @Override
+            public ApplicationGatewayAvailableWafRuleSetsResult call(ApplicationGatewayAvailableWafRuleSetsResultInner inner) {
+                return new ApplicationGatewayAvailableWafRuleSetsResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected ApplicationGatewayImpl wrapModel(ApplicationGatewayInner inner) {
+        return  new ApplicationGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ApplicationGatewayImpl wrapModel(String name) {
+        return new ApplicationGatewayImpl(name, new ApplicationGatewayInner(), this.manager());
+    }
+
+    @Override
+    public Observable<ApplicationGatewayAvailableSslOptions> listAvailableSslOptionsAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableSslOptionsAsync()
+        .map(new Func1<ApplicationGatewayAvailableSslOptionsInner, ApplicationGatewayAvailableSslOptions>() {
+            @Override
+            public ApplicationGatewayAvailableSslOptions call(ApplicationGatewayAvailableSslOptionsInner inner) {
+                return new ApplicationGatewayAvailableSslOptionsImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ApplicationGatewaySslPredefinedPolicy> listAvailableSslPredefinedPoliciesAsync() {
+        ApplicationGatewaysInner client = this.inner();
+        return client.listAvailableSslPredefinedPoliciesAsync()
+        .flatMapIterable(new Func1<Page<ApplicationGatewaySslPredefinedPolicyInner>, Iterable<ApplicationGatewaySslPredefinedPolicyInner>>() {
+            @Override
+            public Iterable<ApplicationGatewaySslPredefinedPolicyInner> call(Page<ApplicationGatewaySslPredefinedPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ApplicationGatewaySslPredefinedPolicyInner, ApplicationGatewaySslPredefinedPolicy>() {
+            @Override
+            public ApplicationGatewaySslPredefinedPolicy call(ApplicationGatewaySslPredefinedPolicyInner inner) {
+                return new ApplicationGatewaySslPredefinedPolicyImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ApplicationGatewaySslPredefinedPolicy> getSslPredefinedPolicyAsync(String predefinedPolicyName) {
+        ApplicationGatewaysInner client = this.inner();
+        return client.getSslPredefinedPolicyAsync(predefinedPolicyName)
+        .map(new Func1<ApplicationGatewaySslPredefinedPolicyInner, ApplicationGatewaySslPredefinedPolicy>() {
+            @Override
+            public ApplicationGatewaySslPredefinedPolicy call(ApplicationGatewaySslPredefinedPolicyInner inner) {
+                return new ApplicationGatewaySslPredefinedPolicyImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysInner.java
new file mode 100644
index 000000000000..4b3683b393da
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationGatewaysInner.java
@@ -0,0 +1,2780 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayOnDemandProbe;
+import com.microsoft.azure.management.network.v2020_04_01.ErrorException;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ApplicationGateways.
+ */
+public class ApplicationGatewaysInner implements InnerSupportsGet<ApplicationGatewayInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ApplicationGatewayInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ApplicationGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ApplicationGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ApplicationGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ApplicationGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ApplicationGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ApplicationGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ApplicationGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Body ApplicationGatewayInner 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.network.v2020_04_01.ApplicationGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Body ApplicationGatewayInner 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.network.v2020_04_01.ApplicationGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ApplicationGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways")
+        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.network.v2020_04_01.ApplicationGateways list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGateways")
+        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.network.v2020_04_01.ApplicationGateways start" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/start")
+        Observable<Response<ResponseBody>> start(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways beginStart" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/start")
+        Observable<Response<ResponseBody>> beginStart(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways stop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/stop")
+        Observable<Response<ResponseBody>> stop(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways beginStop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/stop")
+        Observable<Response<ResponseBody>> beginStop(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @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.network.v2020_04_01.ApplicationGateways backendHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendhealth")
+        Observable<Response<ResponseBody>> backendHealth(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.ApplicationGateways beginBackendHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendhealth")
+        Observable<Response<ResponseBody>> beginBackendHealth(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.ApplicationGateways backendHealthOnDemand" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/getBackendHealthOnDemand")
+        Observable<Response<ResponseBody>> backendHealthOnDemand(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Body ApplicationGatewayOnDemandProbe probeRequest, @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.network.v2020_04_01.ApplicationGateways beginBackendHealthOnDemand" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/getBackendHealthOnDemand")
+        Observable<Response<ResponseBody>> beginBackendHealthOnDemand(@Path("resourceGroupName") String resourceGroupName, @Path("applicationGatewayName") String applicationGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Body ApplicationGatewayOnDemandProbe probeRequest, @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.network.v2020_04_01.ApplicationGateways listAvailableServerVariables" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableServerVariables")
+        Observable<Response<ResponseBody>> listAvailableServerVariables(@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.network.v2020_04_01.ApplicationGateways listAvailableRequestHeaders" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableRequestHeaders")
+        Observable<Response<ResponseBody>> listAvailableRequestHeaders(@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.network.v2020_04_01.ApplicationGateways listAvailableResponseHeaders" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableResponseHeaders")
+        Observable<Response<ResponseBody>> listAvailableResponseHeaders(@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.network.v2020_04_01.ApplicationGateways listAvailableWafRuleSets" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableWafRuleSets")
+        Observable<Response<ResponseBody>> listAvailableWafRuleSets(@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.network.v2020_04_01.ApplicationGateways listAvailableSslOptions" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableSslOptions/default")
+        Observable<Response<ResponseBody>> listAvailableSslOptions(@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.network.v2020_04_01.ApplicationGateways listAvailableSslPredefinedPolicies" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableSslOptions/default/predefinedPolicies")
+        Observable<Response<ResponseBody>> listAvailableSslPredefinedPolicies(@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.network.v2020_04_01.ApplicationGateways getSslPredefinedPolicy" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableSslOptions/default/predefinedPolicies/{predefinedPolicyName}")
+        Observable<Response<ResponseBody>> getSslPredefinedPolicy(@Path("subscriptionId") String subscriptionId, @Path("predefinedPolicyName") String predefinedPolicyName, @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.network.v2020_04_01.ApplicationGateways 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.network.v2020_04_01.ApplicationGateways 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.network.v2020_04_01.ApplicationGateways listAvailableSslPredefinedPoliciesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAvailableSslPredefinedPoliciesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 applicationGatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String applicationGatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 applicationGatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String applicationGatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), 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 specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 ApplicationGatewayInner object if successful.
+     */
+    public ApplicationGatewayInner getByResourceGroup(String resourceGroupName, String applicationGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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<ApplicationGatewayInner> getByResourceGroupAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<ApplicationGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ApplicationGatewayInner> getByResourceGroupAsync(String resourceGroupName, String applicationGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<ApplicationGatewayInner>, ApplicationGatewayInner>() {
+            @Override
+            public ApplicationGatewayInner call(ServiceResponse<ApplicationGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway 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 ApplicationGatewayInner object if successful.
+     */
+    public ApplicationGatewayInner createOrUpdate(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @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<ApplicationGatewayInner> createOrUpdateAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters, final ServiceCallback<ApplicationGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationGatewayInner> createOrUpdateAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters).map(new Func1<ServiceResponse<ApplicationGatewayInner>, ApplicationGatewayInner>() {
+            @Override
+            public ApplicationGatewayInner call(ServiceResponse<ApplicationGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ApplicationGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway 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 ApplicationGatewayInner object if successful.
+     */
+    public ApplicationGatewayInner beginCreateOrUpdate(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @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<ApplicationGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters, final ServiceCallback<ApplicationGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ApplicationGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationGatewayName, parameters).map(new Func1<ServiceResponse<ApplicationGatewayInner>, ApplicationGatewayInner>() {
+            @Override
+            public ApplicationGatewayInner call(ServiceResponse<ApplicationGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param parameters Parameters supplied to the create or update application gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayInner>() { }.getType())
+                .register(201, new TypeToken<ApplicationGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 ApplicationGatewayInner object if successful.
+     */
+    public ApplicationGatewayInner updateTags(String resourceGroupName, String applicationGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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<ApplicationGatewayInner> updateTagsAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<ApplicationGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ApplicationGatewayInner> updateTagsAsync(String resourceGroupName, String applicationGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<ApplicationGatewayInner>, ApplicationGatewayInner>() {
+            @Override
+            public ApplicationGatewayInner call(ServiceResponse<ApplicationGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param tags Resource tags.
+     * @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 ApplicationGatewayInner object if successful.
+     */
+    public ApplicationGatewayInner updateTags(String resourceGroupName, String applicationGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param tags Resource tags.
+     * @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<ApplicationGatewayInner> updateTagsAsync(String resourceGroupName, String applicationGatewayName, Map<String, String> tags, final ServiceCallback<ApplicationGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ApplicationGatewayInner> updateTagsAsync(String resourceGroupName, String applicationGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationGatewayName, tags).map(new Func1<ServiceResponse<ApplicationGatewayInner>, ApplicationGatewayInner>() {
+            @Override
+            public ApplicationGatewayInner call(ServiceResponse<ApplicationGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates the specified application gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ApplicationGatewayInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ApplicationGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ApplicationGatewayInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ApplicationGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ApplicationGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewayInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Page<ApplicationGatewayInner>>() {
+                @Override
+                public Page<ApplicationGatewayInner> call(ServiceResponse<Page<ApplicationGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(ServiceResponse<Page<ApplicationGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<ApplicationGatewayInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the application gateways in a 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;ApplicationGatewayInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewayInner> list() {
+        ServiceResponse<Page<ApplicationGatewayInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ApplicationGatewayInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the application gateways in a 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<ApplicationGatewayInner>> listAsync(final ListOperationCallback<ApplicationGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewayInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewayInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Page<ApplicationGatewayInner>>() {
+                @Override
+                public Page<ApplicationGatewayInner> call(ServiceResponse<Page<ApplicationGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(ServiceResponse<Page<ApplicationGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewayInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewayInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 start(String resourceGroupName, String applicationGatewayName) {
+        startWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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> startAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(startWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> startAsync(String resourceGroupName, String applicationGatewayName) {
+        return startWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> startWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.start(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 beginStart(String resourceGroupName, String applicationGatewayName) {
+        beginStartWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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> beginStartAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginStartAsync(String resourceGroupName, String applicationGatewayName) {
+        return beginStartWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts the specified application gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginStartWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginStart(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), 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 = beginStartDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginStartDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 stop(String resourceGroupName, String applicationGatewayName) {
+        stopWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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> stopAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(stopWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> stopAsync(String resourceGroupName, String applicationGatewayName) {
+        return stopWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> stopWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.stop(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 beginStop(String resourceGroupName, String applicationGatewayName) {
+        beginStopWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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> beginStopAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginStopAsync(String resourceGroupName, String applicationGatewayName) {
+        return beginStopWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginStopWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginStop(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), 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 = beginStopDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginStopDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 ApplicationGatewayBackendHealthInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthInner backendHealth(String resourceGroupName, String applicationGatewayName) {
+        return backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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<ApplicationGatewayBackendHealthInner> backendHealthAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<ApplicationGatewayBackendHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationGatewayBackendHealthInner> backendHealthAsync(String resourceGroupName, String applicationGatewayName) {
+        return backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthInner>, ApplicationGatewayBackendHealthInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthInner call(ServiceResponse<ApplicationGatewayBackendHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> backendHealthWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        Observable<Response<ResponseBody>> observable = service.backendHealth(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ApplicationGatewayBackendHealthInner>() { }.getType());
+    }
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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 ApplicationGatewayBackendHealthInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthInner backendHealth(String resourceGroupName, String applicationGatewayName, String expand) {
+        return backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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<ApplicationGatewayBackendHealthInner> backendHealthAsync(String resourceGroupName, String applicationGatewayName, String expand, final ServiceCallback<ApplicationGatewayBackendHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationGatewayBackendHealthInner> backendHealthAsync(String resourceGroupName, String applicationGatewayName, String expand) {
+        return backendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthInner>, ApplicationGatewayBackendHealthInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthInner call(ServiceResponse<ApplicationGatewayBackendHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> backendHealthWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.backendHealth(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ApplicationGatewayBackendHealthInner>() { }.getType());
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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 ApplicationGatewayBackendHealthInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthInner beginBackendHealth(String resourceGroupName, String applicationGatewayName) {
+        return beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @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<ApplicationGatewayBackendHealthInner> beginBackendHealthAsync(String resourceGroupName, String applicationGatewayName, final ServiceCallback<ApplicationGatewayBackendHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthInner object
+     */
+    public Observable<ApplicationGatewayBackendHealthInner> beginBackendHealthAsync(String resourceGroupName, String applicationGatewayName) {
+        return beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthInner>, ApplicationGatewayBackendHealthInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthInner call(ServiceResponse<ApplicationGatewayBackendHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> beginBackendHealthWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.beginBackendHealth(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayBackendHealthInner> clientResponse = beginBackendHealthDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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 ApplicationGatewayBackendHealthInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthInner beginBackendHealth(String resourceGroupName, String applicationGatewayName, String expand) {
+        return beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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<ApplicationGatewayBackendHealthInner> beginBackendHealthAsync(String resourceGroupName, String applicationGatewayName, String expand, final ServiceCallback<ApplicationGatewayBackendHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthInner object
+     */
+    public Observable<ApplicationGatewayBackendHealthInner> beginBackendHealthAsync(String resourceGroupName, String applicationGatewayName, String expand) {
+        return beginBackendHealthWithServiceResponseAsync(resourceGroupName, applicationGatewayName, expand).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthInner>, ApplicationGatewayBackendHealthInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthInner call(ServiceResponse<ApplicationGatewayBackendHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> beginBackendHealthWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginBackendHealth(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayBackendHealthInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayBackendHealthInner> clientResponse = beginBackendHealthDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayBackendHealthInner> beginBackendHealthDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayBackendHealthInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayBackendHealthInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe 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 ApplicationGatewayBackendHealthOnDemandInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner backendHealthOnDemand(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        return backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @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<ApplicationGatewayBackendHealthOnDemandInner> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, final ServiceCallback<ApplicationGatewayBackendHealthOnDemandInner> serviceCallback) {
+        return ServiceFuture.fromResponse(backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationGatewayBackendHealthOnDemandInner> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        return backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>, ApplicationGatewayBackendHealthOnDemandInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthOnDemandInner call(ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> backendHealthOnDemandWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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 (probeRequest == null) {
+            throw new IllegalArgumentException("Parameter probeRequest is required and cannot be null.");
+        }
+        Validator.validate(probeRequest);
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        Observable<Response<ResponseBody>> observable = service.backendHealthOnDemand(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, probeRequest, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ApplicationGatewayBackendHealthOnDemandInner>() { }.getType());
+    }
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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 ApplicationGatewayBackendHealthOnDemandInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner backendHealthOnDemand(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        return backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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<ApplicationGatewayBackendHealthOnDemandInner> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand, final ServiceCallback<ApplicationGatewayBackendHealthOnDemandInner> serviceCallback) {
+        return ServiceFuture.fromResponse(backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationGatewayBackendHealthOnDemandInner> backendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        return backendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>, ApplicationGatewayBackendHealthOnDemandInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthOnDemandInner call(ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> backendHealthOnDemandWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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 (probeRequest == null) {
+            throw new IllegalArgumentException("Parameter probeRequest is required and cannot be null.");
+        }
+        Validator.validate(probeRequest);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.backendHealthOnDemand(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, probeRequest, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ApplicationGatewayBackendHealthOnDemandInner>() { }.getType());
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe 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 ApplicationGatewayBackendHealthOnDemandInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner beginBackendHealthOnDemand(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        return beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @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<ApplicationGatewayBackendHealthOnDemandInner> beginBackendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, final ServiceCallback<ApplicationGatewayBackendHealthOnDemandInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthOnDemandInner object
+     */
+    public Observable<ApplicationGatewayBackendHealthOnDemandInner> beginBackendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        return beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>, ApplicationGatewayBackendHealthOnDemandInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthOnDemandInner call(ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthOnDemandInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> beginBackendHealthOnDemandWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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 (probeRequest == null) {
+            throw new IllegalArgumentException("Parameter probeRequest is required and cannot be null.");
+        }
+        Validator.validate(probeRequest);
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.beginBackendHealthOnDemand(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, probeRequest, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> clientResponse = beginBackendHealthOnDemandDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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 ApplicationGatewayBackendHealthOnDemandInner object if successful.
+     */
+    public ApplicationGatewayBackendHealthOnDemandInner beginBackendHealthOnDemand(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        return beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @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<ApplicationGatewayBackendHealthOnDemandInner> beginBackendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand, final ServiceCallback<ApplicationGatewayBackendHealthOnDemandInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthOnDemandInner object
+     */
+    public Observable<ApplicationGatewayBackendHealthOnDemandInner> beginBackendHealthOnDemandAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        return beginBackendHealthOnDemandWithServiceResponseAsync(resourceGroupName, applicationGatewayName, probeRequest, expand).map(new Func1<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>, ApplicationGatewayBackendHealthOnDemandInner>() {
+            @Override
+            public ApplicationGatewayBackendHealthOnDemandInner call(ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the backend health for given combination of backend pool and http setting of the specified application gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationGatewayName The name of the application gateway.
+     * @param probeRequest Request body for on-demand test probe operation.
+     * @param expand Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayBackendHealthOnDemandInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> beginBackendHealthOnDemandWithServiceResponseAsync(String resourceGroupName, String applicationGatewayName, ApplicationGatewayOnDemandProbe probeRequest, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationGatewayName == null) {
+            throw new IllegalArgumentException("Parameter applicationGatewayName 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 (probeRequest == null) {
+            throw new IllegalArgumentException("Parameter probeRequest is required and cannot be null.");
+        }
+        Validator.validate(probeRequest);
+        final String apiVersion = "2020-04-01";
+        return service.beginBackendHealthOnDemand(resourceGroupName, applicationGatewayName, this.client.subscriptionId(), apiVersion, expand, probeRequest, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> clientResponse = beginBackendHealthOnDemandDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayBackendHealthOnDemandInner> beginBackendHealthOnDemandDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayBackendHealthOnDemandInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayBackendHealthOnDemandInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all available server variables.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;String&gt; object if successful.
+     */
+    public List<String> listAvailableServerVariables() {
+        return listAvailableServerVariablesWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists all available server variables.
+     *
+     * @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<String>> listAvailableServerVariablesAsync(final ServiceCallback<List<String>> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableServerVariablesWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists all available server variables.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<List<String>> listAvailableServerVariablesAsync() {
+        return listAvailableServerVariablesWithServiceResponseAsync().map(new Func1<ServiceResponse<List<String>>, List<String>>() {
+            @Override
+            public List<String> call(ServiceResponse<List<String>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all available server variables.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<ServiceResponse<List<String>>> listAvailableServerVariablesWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableServerVariables(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<String>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<String>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<List<String>> clientResponse = listAvailableServerVariablesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<List<String>> listAvailableServerVariablesDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<List<String>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<String>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all available request headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;String&gt; object if successful.
+     */
+    public List<String> listAvailableRequestHeaders() {
+        return listAvailableRequestHeadersWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists all available request headers.
+     *
+     * @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<String>> listAvailableRequestHeadersAsync(final ServiceCallback<List<String>> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableRequestHeadersWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists all available request headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<List<String>> listAvailableRequestHeadersAsync() {
+        return listAvailableRequestHeadersWithServiceResponseAsync().map(new Func1<ServiceResponse<List<String>>, List<String>>() {
+            @Override
+            public List<String> call(ServiceResponse<List<String>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all available request headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<ServiceResponse<List<String>>> listAvailableRequestHeadersWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableRequestHeaders(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<String>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<String>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<List<String>> clientResponse = listAvailableRequestHeadersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<List<String>> listAvailableRequestHeadersDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<List<String>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<String>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all available response headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;String&gt; object if successful.
+     */
+    public List<String> listAvailableResponseHeaders() {
+        return listAvailableResponseHeadersWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists all available response headers.
+     *
+     * @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<String>> listAvailableResponseHeadersAsync(final ServiceCallback<List<String>> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableResponseHeadersWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists all available response headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<List<String>> listAvailableResponseHeadersAsync() {
+        return listAvailableResponseHeadersWithServiceResponseAsync().map(new Func1<ServiceResponse<List<String>>, List<String>>() {
+            @Override
+            public List<String> call(ServiceResponse<List<String>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all available response headers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;String&gt; object
+     */
+    public Observable<ServiceResponse<List<String>>> listAvailableResponseHeadersWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableResponseHeaders(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<String>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<String>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<List<String>> clientResponse = listAvailableResponseHeadersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<List<String>> listAvailableResponseHeadersDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<List<String>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<String>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all available web application firewall rule sets.
+     *
+     * @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 ApplicationGatewayAvailableWafRuleSetsResultInner object if successful.
+     */
+    public ApplicationGatewayAvailableWafRuleSetsResultInner listAvailableWafRuleSets() {
+        return listAvailableWafRuleSetsWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists all available web application firewall rule sets.
+     *
+     * @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<ApplicationGatewayAvailableWafRuleSetsResultInner> listAvailableWafRuleSetsAsync(final ServiceCallback<ApplicationGatewayAvailableWafRuleSetsResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableWafRuleSetsWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists all available web application firewall rule sets.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayAvailableWafRuleSetsResultInner object
+     */
+    public Observable<ApplicationGatewayAvailableWafRuleSetsResultInner> listAvailableWafRuleSetsAsync() {
+        return listAvailableWafRuleSetsWithServiceResponseAsync().map(new Func1<ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner>, ApplicationGatewayAvailableWafRuleSetsResultInner>() {
+            @Override
+            public ApplicationGatewayAvailableWafRuleSetsResultInner call(ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all available web application firewall rule sets.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayAvailableWafRuleSetsResultInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner>> listAvailableWafRuleSetsWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableWafRuleSets(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner> clientResponse = listAvailableWafRuleSetsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayAvailableWafRuleSetsResultInner> listAvailableWafRuleSetsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayAvailableWafRuleSetsResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayAvailableWafRuleSetsResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists available Ssl options for configuring Ssl policy.
+     *
+     * @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 ApplicationGatewayAvailableSslOptionsInner object if successful.
+     */
+    public ApplicationGatewayAvailableSslOptionsInner listAvailableSslOptions() {
+        return listAvailableSslOptionsWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Lists available Ssl options for configuring Ssl policy.
+     *
+     * @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<ApplicationGatewayAvailableSslOptionsInner> listAvailableSslOptionsAsync(final ServiceCallback<ApplicationGatewayAvailableSslOptionsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableSslOptionsWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists available Ssl options for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayAvailableSslOptionsInner object
+     */
+    public Observable<ApplicationGatewayAvailableSslOptionsInner> listAvailableSslOptionsAsync() {
+        return listAvailableSslOptionsWithServiceResponseAsync().map(new Func1<ServiceResponse<ApplicationGatewayAvailableSslOptionsInner>, ApplicationGatewayAvailableSslOptionsInner>() {
+            @Override
+            public ApplicationGatewayAvailableSslOptionsInner call(ServiceResponse<ApplicationGatewayAvailableSslOptionsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists available Ssl options for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewayAvailableSslOptionsInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewayAvailableSslOptionsInner>> listAvailableSslOptionsWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableSslOptions(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewayAvailableSslOptionsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewayAvailableSslOptionsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewayAvailableSslOptionsInner> clientResponse = listAvailableSslOptionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewayAvailableSslOptionsInner> listAvailableSslOptionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewayAvailableSslOptionsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewayAvailableSslOptionsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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;ApplicationGatewaySslPredefinedPolicyInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewaySslPredefinedPolicyInner> listAvailableSslPredefinedPolicies() {
+        ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> response = listAvailableSslPredefinedPoliciesSinglePageAsync().toBlocking().single();
+        return new PagedList<ApplicationGatewaySslPredefinedPolicyInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewaySslPredefinedPolicyInner> nextPage(String nextPageLink) {
+                return listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesAsync(final ListOperationCallback<ApplicationGatewaySslPredefinedPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAvailableSslPredefinedPoliciesSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(String nextPageLink) {
+                    return listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewaySslPredefinedPolicyInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesAsync() {
+        return listAvailableSslPredefinedPoliciesWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>, Page<ApplicationGatewaySslPredefinedPolicyInner>>() {
+                @Override
+                public Page<ApplicationGatewaySslPredefinedPolicyInner> call(ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationGatewaySslPredefinedPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> listAvailableSslPredefinedPoliciesWithServiceResponseAsync() {
+        return listAvailableSslPredefinedPoliciesSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAvailableSslPredefinedPoliciesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewaySslPredefinedPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> listAvailableSslPredefinedPoliciesSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAvailableSslPredefinedPolicies(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>> result = listAvailableSslPredefinedPoliciesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets Ssl predefined policy with the specified policy name.
+     *
+     * @param predefinedPolicyName Name of Ssl predefined policy.
+     * @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 ApplicationGatewaySslPredefinedPolicyInner object if successful.
+     */
+    public ApplicationGatewaySslPredefinedPolicyInner getSslPredefinedPolicy(String predefinedPolicyName) {
+        return getSslPredefinedPolicyWithServiceResponseAsync(predefinedPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets Ssl predefined policy with the specified policy name.
+     *
+     * @param predefinedPolicyName Name of Ssl predefined policy.
+     * @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<ApplicationGatewaySslPredefinedPolicyInner> getSslPredefinedPolicyAsync(String predefinedPolicyName, final ServiceCallback<ApplicationGatewaySslPredefinedPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSslPredefinedPolicyWithServiceResponseAsync(predefinedPolicyName), serviceCallback);
+    }
+
+    /**
+     * Gets Ssl predefined policy with the specified policy name.
+     *
+     * @param predefinedPolicyName Name of Ssl predefined policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewaySslPredefinedPolicyInner object
+     */
+    public Observable<ApplicationGatewaySslPredefinedPolicyInner> getSslPredefinedPolicyAsync(String predefinedPolicyName) {
+        return getSslPredefinedPolicyWithServiceResponseAsync(predefinedPolicyName).map(new Func1<ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner>, ApplicationGatewaySslPredefinedPolicyInner>() {
+            @Override
+            public ApplicationGatewaySslPredefinedPolicyInner call(ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets Ssl predefined policy with the specified policy name.
+     *
+     * @param predefinedPolicyName Name of Ssl predefined policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationGatewaySslPredefinedPolicyInner object
+     */
+    public Observable<ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner>> getSslPredefinedPolicyWithServiceResponseAsync(String predefinedPolicyName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (predefinedPolicyName == null) {
+            throw new IllegalArgumentException("Parameter predefinedPolicyName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getSslPredefinedPolicy(this.client.subscriptionId(), predefinedPolicyName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner> clientResponse = getSslPredefinedPolicyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationGatewaySslPredefinedPolicyInner> getSslPredefinedPolicyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationGatewaySslPredefinedPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationGatewaySslPredefinedPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all application gateways in 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;ApplicationGatewayInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ApplicationGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ApplicationGatewayInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all application gateways in 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<ApplicationGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ApplicationGatewayInner>> serviceFuture, final ListOperationCallback<ApplicationGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all application gateways in 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;ApplicationGatewayInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Page<ApplicationGatewayInner>>() {
+                @Override
+                public Page<ApplicationGatewayInner> call(ServiceResponse<Page<ApplicationGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all application gateways in 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;ApplicationGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(ServiceResponse<Page<ApplicationGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all application gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<ApplicationGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> 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<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @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;ApplicationGatewayInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewayInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ApplicationGatewayInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ApplicationGatewayInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @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<ApplicationGatewayInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ApplicationGatewayInner>> serviceFuture, final ListOperationCallback<ApplicationGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @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;ApplicationGatewayInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewayInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Page<ApplicationGatewayInner>>() {
+                @Override
+                public Page<ApplicationGatewayInner> call(ServiceResponse<Page<ApplicationGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+     * @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;ApplicationGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewayInner>>, Observable<ServiceResponse<Page<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(ServiceResponse<Page<ApplicationGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the application gateways in a subscription.
+     *
+    ServiceResponse<PageImpl<ApplicationGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> 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<ApplicationGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewayInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewayInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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;ApplicationGatewaySslPredefinedPolicyInner&gt; object if successful.
+     */
+    public PagedList<ApplicationGatewaySslPredefinedPolicyInner> listAvailableSslPredefinedPoliciesNext(final String nextPageLink) {
+        ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> response = listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ApplicationGatewaySslPredefinedPolicyInner>(response.body()) {
+            @Override
+            public Page<ApplicationGatewaySslPredefinedPolicyInner> nextPage(String nextPageLink) {
+                return listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesNextAsync(final String nextPageLink, final ServiceFuture<List<ApplicationGatewaySslPredefinedPolicyInner>> serviceFuture, final ListOperationCallback<ApplicationGatewaySslPredefinedPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(String nextPageLink) {
+                    return listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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;ApplicationGatewaySslPredefinedPolicyInner&gt; object
+     */
+    public Observable<Page<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesNextAsync(final String nextPageLink) {
+        return listAvailableSslPredefinedPoliciesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>, Page<ApplicationGatewaySslPredefinedPolicyInner>>() {
+                @Override
+                public Page<ApplicationGatewaySslPredefinedPolicyInner> call(ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+     * @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;ApplicationGatewaySslPredefinedPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> listAvailableSslPredefinedPoliciesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAvailableSslPredefinedPoliciesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAvailableSslPredefinedPoliciesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all SSL predefined policies for configuring Ssl policy.
+     *
+    ServiceResponse<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationGatewaySslPredefinedPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> listAvailableSslPredefinedPoliciesNextSinglePageAsync(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.listAvailableSslPredefinedPoliciesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>> result = listAvailableSslPredefinedPoliciesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationGatewaySslPredefinedPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>> listAvailableSslPredefinedPoliciesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationGatewaySslPredefinedPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupImpl.java
new file mode 100644
index 000000000000..00eb176c05b6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ApplicationSecurityGroupImpl extends GroupableResourceCoreImpl<ApplicationSecurityGroup, ApplicationSecurityGroupInner, ApplicationSecurityGroupImpl, NetworkManager> implements ApplicationSecurityGroup, ApplicationSecurityGroup.Definition, ApplicationSecurityGroup.Update {
+    ApplicationSecurityGroupImpl(String name, ApplicationSecurityGroupInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ApplicationSecurityGroup> createResourceAsync() {
+        ApplicationSecurityGroupsInner client = this.manager().inner().applicationSecurityGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ApplicationSecurityGroup> updateResourceAsync() {
+        ApplicationSecurityGroupsInner client = this.manager().inner().applicationSecurityGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ApplicationSecurityGroupInner> getInnerAsync() {
+        ApplicationSecurityGroupsInner client = this.manager().inner().applicationSecurityGroups();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupInner.java
new file mode 100644
index 000000000000..e99f66bc4c14
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * An application security group in a resource group.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ApplicationSecurityGroupInner extends Resource {
+    /**
+     * The resource GUID property of the application security group resource.
+     * It uniquely identifies a resource, even if the user changes its name or
+     * migrate the resource across subscriptions or resource groups.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the application security group resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the resource GUID property of the application security group resource. It uniquely identifies a resource, even if the user changes its name or migrate the resource across subscriptions or resource groups.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the application security group resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ApplicationSecurityGroupInner object itself.
+     */
+    public ApplicationSecurityGroupInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsImpl.java
new file mode 100644
index 000000000000..054a77f1a697
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroups;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+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;
+
+class ApplicationSecurityGroupsImpl extends GroupableResourcesCoreImpl<ApplicationSecurityGroup, ApplicationSecurityGroupImpl, ApplicationSecurityGroupInner, ApplicationSecurityGroupsInner, NetworkManager>  implements ApplicationSecurityGroups {
+    protected ApplicationSecurityGroupsImpl(NetworkManager manager) {
+        super(manager.inner().applicationSecurityGroups(), manager);
+    }
+
+    @Override
+    protected Observable<ApplicationSecurityGroupInner> getInnerAsync(String resourceGroupName, String name) {
+        ApplicationSecurityGroupsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ApplicationSecurityGroupsInner 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<ApplicationSecurityGroup> listByResourceGroup(String resourceGroupName) {
+        ApplicationSecurityGroupsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ApplicationSecurityGroup> listByResourceGroupAsync(String resourceGroupName) {
+        ApplicationSecurityGroupsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ApplicationSecurityGroupInner>, Iterable<ApplicationSecurityGroupInner>>() {
+            @Override
+            public Iterable<ApplicationSecurityGroupInner> call(Page<ApplicationSecurityGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ApplicationSecurityGroupInner, ApplicationSecurityGroup>() {
+            @Override
+            public ApplicationSecurityGroup call(ApplicationSecurityGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ApplicationSecurityGroup> list() {
+        ApplicationSecurityGroupsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ApplicationSecurityGroup> listAsync() {
+        ApplicationSecurityGroupsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ApplicationSecurityGroupInner>, Iterable<ApplicationSecurityGroupInner>>() {
+            @Override
+            public Iterable<ApplicationSecurityGroupInner> call(Page<ApplicationSecurityGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ApplicationSecurityGroupInner, ApplicationSecurityGroup>() {
+            @Override
+            public ApplicationSecurityGroup call(ApplicationSecurityGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ApplicationSecurityGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ApplicationSecurityGroupImpl wrapModel(ApplicationSecurityGroupInner inner) {
+        return  new ApplicationSecurityGroupImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ApplicationSecurityGroupImpl wrapModel(String name) {
+        return new ApplicationSecurityGroupImpl(name, new ApplicationSecurityGroupInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsInner.java
new file mode 100644
index 000000000000..de91af8997f5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ApplicationSecurityGroupsInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 ApplicationSecurityGroups.
+ */
+public class ApplicationSecurityGroupsInner implements InnerSupportsGet<ApplicationSecurityGroupInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ApplicationSecurityGroupInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ApplicationSecurityGroupsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ApplicationSecurityGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ApplicationSecurityGroupsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ApplicationSecurityGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ApplicationSecurityGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ApplicationSecurityGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @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.network.v2020_04_01.ApplicationSecurityGroups beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @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.network.v2020_04_01.ApplicationSecurityGroups getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @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.network.v2020_04_01.ApplicationSecurityGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Body ApplicationSecurityGroupInner 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.network.v2020_04_01.ApplicationSecurityGroups beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Body ApplicationSecurityGroupInner 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.network.v2020_04_01.ApplicationSecurityGroups updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("applicationSecurityGroupName") String applicationSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroups list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationSecurityGroups")
+        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.network.v2020_04_01.ApplicationSecurityGroups listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups")
+        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.network.v2020_04_01.ApplicationSecurityGroups 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.network.v2020_04_01.ApplicationSecurityGroups listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 applicationSecurityGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 applicationSecurityGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 applicationSecurityGroupName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 applicationSecurityGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), 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 information about the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 ApplicationSecurityGroupInner object if successful.
+     */
+    public ApplicationSecurityGroupInner getByResourceGroup(String resourceGroupName, String applicationSecurityGroupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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<ApplicationSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String applicationSecurityGroupName, final ServiceCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ApplicationSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).map(new Func1<ServiceResponse<ApplicationSecurityGroupInner>, ApplicationSecurityGroupInner>() {
+            @Override
+            public ApplicationSecurityGroupInner call(ServiceResponse<ApplicationSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<ApplicationSecurityGroupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationSecurityGroupInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationSecurityGroupInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup 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 ApplicationSecurityGroupInner object if successful.
+     */
+    public ApplicationSecurityGroupInner createOrUpdate(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @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<ApplicationSecurityGroupInner> createOrUpdateAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters, final ServiceCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ApplicationSecurityGroupInner> createOrUpdateAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters).map(new Func1<ServiceResponse<ApplicationSecurityGroupInner>, ApplicationSecurityGroupInner>() {
+            @Override
+            public ApplicationSecurityGroupInner call(ServiceResponse<ApplicationSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ApplicationSecurityGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ApplicationSecurityGroupInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup 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 ApplicationSecurityGroupInner object if successful.
+     */
+    public ApplicationSecurityGroupInner beginCreateOrUpdate(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @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<ApplicationSecurityGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters, final ServiceCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ApplicationSecurityGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, parameters).map(new Func1<ServiceResponse<ApplicationSecurityGroupInner>, ApplicationSecurityGroupInner>() {
+            @Override
+            public ApplicationSecurityGroupInner call(ServiceResponse<ApplicationSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an application security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param parameters Parameters supplied to the create or update ApplicationSecurityGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<ApplicationSecurityGroupInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName, ApplicationSecurityGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationSecurityGroupInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationSecurityGroupInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationSecurityGroupInner>() { }.getType())
+                .register(201, new TypeToken<ApplicationSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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 ApplicationSecurityGroupInner object if successful.
+     */
+    public ApplicationSecurityGroupInner updateTags(String resourceGroupName, String applicationSecurityGroupName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @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<ApplicationSecurityGroupInner> updateTagsAsync(String resourceGroupName, String applicationSecurityGroupName, final ServiceCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ApplicationSecurityGroupInner> updateTagsAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName).map(new Func1<ServiceResponse<ApplicationSecurityGroupInner>, ApplicationSecurityGroupInner>() {
+            @Override
+            public ApplicationSecurityGroupInner call(ServiceResponse<ApplicationSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<ApplicationSecurityGroupInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationSecurityGroupInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param tags Resource tags.
+     * @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 ApplicationSecurityGroupInner object if successful.
+     */
+    public ApplicationSecurityGroupInner updateTags(String resourceGroupName, String applicationSecurityGroupName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param tags Resource tags.
+     * @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<ApplicationSecurityGroupInner> updateTagsAsync(String resourceGroupName, String applicationSecurityGroupName, Map<String, String> tags, final ServiceCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ApplicationSecurityGroupInner> updateTagsAsync(String resourceGroupName, String applicationSecurityGroupName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, applicationSecurityGroupName, tags).map(new Func1<ServiceResponse<ApplicationSecurityGroupInner>, ApplicationSecurityGroupInner>() {
+            @Override
+            public ApplicationSecurityGroupInner call(ServiceResponse<ApplicationSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an application security group's tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param applicationSecurityGroupName The name of the application security group.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ApplicationSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<ApplicationSecurityGroupInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String applicationSecurityGroupName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (applicationSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter applicationSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, applicationSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ApplicationSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ApplicationSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ApplicationSecurityGroupInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ApplicationSecurityGroupInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ApplicationSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ApplicationSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all application security groups in a 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;ApplicationSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<ApplicationSecurityGroupInner> list() {
+        ServiceResponse<Page<ApplicationSecurityGroupInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ApplicationSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<ApplicationSecurityGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all application security groups in a 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<ApplicationSecurityGroupInner>> listAsync(final ListOperationCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<Page<ApplicationSecurityGroupInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Page<ApplicationSecurityGroupInner>>() {
+                @Override
+                public Page<ApplicationSecurityGroupInner> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ApplicationSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<ApplicationSecurityGroupInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ApplicationSecurityGroupInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ApplicationSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<ApplicationSecurityGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ApplicationSecurityGroupInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<Page<ApplicationSecurityGroupInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Page<ApplicationSecurityGroupInner>>() {
+                @Override
+                public Page<ApplicationSecurityGroupInner> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+    ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @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;ApplicationSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<ApplicationSecurityGroupInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ApplicationSecurityGroupInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ApplicationSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<ApplicationSecurityGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @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<ApplicationSecurityGroupInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ApplicationSecurityGroupInner>> serviceFuture, final ListOperationCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @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;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<Page<ApplicationSecurityGroupInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Page<ApplicationSecurityGroupInner>>() {
+                @Override
+                public Page<ApplicationSecurityGroupInner> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+     * @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;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all application security groups in a subscription.
+     *
+    ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> 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<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the application security groups in 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;ApplicationSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<ApplicationSecurityGroupInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ApplicationSecurityGroupInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ApplicationSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<ApplicationSecurityGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the application security groups in 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<ApplicationSecurityGroupInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ApplicationSecurityGroupInner>> serviceFuture, final ListOperationCallback<ApplicationSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the application security groups in 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;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<Page<ApplicationSecurityGroupInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Page<ApplicationSecurityGroupInner>>() {
+                @Override
+                public Page<ApplicationSecurityGroupInner> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the application security groups in 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;ApplicationSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ApplicationSecurityGroupInner>>, Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(ServiceResponse<Page<ApplicationSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the application security groups in a resource group.
+     *
+    ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ApplicationSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> 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<ApplicationSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ApplicationSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ApplicationSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ApplicationSecurityGroupInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ApplicationSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ApplicationSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceImpl.java
new file mode 100644
index 000000000000..d9ef605d7b1c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AutoApprovedPrivateLinkService;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class AutoApprovedPrivateLinkServiceImpl extends WrapperImpl<AutoApprovedPrivateLinkServiceInner> implements AutoApprovedPrivateLinkService {
+    private final NetworkManager manager;
+
+    AutoApprovedPrivateLinkServiceImpl(AutoApprovedPrivateLinkServiceInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String privateLinkService() {
+        return this.inner().privateLinkService();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceInner.java
new file mode 100644
index 000000000000..4f3fded5d543
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AutoApprovedPrivateLinkServiceInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The information of an AutoApprovedPrivateLinkService.
+ */
+public class AutoApprovedPrivateLinkServiceInner {
+    /**
+     * The id of the private link service resource.
+     */
+    @JsonProperty(value = "privateLinkService")
+    private String privateLinkService;
+
+    /**
+     * Get the id of the private link service resource.
+     *
+     * @return the privateLinkService value
+     */
+    public String privateLinkService() {
+        return this.privateLinkService;
+    }
+
+    /**
+     * Set the id of the private link service resource.
+     *
+     * @param privateLinkService the privateLinkService value to set
+     * @return the AutoApprovedPrivateLinkServiceInner object itself.
+     */
+    public AutoApprovedPrivateLinkServiceInner withPrivateLinkService(String privateLinkService) {
+        this.privateLinkService = privateLinkService;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationInner.java
new file mode 100644
index 000000000000..2e848b94de5d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The serviceName of an AvailableDelegation indicates a possible delegation
+ * for a subnet.
+ */
+public class AvailableDelegationInner {
+    /**
+     * The name of the AvailableDelegation resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique identifier of the AvailableDelegation resource.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * The name of the service and resource.
+     */
+    @JsonProperty(value = "serviceName")
+    private String serviceName;
+
+    /**
+     * The actions permitted to the service upon delegation.
+     */
+    @JsonProperty(value = "actions")
+    private List<String> actions;
+
+    /**
+     * Get the name of the AvailableDelegation resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the AvailableDelegation resource.
+     *
+     * @param name the name value to set
+     * @return the AvailableDelegationInner object itself.
+     */
+    public AvailableDelegationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique identifier of the AvailableDelegation resource.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set a unique identifier of the AvailableDelegation resource.
+     *
+     * @param id the id value to set
+     * @return the AvailableDelegationInner object itself.
+     */
+    public AvailableDelegationInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set resource type.
+     *
+     * @param type the type value to set
+     * @return the AvailableDelegationInner object itself.
+     */
+    public AvailableDelegationInner withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the name of the service and resource.
+     *
+     * @return the serviceName value
+     */
+    public String serviceName() {
+        return this.serviceName;
+    }
+
+    /**
+     * Set the name of the service and resource.
+     *
+     * @param serviceName the serviceName value to set
+     * @return the AvailableDelegationInner object itself.
+     */
+    public AvailableDelegationInner withServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        return this;
+    }
+
+    /**
+     * Get the actions permitted to the service upon delegation.
+     *
+     * @return the actions value
+     */
+    public List<String> actions() {
+        return this.actions;
+    }
+
+    /**
+     * Set the actions permitted to the service upon delegation.
+     *
+     * @param actions the actions value to set
+     * @return the AvailableDelegationInner object itself.
+     */
+    public AvailableDelegationInner withActions(List<String> actions) {
+        this.actions = actions;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsImpl.java
new file mode 100644
index 000000000000..fb4655a92920
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableDelegations;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.LocationAvailableDelegation;
+
+class AvailableDelegationsImpl extends WrapperImpl<AvailableDelegationsInner> implements AvailableDelegations {
+    private final NetworkManager manager;
+
+    AvailableDelegationsImpl(NetworkManager manager) {
+        super(manager.inner().availableDelegations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private LocationAvailableDelegationImpl wrapModel(AvailableDelegationInner inner) {
+        return  new LocationAvailableDelegationImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<LocationAvailableDelegation> listAsync(final String location) {
+        AvailableDelegationsInner client = this.inner();
+        return client.listAsync(location)
+        .flatMapIterable(new Func1<Page<AvailableDelegationInner>, Iterable<AvailableDelegationInner>>() {
+            @Override
+            public Iterable<AvailableDelegationInner> call(Page<AvailableDelegationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailableDelegationInner, LocationAvailableDelegation>() {
+            @Override
+            public LocationAvailableDelegation call(AvailableDelegationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsInner.java
new file mode 100644
index 000000000000..ff53c938ebf7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableDelegationsInner.java
@@ -0,0 +1,293 @@
+/**
+ * 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.network.v2020_04_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.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 AvailableDelegations.
+ */
+public class AvailableDelegationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private AvailableDelegationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AvailableDelegationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AvailableDelegationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AvailableDelegationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AvailableDelegations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AvailableDelegationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AvailableDelegations list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availableDelegations")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.AvailableDelegations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @param location The location of the subnet.
+     * @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;AvailableDelegationInner&gt; object if successful.
+     */
+    public PagedList<AvailableDelegationInner> list(final String location) {
+        ServiceResponse<Page<AvailableDelegationInner>> response = listSinglePageAsync(location).toBlocking().single();
+        return new PagedList<AvailableDelegationInner>(response.body()) {
+            @Override
+            public Page<AvailableDelegationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @param location The location of the 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<List<AvailableDelegationInner>> listAsync(final String location, final ListOperationCallback<AvailableDelegationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @param location The location of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableDelegationInner&gt; object
+     */
+    public Observable<Page<AvailableDelegationInner>> listAsync(final String location) {
+        return listWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Page<AvailableDelegationInner>>() {
+                @Override
+                public Page<AvailableDelegationInner> call(ServiceResponse<Page<AvailableDelegationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @param location The location of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableDelegationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listWithServiceResponseAsync(final String location) {
+        return listSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(ServiceResponse<Page<AvailableDelegationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailableDelegationInner>> * @param location The location of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableDelegationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableDelegationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableDelegationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableDelegationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableDelegationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableDelegationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object if successful.
+     */
+    public PagedList<AvailableDelegationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailableDelegationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailableDelegationInner>(response.body()) {
+            @Override
+            public Page<AvailableDelegationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @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<AvailableDelegationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailableDelegationInner>> serviceFuture, final ListOperationCallback<AvailableDelegationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object
+     */
+    public Observable<Page<AvailableDelegationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Page<AvailableDelegationInner>>() {
+                @Override
+                public Page<AvailableDelegationInner> call(ServiceResponse<Page<AvailableDelegationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(ServiceResponse<Page<AvailableDelegationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailableDelegationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableDelegationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> 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<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableDelegationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableDelegationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableDelegationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableDelegationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableDelegationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesImpl.java
new file mode 100644
index 000000000000..dbac6c8c67e3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableEndpointServices;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.EndpointServiceResult;
+
+class AvailableEndpointServicesImpl extends WrapperImpl<AvailableEndpointServicesInner> implements AvailableEndpointServices {
+    private final NetworkManager manager;
+
+    AvailableEndpointServicesImpl(NetworkManager manager) {
+        super(manager.inner().availableEndpointServices());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private EndpointServiceResultImpl wrapModel(EndpointServiceResultInner inner) {
+        return  new EndpointServiceResultImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<EndpointServiceResult> listAsync(final String location) {
+        AvailableEndpointServicesInner client = this.inner();
+        return client.listAsync(location)
+        .flatMapIterable(new Func1<Page<EndpointServiceResultInner>, Iterable<EndpointServiceResultInner>>() {
+            @Override
+            public Iterable<EndpointServiceResultInner> call(Page<EndpointServiceResultInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EndpointServiceResultInner, EndpointServiceResult>() {
+            @Override
+            public EndpointServiceResult call(EndpointServiceResultInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesInner.java
new file mode 100644
index 000000000000..7c5a87d408fb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableEndpointServicesInner.java
@@ -0,0 +1,293 @@
+/**
+ * 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.network.v2020_04_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.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 AvailableEndpointServices.
+ */
+public class AvailableEndpointServicesInner {
+    /** The Retrofit service to perform REST calls. */
+    private AvailableEndpointServicesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AvailableEndpointServicesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AvailableEndpointServicesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AvailableEndpointServicesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AvailableEndpointServices to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AvailableEndpointServicesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AvailableEndpointServices list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/virtualNetworkAvailableEndpointServices")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.AvailableEndpointServices listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @param location The location to check available endpoint services.
+     * @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;EndpointServiceResultInner&gt; object if successful.
+     */
+    public PagedList<EndpointServiceResultInner> list(final String location) {
+        ServiceResponse<Page<EndpointServiceResultInner>> response = listSinglePageAsync(location).toBlocking().single();
+        return new PagedList<EndpointServiceResultInner>(response.body()) {
+            @Override
+            public Page<EndpointServiceResultInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @param location The location to check available endpoint services.
+     * @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<EndpointServiceResultInner>> listAsync(final String location, final ListOperationCallback<EndpointServiceResultInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @param location The location to check available endpoint services.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EndpointServiceResultInner&gt; object
+     */
+    public Observable<Page<EndpointServiceResultInner>> listAsync(final String location) {
+        return listWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<EndpointServiceResultInner>>, Page<EndpointServiceResultInner>>() {
+                @Override
+                public Page<EndpointServiceResultInner> call(ServiceResponse<Page<EndpointServiceResultInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @param location The location to check available endpoint services.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EndpointServiceResultInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> listWithServiceResponseAsync(final String location) {
+        return listSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<EndpointServiceResultInner>>, Observable<ServiceResponse<Page<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(ServiceResponse<Page<EndpointServiceResultInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+    ServiceResponse<PageImpl<EndpointServiceResultInner>> * @param location The location to check available endpoint services.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EndpointServiceResultInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> listSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EndpointServiceResultInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EndpointServiceResultInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EndpointServiceResultInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EndpointServiceResultInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EndpointServiceResultInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @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;EndpointServiceResultInner&gt; object if successful.
+     */
+    public PagedList<EndpointServiceResultInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<EndpointServiceResultInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EndpointServiceResultInner>(response.body()) {
+            @Override
+            public Page<EndpointServiceResultInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @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<EndpointServiceResultInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<EndpointServiceResultInner>> serviceFuture, final ListOperationCallback<EndpointServiceResultInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @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;EndpointServiceResultInner&gt; object
+     */
+    public Observable<Page<EndpointServiceResultInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EndpointServiceResultInner>>, Page<EndpointServiceResultInner>>() {
+                @Override
+                public Page<EndpointServiceResultInner> call(ServiceResponse<Page<EndpointServiceResultInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+     * @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;EndpointServiceResultInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EndpointServiceResultInner>>, Observable<ServiceResponse<Page<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(ServiceResponse<Page<EndpointServiceResultInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List what values of endpoint services are available for use.
+     *
+    ServiceResponse<PageImpl<EndpointServiceResultInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EndpointServiceResultInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> 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<EndpointServiceResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EndpointServiceResultInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EndpointServiceResultInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EndpointServiceResultInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EndpointServiceResultInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EndpointServiceResultInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EndpointServiceResultInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeImpl.java
new file mode 100644
index 000000000000..074a29b2e749
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeImpl.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AvailablePrivateEndpointType;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class AvailablePrivateEndpointTypeImpl extends WrapperImpl<AvailablePrivateEndpointTypeInner> implements AvailablePrivateEndpointType {
+    private final NetworkManager manager;
+
+    AvailablePrivateEndpointTypeImpl(AvailablePrivateEndpointTypeInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String resourceName() {
+        return this.inner().resourceName();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeInner.java
new file mode 100644
index 000000000000..af967868e79c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypeInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The information of an AvailablePrivateEndpointType.
+ */
+public class AvailablePrivateEndpointTypeInner {
+    /**
+     * The name of the service and resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique identifier of the AvailablePrivateEndpoint Type resource.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * The name of the service and resource.
+     */
+    @JsonProperty(value = "resourceName")
+    private String resourceName;
+
+    /**
+     * Get the name of the service and resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the service and resource.
+     *
+     * @param name the name value to set
+     * @return the AvailablePrivateEndpointTypeInner object itself.
+     */
+    public AvailablePrivateEndpointTypeInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique identifier of the AvailablePrivateEndpoint Type resource.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set a unique identifier of the AvailablePrivateEndpoint Type resource.
+     *
+     * @param id the id value to set
+     * @return the AvailablePrivateEndpointTypeInner object itself.
+     */
+    public AvailablePrivateEndpointTypeInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set resource type.
+     *
+     * @param type the type value to set
+     * @return the AvailablePrivateEndpointTypeInner object itself.
+     */
+    public AvailablePrivateEndpointTypeInner withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the name of the service and resource.
+     *
+     * @return the resourceName value
+     */
+    public String resourceName() {
+        return this.resourceName;
+    }
+
+    /**
+     * Set the name of the service and resource.
+     *
+     * @param resourceName the resourceName value to set
+     * @return the AvailablePrivateEndpointTypeInner object itself.
+     */
+    public AvailablePrivateEndpointTypeInner withResourceName(String resourceName) {
+        this.resourceName = resourceName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesImpl.java
new file mode 100644
index 000000000000..c9db305a506b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesImpl.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AvailablePrivateEndpointTypes;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.AvailablePrivateEndpointType;
+
+class AvailablePrivateEndpointTypesImpl extends WrapperImpl<AvailablePrivateEndpointTypesInner> implements AvailablePrivateEndpointTypes {
+    private final NetworkManager manager;
+
+    AvailablePrivateEndpointTypesImpl(NetworkManager manager) {
+        super(manager.inner().availablePrivateEndpointTypes());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private AvailablePrivateEndpointTypeImpl wrapModel(AvailablePrivateEndpointTypeInner inner) {
+        return  new AvailablePrivateEndpointTypeImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<AvailablePrivateEndpointType> listByResourceGroupAsync(final String location, final String resourceGroupName) {
+        AvailablePrivateEndpointTypesInner client = this.inner();
+        return client.listByResourceGroupAsync(location, resourceGroupName)
+        .flatMapIterable(new Func1<Page<AvailablePrivateEndpointTypeInner>, Iterable<AvailablePrivateEndpointTypeInner>>() {
+            @Override
+            public Iterable<AvailablePrivateEndpointTypeInner> call(Page<AvailablePrivateEndpointTypeInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailablePrivateEndpointTypeInner, AvailablePrivateEndpointType>() {
+            @Override
+            public AvailablePrivateEndpointType call(AvailablePrivateEndpointTypeInner inner) {
+                return new AvailablePrivateEndpointTypeImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AvailablePrivateEndpointType> listAsync(final String location) {
+        AvailablePrivateEndpointTypesInner client = this.inner();
+        return client.listAsync(location)
+        .flatMapIterable(new Func1<Page<AvailablePrivateEndpointTypeInner>, Iterable<AvailablePrivateEndpointTypeInner>>() {
+            @Override
+            public Iterable<AvailablePrivateEndpointTypeInner> call(Page<AvailablePrivateEndpointTypeInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailablePrivateEndpointTypeInner, AvailablePrivateEndpointType>() {
+            @Override
+            public AvailablePrivateEndpointType call(AvailablePrivateEndpointTypeInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesInner.java
new file mode 100644
index 000000000000..2f3c6d18b401
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailablePrivateEndpointTypesInner.java
@@ -0,0 +1,533 @@
+/**
+ * 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.network.v2020_04_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.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 AvailablePrivateEndpointTypes.
+ */
+public class AvailablePrivateEndpointTypesInner {
+    /** The Retrofit service to perform REST calls. */
+    private AvailablePrivateEndpointTypesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AvailablePrivateEndpointTypesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AvailablePrivateEndpointTypesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AvailablePrivateEndpointTypesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AvailablePrivateEndpointTypes to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AvailablePrivateEndpointTypesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AvailablePrivateEndpointTypes list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availablePrivateEndpointTypes")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.AvailablePrivateEndpointTypes listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/availablePrivateEndpointTypes")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("location") String location, @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.network.v2020_04_01.AvailablePrivateEndpointTypes 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.network.v2020_04_01.AvailablePrivateEndpointTypes listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain 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;AvailablePrivateEndpointTypeInner&gt; object if successful.
+     */
+    public PagedList<AvailablePrivateEndpointTypeInner> list(final String location) {
+        ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response = listSinglePageAsync(location).toBlocking().single();
+        return new PagedList<AvailablePrivateEndpointTypeInner>(response.body()) {
+            @Override
+            public Page<AvailablePrivateEndpointTypeInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain 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<AvailablePrivateEndpointTypeInner>> listAsync(final String location, final ListOperationCallback<AvailablePrivateEndpointTypeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<Page<AvailablePrivateEndpointTypeInner>> listAsync(final String location) {
+        return listWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Page<AvailablePrivateEndpointTypeInner>>() {
+                @Override
+                public Page<AvailablePrivateEndpointTypeInner> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listWithServiceResponseAsync(final String location) {
+        return listSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailablePrivateEndpointTypeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailablePrivateEndpointTypeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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;AvailablePrivateEndpointTypeInner&gt; object if successful.
+     */
+    public PagedList<AvailablePrivateEndpointTypeInner> listByResourceGroup(final String location, final String resourceGroupName) {
+        ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response = listByResourceGroupSinglePageAsync(location, resourceGroupName).toBlocking().single();
+        return new PagedList<AvailablePrivateEndpointTypeInner>(response.body()) {
+            @Override
+            public Page<AvailablePrivateEndpointTypeInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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<AvailablePrivateEndpointTypeInner>> listByResourceGroupAsync(final String location, final String resourceGroupName, final ListOperationCallback<AvailablePrivateEndpointTypeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(location, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<Page<AvailablePrivateEndpointTypeInner>> listByResourceGroupAsync(final String location, final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(location, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Page<AvailablePrivateEndpointTypeInner>>() {
+                @Override
+                public Page<AvailablePrivateEndpointTypeInner> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listByResourceGroupWithServiceResponseAsync(final String location, final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(location, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> * @param location The location of the domain name.
+    ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listByResourceGroupSinglePageAsync(final String location, final String resourceGroupName) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailablePrivateEndpointTypeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailablePrivateEndpointTypeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object if successful.
+     */
+    public PagedList<AvailablePrivateEndpointTypeInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailablePrivateEndpointTypeInner>(response.body()) {
+            @Override
+            public Page<AvailablePrivateEndpointTypeInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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<AvailablePrivateEndpointTypeInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailablePrivateEndpointTypeInner>> serviceFuture, final ListOperationCallback<AvailablePrivateEndpointTypeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<Page<AvailablePrivateEndpointTypeInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Page<AvailablePrivateEndpointTypeInner>>() {
+                @Override
+                public Page<AvailablePrivateEndpointTypeInner> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> 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<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailablePrivateEndpointTypeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailablePrivateEndpointTypeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object if successful.
+     */
+    public PagedList<AvailablePrivateEndpointTypeInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailablePrivateEndpointTypeInner>(response.body()) {
+            @Override
+            public Page<AvailablePrivateEndpointTypeInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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<AvailablePrivateEndpointTypeInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AvailablePrivateEndpointTypeInner>> serviceFuture, final ListOperationCallback<AvailablePrivateEndpointTypeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<Page<AvailablePrivateEndpointTypeInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Page<AvailablePrivateEndpointTypeInner>>() {
+                @Override
+                public Page<AvailablePrivateEndpointTypeInner> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @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;AvailablePrivateEndpointTypeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>, Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(ServiceResponse<Page<AvailablePrivateEndpointTypeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailablePrivateEndpointTypeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> 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<AvailablePrivateEndpointTypeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailablePrivateEndpointTypeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailablePrivateEndpointTypeInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailablePrivateEndpointTypeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailablePrivateEndpointTypeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListImpl.java
new file mode 100644
index 000000000000..6bb0bf493b61
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AvailableProvidersList;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableProvidersListCountry;
+
+class AvailableProvidersListImpl extends WrapperImpl<AvailableProvidersListInner> implements AvailableProvidersList {
+    private final NetworkManager manager;
+    AvailableProvidersListImpl(AvailableProvidersListInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<AvailableProvidersListCountry> countries() {
+        return this.inner().countries();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListInner.java
new file mode 100644
index 000000000000..59506b9f607d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableProvidersListInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableProvidersListCountry;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of available countries with details.
+ */
+public class AvailableProvidersListInner {
+    /**
+     * List of available countries.
+     */
+    @JsonProperty(value = "countries", required = true)
+    private List<AvailableProvidersListCountry> countries;
+
+    /**
+     * Get list of available countries.
+     *
+     * @return the countries value
+     */
+    public List<AvailableProvidersListCountry> countries() {
+        return this.countries;
+    }
+
+    /**
+     * Set list of available countries.
+     *
+     * @param countries the countries value to set
+     * @return the AvailableProvidersListInner object itself.
+     */
+    public AvailableProvidersListInner withCountries(List<AvailableProvidersListCountry> countries) {
+        this.countries = countries;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsImpl.java
new file mode 100644
index 000000000000..b35fc6c00936
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableResourceGroupDelegations;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.LocationAvailableDelegationModel;
+
+class AvailableResourceGroupDelegationsImpl extends WrapperImpl<AvailableResourceGroupDelegationsInner> implements AvailableResourceGroupDelegations {
+    private final NetworkManager manager;
+
+    AvailableResourceGroupDelegationsImpl(NetworkManager manager) {
+        super(manager.inner().availableResourceGroupDelegations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private LocationAvailableDelegationModelImpl wrapModel(AvailableDelegationInner inner) {
+        return  new LocationAvailableDelegationModelImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<LocationAvailableDelegationModel> listAsync(final String location, final String resourceGroupName) {
+        AvailableResourceGroupDelegationsInner client = this.inner();
+        return client.listAsync(location, resourceGroupName)
+        .flatMapIterable(new Func1<Page<AvailableDelegationInner>, Iterable<AvailableDelegationInner>>() {
+            @Override
+            public Iterable<AvailableDelegationInner> call(Page<AvailableDelegationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailableDelegationInner, LocationAvailableDelegationModel>() {
+            @Override
+            public LocationAvailableDelegationModel call(AvailableDelegationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsInner.java
new file mode 100644
index 000000000000..7e4d530a7772
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableResourceGroupDelegationsInner.java
@@ -0,0 +1,301 @@
+/**
+ * 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.network.v2020_04_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.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 AvailableResourceGroupDelegations.
+ */
+public class AvailableResourceGroupDelegationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private AvailableResourceGroupDelegationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AvailableResourceGroupDelegationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AvailableResourceGroupDelegationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AvailableResourceGroupDelegationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AvailableResourceGroupDelegations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AvailableResourceGroupDelegationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AvailableResourceGroupDelegations list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/availableDelegations")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.AvailableResourceGroupDelegations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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;AvailableDelegationInner&gt; object if successful.
+     */
+    public PagedList<AvailableDelegationInner> list(final String location, final String resourceGroupName) {
+        ServiceResponse<Page<AvailableDelegationInner>> response = listSinglePageAsync(location, resourceGroupName).toBlocking().single();
+        return new PagedList<AvailableDelegationInner>(response.body()) {
+            @Override
+            public Page<AvailableDelegationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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<AvailableDelegationInner>> listAsync(final String location, final String resourceGroupName, final ListOperationCallback<AvailableDelegationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableDelegationInner&gt; object
+     */
+    public Observable<Page<AvailableDelegationInner>> listAsync(final String location, final String resourceGroupName) {
+        return listWithServiceResponseAsync(location, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Page<AvailableDelegationInner>>() {
+                @Override
+                public Page<AvailableDelegationInner> call(ServiceResponse<Page<AvailableDelegationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableDelegationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listWithServiceResponseAsync(final String location, final String resourceGroupName) {
+        return listSinglePageAsync(location, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(ServiceResponse<Page<AvailableDelegationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+    ServiceResponse<PageImpl<AvailableDelegationInner>> * @param location The location of the domain name.
+    ServiceResponse<PageImpl<AvailableDelegationInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableDelegationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listSinglePageAsync(final String location, final String resourceGroupName) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableDelegationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableDelegationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableDelegationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableDelegationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableDelegationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object if successful.
+     */
+    public PagedList<AvailableDelegationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailableDelegationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailableDelegationInner>(response.body()) {
+            @Override
+            public Page<AvailableDelegationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @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<AvailableDelegationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailableDelegationInner>> serviceFuture, final ListOperationCallback<AvailableDelegationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object
+     */
+    public Observable<Page<AvailableDelegationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Page<AvailableDelegationInner>>() {
+                @Override
+                public Page<AvailableDelegationInner> call(ServiceResponse<Page<AvailableDelegationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+     * @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;AvailableDelegationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableDelegationInner>>, Observable<ServiceResponse<Page<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(ServiceResponse<Page<AvailableDelegationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all of the available subnet delegations for this resource group in this region.
+     *
+    ServiceResponse<PageImpl<AvailableDelegationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableDelegationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableDelegationInner>>> 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<AvailableDelegationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableDelegationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableDelegationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableDelegationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableDelegationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableDelegationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableDelegationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasImpl.java
new file mode 100644
index 000000000000..9219894076d6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasImpl.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AvailableServiceAlias;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class AvailableServiceAliasImpl extends WrapperImpl<AvailableServiceAliasInner> implements AvailableServiceAlias {
+    private final NetworkManager manager;
+
+    AvailableServiceAliasImpl(AvailableServiceAliasInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String resourceName() {
+        return this.inner().resourceName();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasInner.java
new file mode 100644
index 000000000000..bd873c9c76df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The available service alias.
+ */
+public class AvailableServiceAliasInner {
+    /**
+     * The name of the service alias.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The ID of the service alias.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * The type of the resource.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * The resource name of the service alias.
+     */
+    @JsonProperty(value = "resourceName")
+    private String resourceName;
+
+    /**
+     * Get the name of the service alias.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the service alias.
+     *
+     * @param name the name value to set
+     * @return the AvailableServiceAliasInner object itself.
+     */
+    public AvailableServiceAliasInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the ID of the service alias.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the ID of the service alias.
+     *
+     * @param id the id value to set
+     * @return the AvailableServiceAliasInner object itself.
+     */
+    public AvailableServiceAliasInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get the type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of the resource.
+     *
+     * @param type the type value to set
+     * @return the AvailableServiceAliasInner object itself.
+     */
+    public AvailableServiceAliasInner withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the resource name of the service alias.
+     *
+     * @return the resourceName value
+     */
+    public String resourceName() {
+        return this.resourceName;
+    }
+
+    /**
+     * Set the resource name of the service alias.
+     *
+     * @param resourceName the resourceName value to set
+     * @return the AvailableServiceAliasInner object itself.
+     */
+    public AvailableServiceAliasInner withResourceName(String resourceName) {
+        this.resourceName = resourceName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesImpl.java
new file mode 100644
index 000000000000..bb4f24c93a0e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesImpl.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableServiceAliases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableServiceAlias;
+
+class AvailableServiceAliasesImpl extends WrapperImpl<AvailableServiceAliasesInner> implements AvailableServiceAliases {
+    private final NetworkManager manager;
+
+    AvailableServiceAliasesImpl(NetworkManager manager) {
+        super(manager.inner().availableServiceAliases());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private AvailableServiceAliasImpl wrapModel(AvailableServiceAliasInner inner) {
+        return  new AvailableServiceAliasImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<AvailableServiceAlias> listByResourceGroupAsync(final String resourceGroupName, final String location) {
+        AvailableServiceAliasesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName, location)
+        .flatMapIterable(new Func1<Page<AvailableServiceAliasInner>, Iterable<AvailableServiceAliasInner>>() {
+            @Override
+            public Iterable<AvailableServiceAliasInner> call(Page<AvailableServiceAliasInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailableServiceAliasInner, AvailableServiceAlias>() {
+            @Override
+            public AvailableServiceAlias call(AvailableServiceAliasInner inner) {
+                return new AvailableServiceAliasImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AvailableServiceAlias> listAsync(final String location) {
+        AvailableServiceAliasesInner client = this.inner();
+        return client.listAsync(location)
+        .flatMapIterable(new Func1<Page<AvailableServiceAliasInner>, Iterable<AvailableServiceAliasInner>>() {
+            @Override
+            public Iterable<AvailableServiceAliasInner> call(Page<AvailableServiceAliasInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailableServiceAliasInner, AvailableServiceAlias>() {
+            @Override
+            public AvailableServiceAlias call(AvailableServiceAliasInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesInner.java
new file mode 100644
index 000000000000..4a8606bc3e4d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AvailableServiceAliasesInner.java
@@ -0,0 +1,533 @@
+/**
+ * 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.network.v2020_04_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.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 AvailableServiceAliases.
+ */
+public class AvailableServiceAliasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private AvailableServiceAliasesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AvailableServiceAliasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AvailableServiceAliasesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AvailableServiceAliasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AvailableServiceAliases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AvailableServiceAliasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AvailableServiceAliases list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availableServiceAliases")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.AvailableServiceAliases listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/availableServiceAliases")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("location") String location, @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.network.v2020_04_01.AvailableServiceAliases 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.network.v2020_04_01.AvailableServiceAliases listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @param location The location.
+     * @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;AvailableServiceAliasInner&gt; object if successful.
+     */
+    public PagedList<AvailableServiceAliasInner> list(final String location) {
+        ServiceResponse<Page<AvailableServiceAliasInner>> response = listSinglePageAsync(location).toBlocking().single();
+        return new PagedList<AvailableServiceAliasInner>(response.body()) {
+            @Override
+            public Page<AvailableServiceAliasInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @param location The location.
+     * @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<AvailableServiceAliasInner>> listAsync(final String location, final ListOperationCallback<AvailableServiceAliasInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<Page<AvailableServiceAliasInner>> listAsync(final String location) {
+        return listWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Page<AvailableServiceAliasInner>>() {
+                @Override
+                public Page<AvailableServiceAliasInner> call(ServiceResponse<Page<AvailableServiceAliasInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listWithServiceResponseAsync(final String location) {
+        return listSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(ServiceResponse<Page<AvailableServiceAliasInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailableServiceAliasInner>> * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableServiceAliasInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableServiceAliasInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableServiceAliasInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableServiceAliasInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableServiceAliasInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableServiceAliasInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param location The location.
+     * @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;AvailableServiceAliasInner&gt; object if successful.
+     */
+    public PagedList<AvailableServiceAliasInner> listByResourceGroup(final String resourceGroupName, final String location) {
+        ServiceResponse<Page<AvailableServiceAliasInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName, location).toBlocking().single();
+        return new PagedList<AvailableServiceAliasInner>(response.body()) {
+            @Override
+            public Page<AvailableServiceAliasInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param location The location.
+     * @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<AvailableServiceAliasInner>> listByResourceGroupAsync(final String resourceGroupName, final String location, final ListOperationCallback<AvailableServiceAliasInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName, location),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<Page<AvailableServiceAliasInner>> listByResourceGroupAsync(final String resourceGroupName, final String location) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName, location)
+            .map(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Page<AvailableServiceAliasInner>>() {
+                @Override
+                public Page<AvailableServiceAliasInner> call(ServiceResponse<Page<AvailableServiceAliasInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName, final String location) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName, location)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(ServiceResponse<Page<AvailableServiceAliasInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+    ServiceResponse<PageImpl<AvailableServiceAliasInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<AvailableServiceAliasInner>> * @param location The location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableServiceAliasInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName, final String location) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableServiceAliasInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableServiceAliasInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableServiceAliasInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableServiceAliasInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableServiceAliasInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object if successful.
+     */
+    public PagedList<AvailableServiceAliasInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailableServiceAliasInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailableServiceAliasInner>(response.body()) {
+            @Override
+            public Page<AvailableServiceAliasInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @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<AvailableServiceAliasInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailableServiceAliasInner>> serviceFuture, final ListOperationCallback<AvailableServiceAliasInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<Page<AvailableServiceAliasInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Page<AvailableServiceAliasInner>>() {
+                @Override
+                public Page<AvailableServiceAliasInner> call(ServiceResponse<Page<AvailableServiceAliasInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(ServiceResponse<Page<AvailableServiceAliasInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AvailableServiceAliasInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableServiceAliasInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> 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<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableServiceAliasInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableServiceAliasInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableServiceAliasInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableServiceAliasInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableServiceAliasInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object if successful.
+     */
+    public PagedList<AvailableServiceAliasInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailableServiceAliasInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailableServiceAliasInner>(response.body()) {
+            @Override
+            public Page<AvailableServiceAliasInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @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<AvailableServiceAliasInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AvailableServiceAliasInner>> serviceFuture, final ListOperationCallback<AvailableServiceAliasInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<Page<AvailableServiceAliasInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Page<AvailableServiceAliasInner>>() {
+                @Override
+                public Page<AvailableServiceAliasInner> call(ServiceResponse<Page<AvailableServiceAliasInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+     * @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;AvailableServiceAliasInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailableServiceAliasInner>>, Observable<ServiceResponse<Page<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(ServiceResponse<Page<AvailableServiceAliasInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all available service aliases for this resource group in this region.
+     *
+    ServiceResponse<PageImpl<AvailableServiceAliasInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailableServiceAliasInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> 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<AvailableServiceAliasInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailableServiceAliasInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailableServiceAliasInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailableServiceAliasInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailableServiceAliasInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailableServiceAliasInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailableServiceAliasInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagImpl.java
new file mode 100644
index 000000000000..428e45362af1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallFqdnTag;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class AzureFirewallFqdnTagImpl extends GroupableResourceCoreImpl<AzureFirewallFqdnTag, AzureFirewallFqdnTagInner, AzureFirewallFqdnTagImpl, NetworkManager> implements AzureFirewallFqdnTag {
+    AzureFirewallFqdnTagImpl(String name, AzureFirewallFqdnTagInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<AzureFirewallFqdnTag> createResourceAsync() {
+        AzureFirewallFqdnTagsInner client = this.manager().inner().azureFirewallFqdnTags();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<AzureFirewallFqdnTag> updateResourceAsync() {
+        AzureFirewallFqdnTagsInner client = this.manager().inner().azureFirewallFqdnTags();
+        return null; // NOP updateResourceAsync implementation as update is not supported
+    }
+
+    @Override
+    protected Observable<AzureFirewallFqdnTagInner> getInnerAsync() {
+        AzureFirewallFqdnTagsInner client = this.manager().inner().azureFirewallFqdnTags();
+        return null; // NOP getInnerAsync implementation as get is not supported
+    }
+
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String fqdnTagName() {
+        return this.inner().fqdnTagName();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagInner.java
new file mode 100644
index 000000000000..7a543a6035c5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Azure Firewall FQDN Tag Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class AzureFirewallFqdnTagInner extends Resource {
+    /**
+     * The provisioning state of the Azure firewall FQDN tag resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of this FQDN Tag.
+     */
+    @JsonProperty(value = "properties.fqdnTagName", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdnTagName;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the provisioning state of the Azure firewall FQDN tag resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of this FQDN Tag.
+     *
+     * @return the fqdnTagName value
+     */
+    public String fqdnTagName() {
+        return this.fqdnTagName;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the AzureFirewallFqdnTagInner object itself.
+     */
+    public AzureFirewallFqdnTagInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsImpl.java
new file mode 100644
index 000000000000..8dc1b655f079
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsImpl.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallFqdnTags;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallFqdnTag;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+
+class AzureFirewallFqdnTagsImpl extends GroupableResourcesCoreImpl<AzureFirewallFqdnTag, AzureFirewallFqdnTagImpl, AzureFirewallFqdnTagInner, AzureFirewallFqdnTagsInner, NetworkManager>  implements AzureFirewallFqdnTags {
+    protected AzureFirewallFqdnTagsImpl(NetworkManager manager) {
+        super(manager.inner().azureFirewallFqdnTags(), manager);
+    }
+
+    @Override
+    protected Observable<AzureFirewallFqdnTagInner> getInnerAsync(String resourceGroupName, String name) {
+        return null; // NOP Retrieve by resource group not supported
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        AzureFirewallFqdnTagsInner 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<AzureFirewallFqdnTag> list() {
+        AzureFirewallFqdnTagsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<AzureFirewallFqdnTag> listAsync() {
+        AzureFirewallFqdnTagsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<AzureFirewallFqdnTagInner>, Iterable<AzureFirewallFqdnTagInner>>() {
+            @Override
+            public Iterable<AzureFirewallFqdnTagInner> call(Page<AzureFirewallFqdnTagInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AzureFirewallFqdnTagInner, AzureFirewallFqdnTag>() {
+            @Override
+            public AzureFirewallFqdnTag call(AzureFirewallFqdnTagInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    protected AzureFirewallFqdnTagImpl wrapModel(AzureFirewallFqdnTagInner inner) {
+        return  new AzureFirewallFqdnTagImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected AzureFirewallFqdnTagImpl wrapModel(String name) {
+        return null; // Model is not creatable
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsInner.java
new file mode 100644
index 000000000000..ec519b57c18a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallFqdnTagsInner.java
@@ -0,0 +1,285 @@
+/**
+ * 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.network.v2020_04_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.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 AzureFirewallFqdnTags.
+ */
+public class AzureFirewallFqdnTagsInner {
+    /** The Retrofit service to perform REST calls. */
+    private AzureFirewallFqdnTagsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AzureFirewallFqdnTagsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AzureFirewallFqdnTagsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AzureFirewallFqdnTagsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AzureFirewallFqdnTags to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AzureFirewallFqdnTagsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AzureFirewallFqdnTags list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/azureFirewallFqdnTags")
+        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.network.v2020_04_01.AzureFirewallFqdnTags listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a 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;AzureFirewallFqdnTagInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallFqdnTagInner> list() {
+        ServiceResponse<Page<AzureFirewallFqdnTagInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<AzureFirewallFqdnTagInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallFqdnTagInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a 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<AzureFirewallFqdnTagInner>> listAsync(final ListOperationCallback<AzureFirewallFqdnTagInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallFqdnTagInner&gt; object
+     */
+    public Observable<Page<AzureFirewallFqdnTagInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<AzureFirewallFqdnTagInner>>, Page<AzureFirewallFqdnTagInner>>() {
+                @Override
+                public Page<AzureFirewallFqdnTagInner> call(ServiceResponse<Page<AzureFirewallFqdnTagInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallFqdnTagInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallFqdnTagInner>>, Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(ServiceResponse<Page<AzureFirewallFqdnTagInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallFqdnTagInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallFqdnTagInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallFqdnTagInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallFqdnTagInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallFqdnTagInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallFqdnTagInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @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;AzureFirewallFqdnTagInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallFqdnTagInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AzureFirewallFqdnTagInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AzureFirewallFqdnTagInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallFqdnTagInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @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<AzureFirewallFqdnTagInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AzureFirewallFqdnTagInner>> serviceFuture, final ListOperationCallback<AzureFirewallFqdnTagInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @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;AzureFirewallFqdnTagInner&gt; object
+     */
+    public Observable<Page<AzureFirewallFqdnTagInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AzureFirewallFqdnTagInner>>, Page<AzureFirewallFqdnTagInner>>() {
+                @Override
+                public Page<AzureFirewallFqdnTagInner> call(ServiceResponse<Page<AzureFirewallFqdnTagInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+     * @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;AzureFirewallFqdnTagInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallFqdnTagInner>>, Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(ServiceResponse<Page<AzureFirewallFqdnTagInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewall FQDN Tags in a subscription.
+     *
+    ServiceResponse<PageImpl<AzureFirewallFqdnTagInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallFqdnTagInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> 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<AzureFirewallFqdnTagInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallFqdnTagInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallFqdnTagInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallFqdnTagInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallFqdnTagInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallFqdnTagInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallFqdnTagInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallImpl.java
new file mode 100644
index 000000000000..9331033308ae
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallImpl.java
@@ -0,0 +1,199 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewall;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallApplicationRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallNatRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallNetworkRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.HubIPAddresses;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallIpGroups;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallSku;
+import java.util.Map;
+
+class AzureFirewallImpl extends GroupableResourceCoreImpl<AzureFirewall, AzureFirewallInner, AzureFirewallImpl, NetworkManager> implements AzureFirewall, AzureFirewall.Definition, AzureFirewall.Update {
+    AzureFirewallImpl(String name, AzureFirewallInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<AzureFirewall> createResourceAsync() {
+        AzureFirewallsInner client = this.manager().inner().azureFirewalls();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<AzureFirewall> updateResourceAsync() {
+        AzureFirewallsInner client = this.manager().inner().azureFirewalls();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<AzureFirewallInner> getInnerAsync() {
+        AzureFirewallsInner client = this.manager().inner().azureFirewalls();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Map<String, String> additionalProperties() {
+        return this.inner().additionalProperties();
+    }
+
+    @Override
+    public List<AzureFirewallApplicationRuleCollection> applicationRuleCollections() {
+        return this.inner().applicationRuleCollections();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource firewallPolicy() {
+        return this.inner().firewallPolicy();
+    }
+
+    @Override
+    public HubIPAddresses hubIpAddresses() {
+        return this.inner().hubIpAddresses();
+    }
+
+    @Override
+    public List<AzureFirewallIPConfiguration> ipConfigurations() {
+        return this.inner().ipConfigurations();
+    }
+
+    @Override
+    public List<AzureFirewallIpGroups> ipGroups() {
+        return this.inner().ipGroups();
+    }
+
+    @Override
+    public AzureFirewallIPConfiguration managementIpConfiguration() {
+        return this.inner().managementIpConfiguration();
+    }
+
+    @Override
+    public List<AzureFirewallNatRuleCollection> natRuleCollections() {
+        return this.inner().natRuleCollections();
+    }
+
+    @Override
+    public List<AzureFirewallNetworkRuleCollection> networkRuleCollections() {
+        return this.inner().networkRuleCollections();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public AzureFirewallSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public AzureFirewallThreatIntelMode threatIntelMode() {
+        return this.inner().threatIntelMode();
+    }
+
+    @Override
+    public SubResource virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+    @Override
+    public AzureFirewallImpl withAdditionalProperties(Map<String, String> additionalProperties) {
+        this.inner().withAdditionalProperties(additionalProperties);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections) {
+        this.inner().withApplicationRuleCollections(applicationRuleCollections);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withFirewallPolicy(SubResource firewallPolicy) {
+        this.inner().withFirewallPolicy(firewallPolicy);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations) {
+        this.inner().withIpConfigurations(ipConfigurations);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withManagementIpConfiguration(AzureFirewallIPConfiguration managementIpConfiguration) {
+        this.inner().withManagementIpConfiguration(managementIpConfiguration);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withNatRuleCollections(List<AzureFirewallNatRuleCollection> natRuleCollections) {
+        this.inner().withNatRuleCollections(natRuleCollections);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections) {
+        this.inner().withNetworkRuleCollections(networkRuleCollections);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withSku(AzureFirewallSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
+        this.inner().withThreatIntelMode(threatIntelMode);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withVirtualHub(SubResource virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+    @Override
+    public AzureFirewallImpl withZones(List<String> zones) {
+        this.inner().withZones(zones);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallInner.java
new file mode 100644
index 000000000000..55c428260032
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallInner.java
@@ -0,0 +1,409 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallApplicationRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallNatRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallNetworkRuleCollection;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.HubIPAddresses;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallIpGroups;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallSku;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Azure Firewall resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class AzureFirewallInner extends Resource {
+    /**
+     * Collection of application rule collections used by Azure Firewall.
+     */
+    @JsonProperty(value = "properties.applicationRuleCollections")
+    private List<AzureFirewallApplicationRuleCollection> applicationRuleCollections;
+
+    /**
+     * Collection of NAT rule collections used by Azure Firewall.
+     */
+    @JsonProperty(value = "properties.natRuleCollections")
+    private List<AzureFirewallNatRuleCollection> natRuleCollections;
+
+    /**
+     * Collection of network rule collections used by Azure Firewall.
+     */
+    @JsonProperty(value = "properties.networkRuleCollections")
+    private List<AzureFirewallNetworkRuleCollection> networkRuleCollections;
+
+    /**
+     * IP configuration of the Azure Firewall resource.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<AzureFirewallIPConfiguration> ipConfigurations;
+
+    /**
+     * IP configuration of the Azure Firewall used for management traffic.
+     */
+    @JsonProperty(value = "properties.managementIpConfiguration")
+    private AzureFirewallIPConfiguration managementIpConfiguration;
+
+    /**
+     * The provisioning state of the Azure firewall resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The operation mode for Threat Intelligence. Possible values include:
+     * 'Alert', 'Deny', 'Off'.
+     */
+    @JsonProperty(value = "properties.threatIntelMode")
+    private AzureFirewallThreatIntelMode threatIntelMode;
+
+    /**
+     * The virtualHub to which the firewall belongs.
+     */
+    @JsonProperty(value = "properties.virtualHub")
+    private SubResource virtualHub;
+
+    /**
+     * The firewallPolicy associated with this azure firewall.
+     */
+    @JsonProperty(value = "properties.firewallPolicy")
+    private SubResource firewallPolicy;
+
+    /**
+     * IP addresses associated with AzureFirewall.
+     */
+    @JsonProperty(value = "properties.hubIpAddresses", access = JsonProperty.Access.WRITE_ONLY)
+    private HubIPAddresses hubIpAddresses;
+
+    /**
+     * IpGroups associated with AzureFirewall.
+     */
+    @JsonProperty(value = "properties.ipGroups", access = JsonProperty.Access.WRITE_ONLY)
+    private List<AzureFirewallIpGroups> ipGroups;
+
+    /**
+     * The Azure Firewall Resource SKU.
+     */
+    @JsonProperty(value = "properties.sku")
+    private AzureFirewallSku sku;
+
+    /**
+     * The additional properties used to further config this azure firewall.
+     */
+    @JsonProperty(value = "properties.additionalProperties")
+    private Map<String, String> additionalProperties;
+
+    /**
+     * A list of availability zones denoting where the resource needs to come
+     * from.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get collection of application rule collections used by Azure Firewall.
+     *
+     * @return the applicationRuleCollections value
+     */
+    public List<AzureFirewallApplicationRuleCollection> applicationRuleCollections() {
+        return this.applicationRuleCollections;
+    }
+
+    /**
+     * Set collection of application rule collections used by Azure Firewall.
+     *
+     * @param applicationRuleCollections the applicationRuleCollections value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections) {
+        this.applicationRuleCollections = applicationRuleCollections;
+        return this;
+    }
+
+    /**
+     * Get collection of NAT rule collections used by Azure Firewall.
+     *
+     * @return the natRuleCollections value
+     */
+    public List<AzureFirewallNatRuleCollection> natRuleCollections() {
+        return this.natRuleCollections;
+    }
+
+    /**
+     * Set collection of NAT rule collections used by Azure Firewall.
+     *
+     * @param natRuleCollections the natRuleCollections value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withNatRuleCollections(List<AzureFirewallNatRuleCollection> natRuleCollections) {
+        this.natRuleCollections = natRuleCollections;
+        return this;
+    }
+
+    /**
+     * Get collection of network rule collections used by Azure Firewall.
+     *
+     * @return the networkRuleCollections value
+     */
+    public List<AzureFirewallNetworkRuleCollection> networkRuleCollections() {
+        return this.networkRuleCollections;
+    }
+
+    /**
+     * Set collection of network rule collections used by Azure Firewall.
+     *
+     * @param networkRuleCollections the networkRuleCollections value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections) {
+        this.networkRuleCollections = networkRuleCollections;
+        return this;
+    }
+
+    /**
+     * Get iP configuration of the Azure Firewall resource.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<AzureFirewallIPConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set iP configuration of the Azure Firewall resource.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get iP configuration of the Azure Firewall used for management traffic.
+     *
+     * @return the managementIpConfiguration value
+     */
+    public AzureFirewallIPConfiguration managementIpConfiguration() {
+        return this.managementIpConfiguration;
+    }
+
+    /**
+     * Set iP configuration of the Azure Firewall used for management traffic.
+     *
+     * @param managementIpConfiguration the managementIpConfiguration value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withManagementIpConfiguration(AzureFirewallIPConfiguration managementIpConfiguration) {
+        this.managementIpConfiguration = managementIpConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the Azure firewall resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'.
+     *
+     * @return the threatIntelMode value
+     */
+    public AzureFirewallThreatIntelMode threatIntelMode() {
+        return this.threatIntelMode;
+    }
+
+    /**
+     * Set the operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'.
+     *
+     * @param threatIntelMode the threatIntelMode value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
+        this.threatIntelMode = threatIntelMode;
+        return this;
+    }
+
+    /**
+     * Get the virtualHub to which the firewall belongs.
+     *
+     * @return the virtualHub value
+     */
+    public SubResource virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the virtualHub to which the firewall belongs.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withVirtualHub(SubResource virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get the firewallPolicy associated with this azure firewall.
+     *
+     * @return the firewallPolicy value
+     */
+    public SubResource firewallPolicy() {
+        return this.firewallPolicy;
+    }
+
+    /**
+     * Set the firewallPolicy associated with this azure firewall.
+     *
+     * @param firewallPolicy the firewallPolicy value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withFirewallPolicy(SubResource firewallPolicy) {
+        this.firewallPolicy = firewallPolicy;
+        return this;
+    }
+
+    /**
+     * Get iP addresses associated with AzureFirewall.
+     *
+     * @return the hubIpAddresses value
+     */
+    public HubIPAddresses hubIpAddresses() {
+        return this.hubIpAddresses;
+    }
+
+    /**
+     * Get ipGroups associated with AzureFirewall.
+     *
+     * @return the ipGroups value
+     */
+    public List<AzureFirewallIpGroups> ipGroups() {
+        return this.ipGroups;
+    }
+
+    /**
+     * Get the Azure Firewall Resource SKU.
+     *
+     * @return the sku value
+     */
+    public AzureFirewallSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the Azure Firewall Resource SKU.
+     *
+     * @param sku the sku value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withSku(AzureFirewallSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the additional properties used to further config this azure firewall.
+     *
+     * @return the additionalProperties value
+     */
+    public Map<String, String> additionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /**
+     * Set the additional properties used to further config this azure firewall.
+     *
+     * @param additionalProperties the additionalProperties value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withAdditionalProperties(Map<String, String> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+        return this;
+    }
+
+    /**
+     * Get a list of availability zones denoting where the resource needs to come from.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting where the resource needs to come from.
+     *
+     * @param zones the zones value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsImpl.java
new file mode 100644
index 000000000000..4dc309cde80e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewalls;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewall;
+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;
+
+class AzureFirewallsImpl extends GroupableResourcesCoreImpl<AzureFirewall, AzureFirewallImpl, AzureFirewallInner, AzureFirewallsInner, NetworkManager>  implements AzureFirewalls {
+    protected AzureFirewallsImpl(NetworkManager manager) {
+        super(manager.inner().azureFirewalls(), manager);
+    }
+
+    @Override
+    protected Observable<AzureFirewallInner> getInnerAsync(String resourceGroupName, String name) {
+        AzureFirewallsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        AzureFirewallsInner 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<AzureFirewall> listByResourceGroup(String resourceGroupName) {
+        AzureFirewallsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<AzureFirewall> listByResourceGroupAsync(String resourceGroupName) {
+        AzureFirewallsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<AzureFirewallInner>, Iterable<AzureFirewallInner>>() {
+            @Override
+            public Iterable<AzureFirewallInner> call(Page<AzureFirewallInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AzureFirewallInner, AzureFirewall>() {
+            @Override
+            public AzureFirewall call(AzureFirewallInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<AzureFirewall> list() {
+        AzureFirewallsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<AzureFirewall> listAsync() {
+        AzureFirewallsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<AzureFirewallInner>, Iterable<AzureFirewallInner>>() {
+            @Override
+            public Iterable<AzureFirewallInner> call(Page<AzureFirewallInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AzureFirewallInner, AzureFirewall>() {
+            @Override
+            public AzureFirewall call(AzureFirewallInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public AzureFirewallImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected AzureFirewallImpl wrapModel(AzureFirewallInner inner) {
+        return  new AzureFirewallImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected AzureFirewallImpl wrapModel(String name) {
+        return new AzureFirewallImpl(name, new AzureFirewallInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsInner.java
new file mode 100644
index 000000000000..0c106eb20917
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureFirewallsInner.java
@@ -0,0 +1,1274 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 AzureFirewalls.
+ */
+public class AzureFirewallsInner implements InnerSupportsGet<AzureFirewallInner>, InnerSupportsDelete<Void>, InnerSupportsListing<AzureFirewallInner> {
+    /** The Retrofit service to perform REST calls. */
+    private AzureFirewallsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AzureFirewallsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AzureFirewallsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(AzureFirewallsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AzureFirewalls to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AzureFirewallsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AzureFirewalls delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @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.network.v2020_04_01.AzureFirewalls beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @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.network.v2020_04_01.AzureFirewalls getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @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.network.v2020_04_01.AzureFirewalls createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @Path("subscriptionId") String subscriptionId, @Body AzureFirewallInner 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.network.v2020_04_01.AzureFirewalls beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @Path("subscriptionId") String subscriptionId, @Body AzureFirewallInner 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.network.v2020_04_01.AzureFirewalls updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AzureFirewalls beginUpdateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
+        Observable<Response<ResponseBody>> beginUpdateTags(@Path("resourceGroupName") String resourceGroupName, @Path("azureFirewallName") String azureFirewallName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.AzureFirewalls listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls")
+        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.network.v2020_04_01.AzureFirewalls list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/azureFirewalls")
+        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.network.v2020_04_01.AzureFirewalls 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.network.v2020_04_01.AzureFirewalls listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 azureFirewallName) {
+        deleteWithServiceResponseAsync(resourceGroupName, azureFirewallName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 azureFirewallName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, azureFirewallName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String azureFirewallName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, azureFirewallName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String azureFirewallName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 azureFirewallName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, azureFirewallName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 azureFirewallName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, azureFirewallName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String azureFirewallName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, azureFirewallName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String azureFirewallName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, azureFirewallName, this.client.subscriptionId(), 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 specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner getByResourceGroup(String resourceGroupName, String azureFirewallName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, azureFirewallName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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<AzureFirewallInner> getByResourceGroupAsync(String resourceGroupName, String azureFirewallName, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, azureFirewallName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<AzureFirewallInner> getByResourceGroupAsync(String resourceGroupName, String azureFirewallName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, azureFirewallName).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String azureFirewallName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureFirewallInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureFirewallInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureFirewallInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureFirewallInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureFirewallInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureFirewallInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall 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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner createOrUpdate(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @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<AzureFirewallInner> createOrUpdateAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AzureFirewallInner> createOrUpdateAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, azureFirewallName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<AzureFirewallInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall 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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner beginCreateOrUpdate(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @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<AzureFirewallInner> beginCreateOrUpdateAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<AzureFirewallInner> beginCreateOrUpdateAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, azureFirewallName, parameters).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Azure Firewall.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param parameters Parameters supplied to the create or update Azure Firewall operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String azureFirewallName, AzureFirewallInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, azureFirewallName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureFirewallInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureFirewallInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureFirewallInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureFirewallInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureFirewallInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureFirewallInner>() { }.getType())
+                .register(201, new TypeToken<AzureFirewallInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner updateTags(String resourceGroupName, String azureFirewallName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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<AzureFirewallInner> updateTagsAsync(String resourceGroupName, String azureFirewallName, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AzureFirewallInner> updateTagsAsync(String resourceGroupName, String azureFirewallName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String azureFirewallName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<AzureFirewallInner>() { }.getType());
+    }
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner updateTags(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @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<AzureFirewallInner> updateTagsAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AzureFirewallInner> updateTagsAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<AzureFirewallInner>() { }.getType());
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner beginUpdateTags(String resourceGroupName, String azureFirewallName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @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<AzureFirewallInner> beginUpdateTagsAsync(String resourceGroupName, String azureFirewallName, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<AzureFirewallInner> beginUpdateTagsAsync(String resourceGroupName, String azureFirewallName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String azureFirewallName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.beginUpdateTags(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureFirewallInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureFirewallInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureFirewallInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @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 AzureFirewallInner object if successful.
+     */
+    public AzureFirewallInner beginUpdateTags(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @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<AzureFirewallInner> beginUpdateTagsAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags, final ServiceCallback<AzureFirewallInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<AzureFirewallInner> beginUpdateTagsAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, azureFirewallName, tags).map(new Func1<ServiceResponse<AzureFirewallInner>, AzureFirewallInner>() {
+            @Override
+            public AzureFirewallInner call(ServiceResponse<AzureFirewallInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an Azure Firewall resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the Azure Firewall.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureFirewallInner object
+     */
+    public Observable<ServiceResponse<AzureFirewallInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String azureFirewallName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (azureFirewallName == null) {
+            throw new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.beginUpdateTags(resourceGroupName, azureFirewallName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureFirewallInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureFirewallInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureFirewallInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureFirewallInner> beginUpdateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureFirewallInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureFirewallInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;AzureFirewallInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<AzureFirewallInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<AzureFirewallInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<AzureFirewallInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<AzureFirewallInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallInner&gt; object
+     */
+    public Observable<Page<AzureFirewallInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Page<AzureFirewallInner>>() {
+                @Override
+                public Page<AzureFirewallInner> call(ServiceResponse<Page<AzureFirewallInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(ServiceResponse<Page<AzureFirewallInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+    ServiceResponse<PageImpl<AzureFirewallInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a 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;AzureFirewallInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallInner> list() {
+        ServiceResponse<Page<AzureFirewallInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<AzureFirewallInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a 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<AzureFirewallInner>> listAsync(final ListOperationCallback<AzureFirewallInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallInner&gt; object
+     */
+    public Observable<Page<AzureFirewallInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Page<AzureFirewallInner>>() {
+                @Override
+                public Page<AzureFirewallInner> call(ServiceResponse<Page<AzureFirewallInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AzureFirewallInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(ServiceResponse<Page<AzureFirewallInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Azure Firewalls in 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;AzureFirewallInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AzureFirewallInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AzureFirewallInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Azure Firewalls in 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<AzureFirewallInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AzureFirewallInner>> serviceFuture, final ListOperationCallback<AzureFirewallInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Azure Firewalls in 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;AzureFirewallInner&gt; object
+     */
+    public Observable<Page<AzureFirewallInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Page<AzureFirewallInner>>() {
+                @Override
+                public Page<AzureFirewallInner> call(ServiceResponse<Page<AzureFirewallInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Azure Firewalls in 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;AzureFirewallInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(ServiceResponse<Page<AzureFirewallInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Azure Firewalls in a resource group.
+     *
+    ServiceResponse<PageImpl<AzureFirewallInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> 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<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @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;AzureFirewallInner&gt; object if successful.
+     */
+    public PagedList<AzureFirewallInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AzureFirewallInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AzureFirewallInner>(response.body()) {
+            @Override
+            public Page<AzureFirewallInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @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<AzureFirewallInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AzureFirewallInner>> serviceFuture, final ListOperationCallback<AzureFirewallInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @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;AzureFirewallInner&gt; object
+     */
+    public Observable<Page<AzureFirewallInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Page<AzureFirewallInner>>() {
+                @Override
+                public Page<AzureFirewallInner> call(ServiceResponse<Page<AzureFirewallInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+     * @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;AzureFirewallInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AzureFirewallInner>>, Observable<ServiceResponse<Page<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(ServiceResponse<Page<AzureFirewallInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Azure Firewalls in a subscription.
+     *
+    ServiceResponse<PageImpl<AzureFirewallInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AzureFirewallInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AzureFirewallInner>>> 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<AzureFirewallInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AzureFirewallInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AzureFirewallInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AzureFirewallInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AzureFirewallInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AzureFirewallInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AzureFirewallInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportImpl.java
new file mode 100644
index 000000000000..743e31cf9fc7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReport;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportLocation;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportItem;
+
+class AzureReachabilityReportImpl extends WrapperImpl<AzureReachabilityReportInner> implements AzureReachabilityReport {
+    private final NetworkManager manager;
+    AzureReachabilityReportImpl(AzureReachabilityReportInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String aggregationLevel() {
+        return this.inner().aggregationLevel();
+    }
+
+    @Override
+    public AzureReachabilityReportLocation providerLocation() {
+        return this.inner().providerLocation();
+    }
+
+    @Override
+    public List<AzureReachabilityReportItem> reachabilityReport() {
+        return this.inner().reachabilityReport();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportInner.java
new file mode 100644
index 000000000000..70557ac78e07
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/AzureReachabilityReportInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportLocation;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportItem;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Azure reachability report details.
+ */
+public class AzureReachabilityReportInner {
+    /**
+     * The aggregation level of Azure reachability report. Can be Country,
+     * State or City.
+     */
+    @JsonProperty(value = "aggregationLevel", required = true)
+    private String aggregationLevel;
+
+    /**
+     * Parameters that define a geographic location.
+     */
+    @JsonProperty(value = "providerLocation", required = true)
+    private AzureReachabilityReportLocation providerLocation;
+
+    /**
+     * List of Azure reachability report items.
+     */
+    @JsonProperty(value = "reachabilityReport", required = true)
+    private List<AzureReachabilityReportItem> reachabilityReport;
+
+    /**
+     * Get the aggregation level of Azure reachability report. Can be Country, State or City.
+     *
+     * @return the aggregationLevel value
+     */
+    public String aggregationLevel() {
+        return this.aggregationLevel;
+    }
+
+    /**
+     * Set the aggregation level of Azure reachability report. Can be Country, State or City.
+     *
+     * @param aggregationLevel the aggregationLevel value to set
+     * @return the AzureReachabilityReportInner object itself.
+     */
+    public AzureReachabilityReportInner withAggregationLevel(String aggregationLevel) {
+        this.aggregationLevel = aggregationLevel;
+        return this;
+    }
+
+    /**
+     * Get parameters that define a geographic location.
+     *
+     * @return the providerLocation value
+     */
+    public AzureReachabilityReportLocation providerLocation() {
+        return this.providerLocation;
+    }
+
+    /**
+     * Set parameters that define a geographic location.
+     *
+     * @param providerLocation the providerLocation value to set
+     * @return the AzureReachabilityReportInner object itself.
+     */
+    public AzureReachabilityReportInner withProviderLocation(AzureReachabilityReportLocation providerLocation) {
+        this.providerLocation = providerLocation;
+        return this;
+    }
+
+    /**
+     * Get list of Azure reachability report items.
+     *
+     * @return the reachabilityReport value
+     */
+    public List<AzureReachabilityReportItem> reachabilityReport() {
+        return this.reachabilityReport;
+    }
+
+    /**
+     * Set list of Azure reachability report items.
+     *
+     * @param reachabilityReport the reachabilityReport value to set
+     * @return the AzureReachabilityReportInner object itself.
+     */
+    public AzureReachabilityReportInner withReachabilityReport(List<AzureReachabilityReportItem> reachabilityReport) {
+        this.reachabilityReport = reachabilityReport;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolImpl.java
new file mode 100644
index 000000000000..60d9847bfa64
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerBackendAddress;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+
+class BackendAddressPoolImpl extends CreatableUpdatableImpl<BackendAddressPool, BackendAddressPoolInner, BackendAddressPoolImpl> implements BackendAddressPool, BackendAddressPool.Definition, BackendAddressPool.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String backendAddressPoolName;
+
+    BackendAddressPoolImpl(String name, NetworkManager manager) {
+        super(name, new BackendAddressPoolInner());
+        this.manager = manager;
+        // Set resource name
+        this.backendAddressPoolName = name;
+        //
+    }
+
+    BackendAddressPoolImpl(BackendAddressPoolInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.backendAddressPoolName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.backendAddressPoolName = IdParsingUtils.getValueFromIdByName(inner.id(), "backendAddressPools");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<BackendAddressPool> createResourceAsync() {
+        LoadBalancerBackendAddressPoolsInner client = this.manager().inner().loadBalancerBackendAddressPools();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.loadBalancerName, this.backendAddressPoolName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<BackendAddressPool> updateResourceAsync() {
+        LoadBalancerBackendAddressPoolsInner client = this.manager().inner().loadBalancerBackendAddressPools();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.loadBalancerName, this.backendAddressPoolName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<BackendAddressPoolInner> getInnerAsync() {
+        LoadBalancerBackendAddressPoolsInner client = this.manager().inner().loadBalancerBackendAddressPools();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.backendAddressPoolName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> backendIPConfigurations() {
+        List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> lst = new ArrayList<VirtualMachineScaleSetNetworkInterfaceIPConfiguration>();
+        if (this.inner().backendIPConfigurations() != null) {
+            for (NetworkInterfaceIPConfigurationInner inner : this.inner().backendIPConfigurations()) {
+                lst.add( new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<LoadBalancerBackendAddress> loadBalancerBackendAddresses() {
+        return this.inner().loadBalancerBackendAddresses();
+    }
+
+    @Override
+    public List<SubResource> loadBalancingRules() {
+        return this.inner().loadBalancingRules();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource outboundRule() {
+        return this.inner().outboundRule();
+    }
+
+    @Override
+    public List<SubResource> outboundRules() {
+        return this.inner().outboundRules();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public BackendAddressPoolImpl withExistingLoadBalancer(String resourceGroupName, String loadBalancerName) {
+        this.resourceGroupName = resourceGroupName;
+        this.loadBalancerName = loadBalancerName;
+        return this;
+    }
+
+    @Override
+    public BackendAddressPoolImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public BackendAddressPoolImpl withLoadBalancerBackendAddresses(List<LoadBalancerBackendAddress> loadBalancerBackendAddresses) {
+        this.inner().withLoadBalancerBackendAddresses(loadBalancerBackendAddresses);
+        return this;
+    }
+
+    @Override
+    public BackendAddressPoolImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java
new file mode 100644
index 000000000000..c5229465d1ff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java
@@ -0,0 +1,185 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerBackendAddress;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Pool of backend IP addresses.
+ */
+@JsonFlatten
+public class BackendAddressPoolInner extends SubResource {
+    /**
+     * An array of references to IP addresses defined in network interfaces.
+     */
+    @JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;
+
+    /**
+     * An array of backend addresses.
+     */
+    @JsonProperty(value = "properties.loadBalancerBackendAddresses")
+    private List<LoadBalancerBackendAddress> loadBalancerBackendAddresses;
+
+    /**
+     * An array of references to load balancing rules that use this backend
+     * address pool.
+     */
+    @JsonProperty(value = "properties.loadBalancingRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> loadBalancingRules;
+
+    /**
+     * A reference to an outbound rule that uses this backend address pool.
+     */
+    @JsonProperty(value = "properties.outboundRule", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource outboundRule;
+
+    /**
+     * An array of references to outbound rules that use this backend address
+     * pool.
+     */
+    @JsonProperty(value = "properties.outboundRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> outboundRules;
+
+    /**
+     * The provisioning state of the backend address pool resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of backend
+     * address pools used by the load balancer. This name can be used to access
+     * the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get an array of references to IP addresses defined in network interfaces.
+     *
+     * @return the backendIPConfigurations value
+     */
+    public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
+        return this.backendIPConfigurations;
+    }
+
+    /**
+     * Get an array of backend addresses.
+     *
+     * @return the loadBalancerBackendAddresses value
+     */
+    public List<LoadBalancerBackendAddress> loadBalancerBackendAddresses() {
+        return this.loadBalancerBackendAddresses;
+    }
+
+    /**
+     * Set an array of backend addresses.
+     *
+     * @param loadBalancerBackendAddresses the loadBalancerBackendAddresses value to set
+     * @return the BackendAddressPoolInner object itself.
+     */
+    public BackendAddressPoolInner withLoadBalancerBackendAddresses(List<LoadBalancerBackendAddress> loadBalancerBackendAddresses) {
+        this.loadBalancerBackendAddresses = loadBalancerBackendAddresses;
+        return this;
+    }
+
+    /**
+     * Get an array of references to load balancing rules that use this backend address pool.
+     *
+     * @return the loadBalancingRules value
+     */
+    public List<SubResource> loadBalancingRules() {
+        return this.loadBalancingRules;
+    }
+
+    /**
+     * Get a reference to an outbound rule that uses this backend address pool.
+     *
+     * @return the outboundRule value
+     */
+    public SubResource outboundRule() {
+        return this.outboundRule;
+    }
+
+    /**
+     * Get an array of references to outbound rules that use this backend address pool.
+     *
+     * @return the outboundRules value
+     */
+    public List<SubResource> outboundRules() {
+        return this.outboundRules;
+    }
+
+    /**
+     * Get the provisioning state of the backend address pool resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of backend address pools used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of backend address pools used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the BackendAddressPoolInner object itself.
+     */
+    public BackendAddressPoolInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionActiveSessionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionActiveSessionInner.java
new file mode 100644
index 000000000000..e8d161423c7f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionActiveSessionInner.java
@@ -0,0 +1,184 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.BastionConnectProtocol;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The session detail for a target.
+ */
+public class BastionActiveSessionInner {
+    /**
+     * A unique id for the session.
+     */
+    @JsonProperty(value = "sessionId", access = JsonProperty.Access.WRITE_ONLY)
+    private String sessionId;
+
+    /**
+     * The time when the session started.
+     */
+    @JsonProperty(value = "startTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Object startTime;
+
+    /**
+     * The subscription id for the target virtual machine.
+     */
+    @JsonProperty(value = "targetSubscriptionId", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetSubscriptionId;
+
+    /**
+     * The type of the resource.
+     */
+    @JsonProperty(value = "resourceType", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceType;
+
+    /**
+     * The host name of the target.
+     */
+    @JsonProperty(value = "targetHostName", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetHostName;
+
+    /**
+     * The resource group of the target.
+     */
+    @JsonProperty(value = "targetResourceGroup", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetResourceGroup;
+
+    /**
+     * The user name who is active on this session.
+     */
+    @JsonProperty(value = "userName", access = JsonProperty.Access.WRITE_ONLY)
+    private String userName;
+
+    /**
+     * The IP Address of the target.
+     */
+    @JsonProperty(value = "targetIpAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetIpAddress;
+
+    /**
+     * The protocol used to connect to the target. Possible values include:
+     * 'SSH', 'RDP'.
+     */
+    @JsonProperty(value = "protocol", access = JsonProperty.Access.WRITE_ONLY)
+    private BastionConnectProtocol protocol;
+
+    /**
+     * The resource id of the target.
+     */
+    @JsonProperty(value = "targetResourceId", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetResourceId;
+
+    /**
+     * Duration in mins the session has been active.
+     */
+    @JsonProperty(value = "sessionDurationInMins", access = JsonProperty.Access.WRITE_ONLY)
+    private Double sessionDurationInMins;
+
+    /**
+     * Get a unique id for the session.
+     *
+     * @return the sessionId value
+     */
+    public String sessionId() {
+        return this.sessionId;
+    }
+
+    /**
+     * Get the time when the session started.
+     *
+     * @return the startTime value
+     */
+    public Object startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Get the subscription id for the target virtual machine.
+     *
+     * @return the targetSubscriptionId value
+     */
+    public String targetSubscriptionId() {
+        return this.targetSubscriptionId;
+    }
+
+    /**
+     * Get the type of the resource.
+     *
+     * @return the resourceType value
+     */
+    public String resourceType() {
+        return this.resourceType;
+    }
+
+    /**
+     * Get the host name of the target.
+     *
+     * @return the targetHostName value
+     */
+    public String targetHostName() {
+        return this.targetHostName;
+    }
+
+    /**
+     * Get the resource group of the target.
+     *
+     * @return the targetResourceGroup value
+     */
+    public String targetResourceGroup() {
+        return this.targetResourceGroup;
+    }
+
+    /**
+     * Get the user name who is active on this session.
+     *
+     * @return the userName value
+     */
+    public String userName() {
+        return this.userName;
+    }
+
+    /**
+     * Get the IP Address of the target.
+     *
+     * @return the targetIpAddress value
+     */
+    public String targetIpAddress() {
+        return this.targetIpAddress;
+    }
+
+    /**
+     * Get the protocol used to connect to the target. Possible values include: 'SSH', 'RDP'.
+     *
+     * @return the protocol value
+     */
+    public BastionConnectProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Get the resource id of the target.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Get duration in mins the session has been active.
+     *
+     * @return the sessionDurationInMins value
+     */
+    public Double sessionDurationInMins() {
+        return this.sessionDurationInMins;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostImpl.java
new file mode 100644
index 000000000000..845b8c86f3b5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHost;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHostIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class BastionHostImpl extends GroupableResourceCoreImpl<BastionHost, BastionHostInner, BastionHostImpl, NetworkManager> implements BastionHost, BastionHost.Definition, BastionHost.Update {
+    BastionHostImpl(String name, BastionHostInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<BastionHost> createResourceAsync() {
+        BastionHostsInner client = this.manager().inner().bastionHosts();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<BastionHost> updateResourceAsync() {
+        BastionHostsInner client = this.manager().inner().bastionHosts();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<BastionHostInner> getInnerAsync() {
+        BastionHostsInner client = this.manager().inner().bastionHosts();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String dnsName() {
+        return this.inner().dnsName();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<BastionHostIPConfiguration> ipConfigurations() {
+        return this.inner().ipConfigurations();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public BastionHostImpl withDnsName(String dnsName) {
+        this.inner().withDnsName(dnsName);
+        return this;
+    }
+
+    @Override
+    public BastionHostImpl withIpConfigurations(List<BastionHostIPConfiguration> ipConfigurations) {
+        this.inner().withIpConfigurations(ipConfigurations);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostInner.java
new file mode 100644
index 000000000000..72662943a672
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostInner.java
@@ -0,0 +1,134 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHostIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Bastion Host resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class BastionHostInner extends Resource {
+    /**
+     * IP configuration of the Bastion Host resource.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<BastionHostIPConfiguration> ipConfigurations;
+
+    /**
+     * FQDN for the endpoint on which bastion host is accessible.
+     */
+    @JsonProperty(value = "properties.dnsName")
+    private String dnsName;
+
+    /**
+     * The provisioning state of the bastion host resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get iP configuration of the Bastion Host resource.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<BastionHostIPConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set iP configuration of the Bastion Host resource.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the BastionHostInner object itself.
+     */
+    public BastionHostInner withIpConfigurations(List<BastionHostIPConfiguration> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get fQDN for the endpoint on which bastion host is accessible.
+     *
+     * @return the dnsName value
+     */
+    public String dnsName() {
+        return this.dnsName;
+    }
+
+    /**
+     * Set fQDN for the endpoint on which bastion host is accessible.
+     *
+     * @param dnsName the dnsName value to set
+     * @return the BastionHostInner object itself.
+     */
+    public BastionHostInner withDnsName(String dnsName) {
+        this.dnsName = dnsName;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the bastion host resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the BastionHostInner object itself.
+     */
+    public BastionHostInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsImpl.java
new file mode 100644
index 000000000000..62715f8c03ba
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHosts;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHost;
+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;
+
+class BastionHostsImpl extends GroupableResourcesCoreImpl<BastionHost, BastionHostImpl, BastionHostInner, BastionHostsInner, NetworkManager>  implements BastionHosts {
+    protected BastionHostsImpl(NetworkManager manager) {
+        super(manager.inner().bastionHosts(), manager);
+    }
+
+    @Override
+    protected Observable<BastionHostInner> getInnerAsync(String resourceGroupName, String name) {
+        BastionHostsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        BastionHostsInner 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<BastionHost> listByResourceGroup(String resourceGroupName) {
+        BastionHostsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<BastionHost> listByResourceGroupAsync(String resourceGroupName) {
+        BastionHostsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<BastionHostInner>, Iterable<BastionHostInner>>() {
+            @Override
+            public Iterable<BastionHostInner> call(Page<BastionHostInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<BastionHostInner, BastionHost>() {
+            @Override
+            public BastionHost call(BastionHostInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<BastionHost> list() {
+        BastionHostsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<BastionHost> listAsync() {
+        BastionHostsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<BastionHostInner>, Iterable<BastionHostInner>>() {
+            @Override
+            public Iterable<BastionHostInner> call(Page<BastionHostInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<BastionHostInner, BastionHost>() {
+            @Override
+            public BastionHost call(BastionHostInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public BastionHostImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected BastionHostImpl wrapModel(BastionHostInner inner) {
+        return  new BastionHostImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected BastionHostImpl wrapModel(String name) {
+        return new BastionHostImpl(name, new BastionHostInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsInner.java
new file mode 100644
index 000000000000..97753c47dfd1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionHostsInner.java
@@ -0,0 +1,948 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+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 BastionHosts.
+ */
+public class BastionHostsInner implements InnerSupportsGet<BastionHostInner>, InnerSupportsDelete<Void>, InnerSupportsListing<BastionHostInner> {
+    /** The Retrofit service to perform REST calls. */
+    private BastionHostsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of BastionHostsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public BastionHostsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(BastionHostsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for BastionHosts to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface BastionHostsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.BastionHosts delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @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.network.v2020_04_01.BastionHosts beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @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.network.v2020_04_01.BastionHosts getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @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.network.v2020_04_01.BastionHosts createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Body BastionHostInner 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.network.v2020_04_01.BastionHosts beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Body BastionHostInner 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.network.v2020_04_01.BastionHosts list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/bastionHosts")
+        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.network.v2020_04_01.BastionHosts listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts")
+        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.network.v2020_04_01.BastionHosts 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.network.v2020_04_01.BastionHosts listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 bastionHostName) {
+        deleteWithServiceResponseAsync(resourceGroupName, bastionHostName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 bastionHostName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, bastionHostName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String bastionHostName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, bastionHostName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, bastionHostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 bastionHostName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, bastionHostName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 bastionHostName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, bastionHostName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String bastionHostName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, bastionHostName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, bastionHostName, this.client.subscriptionId(), 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 specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 BastionHostInner object if successful.
+     */
+    public BastionHostInner getByResourceGroup(String resourceGroupName, String bastionHostName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, bastionHostName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionHostInner> getByResourceGroupAsync(String resourceGroupName, String bastionHostName, final ServiceCallback<BastionHostInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, bastionHostName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BastionHostInner object
+     */
+    public Observable<BastionHostInner> getByResourceGroupAsync(String resourceGroupName, String bastionHostName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, bastionHostName).map(new Func1<ServiceResponse<BastionHostInner>, BastionHostInner>() {
+            @Override
+            public BastionHostInner call(ServiceResponse<BastionHostInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BastionHostInner object
+     */
+    public Observable<ServiceResponse<BastionHostInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, bastionHostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BastionHostInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BastionHostInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BastionHostInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<BastionHostInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<BastionHostInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<BastionHostInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host 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 BastionHostInner object if successful.
+     */
+    public BastionHostInner createOrUpdate(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @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<BastionHostInner> createOrUpdateAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters, final ServiceCallback<BastionHostInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<BastionHostInner> createOrUpdateAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters).map(new Func1<ServiceResponse<BastionHostInner>, BastionHostInner>() {
+            @Override
+            public BastionHostInner call(ServiceResponse<BastionHostInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<BastionHostInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, bastionHostName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<BastionHostInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host 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 BastionHostInner object if successful.
+     */
+    public BastionHostInner beginCreateOrUpdate(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @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<BastionHostInner> beginCreateOrUpdateAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters, final ServiceCallback<BastionHostInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BastionHostInner object
+     */
+    public Observable<BastionHostInner> beginCreateOrUpdateAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, bastionHostName, parameters).map(new Func1<ServiceResponse<BastionHostInner>, BastionHostInner>() {
+            @Override
+            public BastionHostInner call(ServiceResponse<BastionHostInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Bastion Host.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param parameters Parameters supplied to the create or update Bastion Host operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BastionHostInner object
+     */
+    public Observable<ServiceResponse<BastionHostInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String bastionHostName, BastionHostInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, bastionHostName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BastionHostInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BastionHostInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BastionHostInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<BastionHostInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<BastionHostInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<BastionHostInner>() { }.getType())
+                .register(201, new TypeToken<BastionHostInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a 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;BastionHostInner&gt; object if successful.
+     */
+    public PagedList<BastionHostInner> list() {
+        ServiceResponse<Page<BastionHostInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<BastionHostInner>(response.body()) {
+            @Override
+            public Page<BastionHostInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Bastion Hosts in a 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<BastionHostInner>> listAsync(final ListOperationCallback<BastionHostInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionHostInner&gt; object
+     */
+    public Observable<Page<BastionHostInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<BastionHostInner>>, Page<BastionHostInner>>() {
+                @Override
+                public Page<BastionHostInner> call(ServiceResponse<Page<BastionHostInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionHostInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<BastionHostInner>>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(ServiceResponse<Page<BastionHostInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionHostInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionHostInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionHostInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionHostInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BastionHostInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionHostInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;BastionHostInner&gt; object if successful.
+     */
+    public PagedList<BastionHostInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<BastionHostInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<BastionHostInner>(response.body()) {
+            @Override
+            public Page<BastionHostInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<BastionHostInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<BastionHostInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionHostInner&gt; object
+     */
+    public Observable<Page<BastionHostInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<BastionHostInner>>, Page<BastionHostInner>>() {
+                @Override
+                public Page<BastionHostInner> call(ServiceResponse<Page<BastionHostInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionHostInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionHostInner>>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(ServiceResponse<Page<BastionHostInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+    ServiceResponse<PageImpl<BastionHostInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionHostInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionHostInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionHostInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionHostInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BastionHostInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionHostInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @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;BastionHostInner&gt; object if successful.
+     */
+    public PagedList<BastionHostInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionHostInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionHostInner>(response.body()) {
+            @Override
+            public Page<BastionHostInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @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<BastionHostInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<BastionHostInner>> serviceFuture, final ListOperationCallback<BastionHostInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @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;BastionHostInner&gt; object
+     */
+    public Observable<Page<BastionHostInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionHostInner>>, Page<BastionHostInner>>() {
+                @Override
+                public Page<BastionHostInner> call(ServiceResponse<Page<BastionHostInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+     * @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;BastionHostInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionHostInner>>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(ServiceResponse<Page<BastionHostInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a subscription.
+     *
+    ServiceResponse<PageImpl<BastionHostInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionHostInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> 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<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionHostInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionHostInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionHostInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BastionHostInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionHostInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Bastion Hosts in 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;BastionHostInner&gt; object if successful.
+     */
+    public PagedList<BastionHostInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionHostInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionHostInner>(response.body()) {
+            @Override
+            public Page<BastionHostInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Bastion Hosts in 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<BastionHostInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<BastionHostInner>> serviceFuture, final ListOperationCallback<BastionHostInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Bastion Hosts in 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;BastionHostInner&gt; object
+     */
+    public Observable<Page<BastionHostInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionHostInner>>, Page<BastionHostInner>>() {
+                @Override
+                public Page<BastionHostInner> call(ServiceResponse<Page<BastionHostInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in 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;BastionHostInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionHostInner>>, Observable<ServiceResponse<Page<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(ServiceResponse<Page<BastionHostInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Bastion Hosts in a resource group.
+     *
+    ServiceResponse<PageImpl<BastionHostInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionHostInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionHostInner>>> 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<BastionHostInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionHostInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionHostInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionHostInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionHostInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BastionHostInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionHostInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionSessionStateInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionSessionStateInner.java
new file mode 100644
index 000000000000..78d43d941fa6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionSessionStateInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The session state detail for a target.
+ */
+public class BastionSessionStateInner {
+    /**
+     * A unique id for the session.
+     */
+    @JsonProperty(value = "sessionId", access = JsonProperty.Access.WRITE_ONLY)
+    private String sessionId;
+
+    /**
+     * Used for extra information.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * The state of the session. Disconnected/Failed/NotFound.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private String state;
+
+    /**
+     * Get a unique id for the session.
+     *
+     * @return the sessionId value
+     */
+    public String sessionId() {
+        return this.sessionId;
+    }
+
+    /**
+     * Get used for extra information.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get the state of the session. Disconnected/Failed/NotFound.
+     *
+     * @return the state value
+     */
+    public String state() {
+        return this.state;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionShareableLinkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionShareableLinkInner.java
new file mode 100644
index 000000000000..bbaf027046a1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BastionShareableLinkInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VM;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Bastion Shareable Link.
+ */
+public class BastionShareableLinkInner {
+    /**
+     * Reference of the virtual machine resource.
+     */
+    @JsonProperty(value = "vm", required = true)
+    private VM vm;
+
+    /**
+     * The unique Bastion Shareable Link to the virtual machine.
+     */
+    @JsonProperty(value = "bsl", access = JsonProperty.Access.WRITE_ONLY)
+    private String bsl;
+
+    /**
+     * The time when the link was created.
+     */
+    @JsonProperty(value = "createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private String createdAt;
+
+    /**
+     * Optional field indicating the warning or error message related to the vm
+     * in case of partial failure.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Get reference of the virtual machine resource.
+     *
+     * @return the vm value
+     */
+    public VM vm() {
+        return this.vm;
+    }
+
+    /**
+     * Set reference of the virtual machine resource.
+     *
+     * @param vm the vm value to set
+     * @return the BastionShareableLinkInner object itself.
+     */
+    public BastionShareableLinkInner withVm(VM vm) {
+        this.vm = vm;
+        return this;
+    }
+
+    /**
+     * Get the unique Bastion Shareable Link to the virtual machine.
+     *
+     * @return the bsl value
+     */
+    public String bsl() {
+        return this.bsl;
+    }
+
+    /**
+     * Get the time when the link was created.
+     *
+     * @return the createdAt value
+     */
+    public String createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get optional field indicating the warning or error message related to the vm in case of partial failure.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultImpl.java
new file mode 100644
index 000000000000..36b9e8b63b1f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.BgpPeerStatusListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BgpPeerStatus;
+
+class BgpPeerStatusListResultImpl extends WrapperImpl<BgpPeerStatusListResultInner> implements BgpPeerStatusListResult {
+    private final NetworkManager manager;
+    BgpPeerStatusListResultImpl(BgpPeerStatusListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<BgpPeerStatus> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultInner.java
new file mode 100644
index 000000000000..cbc484bfcf1c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpPeerStatusListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BgpPeerStatus;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for list BGP peer status API service call.
+ */
+public class BgpPeerStatusListResultInner {
+    /**
+     * List of BGP peers.
+     */
+    @JsonProperty(value = "value")
+    private List<BgpPeerStatus> value;
+
+    /**
+     * Get list of BGP peers.
+     *
+     * @return the value value
+     */
+    public List<BgpPeerStatus> value() {
+        return this.value;
+    }
+
+    /**
+     * Set list of BGP peers.
+     *
+     * @param value the value value to set
+     * @return the BgpPeerStatusListResultInner object itself.
+     */
+    public BgpPeerStatusListResultInner withValue(List<BgpPeerStatus> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesImpl.java
new file mode 100644
index 000000000000..c01e18c6124a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesImpl.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.BgpServiceCommunities;
+import com.microsoft.azure.management.network.v2020_04_01.BgpServiceCommunity;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+
+class BgpServiceCommunitiesImpl extends GroupableResourcesCoreImpl<BgpServiceCommunity, BgpServiceCommunityImpl, BgpServiceCommunityInner, BgpServiceCommunitiesInner, NetworkManager>  implements BgpServiceCommunities {
+    protected BgpServiceCommunitiesImpl(NetworkManager manager) {
+        super(manager.inner().bgpServiceCommunities(), manager);
+    }
+
+    @Override
+    protected Observable<BgpServiceCommunityInner> getInnerAsync(String resourceGroupName, String name) {
+        return null; // NOP Retrieve by resource group not supported
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        BgpServiceCommunitiesInner 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<BgpServiceCommunity> list() {
+        BgpServiceCommunitiesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<BgpServiceCommunity> listAsync() {
+        BgpServiceCommunitiesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<BgpServiceCommunityInner>, Iterable<BgpServiceCommunityInner>>() {
+            @Override
+            public Iterable<BgpServiceCommunityInner> call(Page<BgpServiceCommunityInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<BgpServiceCommunityInner, BgpServiceCommunity>() {
+            @Override
+            public BgpServiceCommunity call(BgpServiceCommunityInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    protected BgpServiceCommunityImpl wrapModel(BgpServiceCommunityInner inner) {
+        return  new BgpServiceCommunityImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected BgpServiceCommunityImpl wrapModel(String name) {
+        return null; // Model is not creatable
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesInner.java
new file mode 100644
index 000000000000..81656f5bd5ba
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunitiesInner.java
@@ -0,0 +1,285 @@
+/**
+ * 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.network.v2020_04_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.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 BgpServiceCommunities.
+ */
+public class BgpServiceCommunitiesInner {
+    /** The Retrofit service to perform REST calls. */
+    private BgpServiceCommunitiesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of BgpServiceCommunitiesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public BgpServiceCommunitiesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(BgpServiceCommunitiesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for BgpServiceCommunities to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface BgpServiceCommunitiesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.BgpServiceCommunities list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/bgpServiceCommunities")
+        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.network.v2020_04_01.BgpServiceCommunities listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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;BgpServiceCommunityInner&gt; object if successful.
+     */
+    public PagedList<BgpServiceCommunityInner> list() {
+        ServiceResponse<Page<BgpServiceCommunityInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<BgpServiceCommunityInner>(response.body()) {
+            @Override
+            public Page<BgpServiceCommunityInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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<BgpServiceCommunityInner>> listAsync(final ListOperationCallback<BgpServiceCommunityInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BgpServiceCommunityInner&gt; object
+     */
+    public Observable<Page<BgpServiceCommunityInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<BgpServiceCommunityInner>>, Page<BgpServiceCommunityInner>>() {
+                @Override
+                public Page<BgpServiceCommunityInner> call(ServiceResponse<Page<BgpServiceCommunityInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BgpServiceCommunityInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<BgpServiceCommunityInner>>, Observable<ServiceResponse<Page<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(ServiceResponse<Page<BgpServiceCommunityInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BgpServiceCommunityInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BgpServiceCommunityInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BgpServiceCommunityInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BgpServiceCommunityInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BgpServiceCommunityInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BgpServiceCommunityInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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;BgpServiceCommunityInner&gt; object if successful.
+     */
+    public PagedList<BgpServiceCommunityInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<BgpServiceCommunityInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BgpServiceCommunityInner>(response.body()) {
+            @Override
+            public Page<BgpServiceCommunityInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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<BgpServiceCommunityInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<BgpServiceCommunityInner>> serviceFuture, final ListOperationCallback<BgpServiceCommunityInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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;BgpServiceCommunityInner&gt; object
+     */
+    public Observable<Page<BgpServiceCommunityInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BgpServiceCommunityInner>>, Page<BgpServiceCommunityInner>>() {
+                @Override
+                public Page<BgpServiceCommunityInner> call(ServiceResponse<Page<BgpServiceCommunityInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+     * @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;BgpServiceCommunityInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BgpServiceCommunityInner>>, Observable<ServiceResponse<Page<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(ServiceResponse<Page<BgpServiceCommunityInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the available bgp service communities.
+     *
+    ServiceResponse<PageImpl<BgpServiceCommunityInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BgpServiceCommunityInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> 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<BgpServiceCommunityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BgpServiceCommunityInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BgpServiceCommunityInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BgpServiceCommunityInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BgpServiceCommunityInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BgpServiceCommunityInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BgpServiceCommunityInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityImpl.java
new file mode 100644
index 000000000000..da91cf98a810
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityImpl.java
@@ -0,0 +1,52 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.BgpServiceCommunity;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BGPCommunity;
+
+class BgpServiceCommunityImpl extends GroupableResourceCoreImpl<BgpServiceCommunity, BgpServiceCommunityInner, BgpServiceCommunityImpl, NetworkManager> implements BgpServiceCommunity {
+    BgpServiceCommunityImpl(String name, BgpServiceCommunityInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<BgpServiceCommunity> createResourceAsync() {
+        BgpServiceCommunitiesInner client = this.manager().inner().bgpServiceCommunities();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<BgpServiceCommunity> updateResourceAsync() {
+        BgpServiceCommunitiesInner client = this.manager().inner().bgpServiceCommunities();
+        return null; // NOP updateResourceAsync implementation as update is not supported
+    }
+
+    @Override
+    protected Observable<BgpServiceCommunityInner> getInnerAsync() {
+        BgpServiceCommunitiesInner client = this.manager().inner().bgpServiceCommunities();
+        return null; // NOP getInnerAsync implementation as get is not supported
+    }
+
+
+
+    @Override
+    public List<BGPCommunity> bgpCommunities() {
+        return this.inner().bgpCommunities();
+    }
+
+    @Override
+    public String serviceName() {
+        return this.inner().serviceName();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityInner.java
new file mode 100644
index 000000000000..b1c148920aad
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/BgpServiceCommunityInner.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BGPCommunity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Service Community Properties.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class BgpServiceCommunityInner extends Resource {
+    /**
+     * The name of the bgp community. e.g. Skype.
+     */
+    @JsonProperty(value = "properties.serviceName")
+    private String serviceName;
+
+    /**
+     * A list of bgp communities.
+     */
+    @JsonProperty(value = "properties.bgpCommunities")
+    private List<BGPCommunity> bgpCommunities;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the name of the bgp community. e.g. Skype.
+     *
+     * @return the serviceName value
+     */
+    public String serviceName() {
+        return this.serviceName;
+    }
+
+    /**
+     * Set the name of the bgp community. e.g. Skype.
+     *
+     * @param serviceName the serviceName value to set
+     * @return the BgpServiceCommunityInner object itself.
+     */
+    public BgpServiceCommunityInner withServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        return this;
+    }
+
+    /**
+     * Get a list of bgp communities.
+     *
+     * @return the bgpCommunities value
+     */
+    public List<BGPCommunity> bgpCommunities() {
+        return this.bgpCommunities;
+    }
+
+    /**
+     * Set a list of bgp communities.
+     *
+     * @param bgpCommunities the bgpCommunities value to set
+     * @return the BgpServiceCommunityInner object itself.
+     */
+    public BgpServiceCommunityInner withBgpCommunities(List<BGPCommunity> bgpCommunities) {
+        this.bgpCommunities = bgpCommunities;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the BgpServiceCommunityInner object itself.
+     */
+    public BgpServiceCommunityInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorInner.java
new file mode 100644
index 000000000000..ae0f47817acb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorInner.java
@@ -0,0 +1,314 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorSource;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorDestination;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestGroup;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorOutput;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters that define the operation to create a connection monitor.
+ */
+@JsonFlatten
+public class ConnectionMonitorInner {
+    /**
+     * Connection monitor location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Connection monitor tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Describes the source of connection monitor.
+     */
+    @JsonProperty(value = "properties.source")
+    private ConnectionMonitorSource source;
+
+    /**
+     * Describes the destination of connection monitor.
+     */
+    @JsonProperty(value = "properties.destination")
+    private ConnectionMonitorDestination destination;
+
+    /**
+     * Determines if the connection monitor will start automatically once
+     * created.
+     */
+    @JsonProperty(value = "properties.autoStart")
+    private Boolean autoStart;
+
+    /**
+     * Monitoring interval in seconds.
+     */
+    @JsonProperty(value = "properties.monitoringIntervalInSeconds")
+    private Integer monitoringIntervalInSeconds;
+
+    /**
+     * List of connection monitor endpoints.
+     */
+    @JsonProperty(value = "properties.endpoints")
+    private List<ConnectionMonitorEndpoint> endpoints;
+
+    /**
+     * List of connection monitor test configurations.
+     */
+    @JsonProperty(value = "properties.testConfigurations")
+    private List<ConnectionMonitorTestConfiguration> testConfigurations;
+
+    /**
+     * List of connection monitor test groups.
+     */
+    @JsonProperty(value = "properties.testGroups")
+    private List<ConnectionMonitorTestGroup> testGroups;
+
+    /**
+     * List of connection monitor outputs.
+     */
+    @JsonProperty(value = "properties.outputs")
+    private List<ConnectionMonitorOutput> outputs;
+
+    /**
+     * Optional notes to be associated with the connection monitor.
+     */
+    @JsonProperty(value = "properties.notes")
+    private String notes;
+
+    /**
+     * Get connection monitor location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set connection monitor location.
+     *
+     * @param location the location value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get connection monitor tags.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set connection monitor tags.
+     *
+     * @param tags the tags value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get describes the source of connection monitor.
+     *
+     * @return the source value
+     */
+    public ConnectionMonitorSource source() {
+        return this.source;
+    }
+
+    /**
+     * Set describes the source of connection monitor.
+     *
+     * @param source the source value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withSource(ConnectionMonitorSource source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get describes the destination of connection monitor.
+     *
+     * @return the destination value
+     */
+    public ConnectionMonitorDestination destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set describes the destination of connection monitor.
+     *
+     * @param destination the destination value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withDestination(ConnectionMonitorDestination destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get determines if the connection monitor will start automatically once created.
+     *
+     * @return the autoStart value
+     */
+    public Boolean autoStart() {
+        return this.autoStart;
+    }
+
+    /**
+     * Set determines if the connection monitor will start automatically once created.
+     *
+     * @param autoStart the autoStart value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withAutoStart(Boolean autoStart) {
+        this.autoStart = autoStart;
+        return this;
+    }
+
+    /**
+     * Get monitoring interval in seconds.
+     *
+     * @return the monitoringIntervalInSeconds value
+     */
+    public Integer monitoringIntervalInSeconds() {
+        return this.monitoringIntervalInSeconds;
+    }
+
+    /**
+     * Set monitoring interval in seconds.
+     *
+     * @param monitoringIntervalInSeconds the monitoringIntervalInSeconds value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds) {
+        this.monitoringIntervalInSeconds = monitoringIntervalInSeconds;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor endpoints.
+     *
+     * @return the endpoints value
+     */
+    public List<ConnectionMonitorEndpoint> endpoints() {
+        return this.endpoints;
+    }
+
+    /**
+     * Set list of connection monitor endpoints.
+     *
+     * @param endpoints the endpoints value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withEndpoints(List<ConnectionMonitorEndpoint> endpoints) {
+        this.endpoints = endpoints;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test configurations.
+     *
+     * @return the testConfigurations value
+     */
+    public List<ConnectionMonitorTestConfiguration> testConfigurations() {
+        return this.testConfigurations;
+    }
+
+    /**
+     * Set list of connection monitor test configurations.
+     *
+     * @param testConfigurations the testConfigurations value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations) {
+        this.testConfigurations = testConfigurations;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test groups.
+     *
+     * @return the testGroups value
+     */
+    public List<ConnectionMonitorTestGroup> testGroups() {
+        return this.testGroups;
+    }
+
+    /**
+     * Set list of connection monitor test groups.
+     *
+     * @param testGroups the testGroups value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withTestGroups(List<ConnectionMonitorTestGroup> testGroups) {
+        this.testGroups = testGroups;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor outputs.
+     *
+     * @return the outputs value
+     */
+    public List<ConnectionMonitorOutput> outputs() {
+        return this.outputs;
+    }
+
+    /**
+     * Set list of connection monitor outputs.
+     *
+     * @param outputs the outputs value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withOutputs(List<ConnectionMonitorOutput> outputs) {
+        this.outputs = outputs;
+        return this;
+    }
+
+    /**
+     * Get optional notes to be associated with the connection monitor.
+     *
+     * @return the notes value
+     */
+    public String notes() {
+        return this.notes;
+    }
+
+    /**
+     * Set optional notes to be associated with the connection monitor.
+     *
+     * @param notes the notes value to set
+     * @return the ConnectionMonitorInner object itself.
+     */
+    public ConnectionMonitorInner withNotes(String notes) {
+        this.notes = notes;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultImpl.java
new file mode 100644
index 000000000000..0a9d789f5092
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorQueryResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorSourceStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionStateSnapshot;
+
+class ConnectionMonitorQueryResultImpl extends WrapperImpl<ConnectionMonitorQueryResultInner> implements ConnectionMonitorQueryResult {
+    private final NetworkManager manager;
+    ConnectionMonitorQueryResultImpl(ConnectionMonitorQueryResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ConnectionMonitorSourceStatus sourceStatus() {
+        return this.inner().sourceStatus();
+    }
+
+    @Override
+    public List<ConnectionStateSnapshot> states() {
+        return this.inner().states();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultInner.java
new file mode 100644
index 000000000000..436a606805fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorQueryResultInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorSourceStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionStateSnapshot;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of connection states snapshots.
+ */
+public class ConnectionMonitorQueryResultInner {
+    /**
+     * Status of connection monitor source. Possible values include: 'Unknown',
+     * 'Active', 'Inactive'.
+     */
+    @JsonProperty(value = "sourceStatus")
+    private ConnectionMonitorSourceStatus sourceStatus;
+
+    /**
+     * Information about connection states.
+     */
+    @JsonProperty(value = "states")
+    private List<ConnectionStateSnapshot> states;
+
+    /**
+     * Get status of connection monitor source. Possible values include: 'Unknown', 'Active', 'Inactive'.
+     *
+     * @return the sourceStatus value
+     */
+    public ConnectionMonitorSourceStatus sourceStatus() {
+        return this.sourceStatus;
+    }
+
+    /**
+     * Set status of connection monitor source. Possible values include: 'Unknown', 'Active', 'Inactive'.
+     *
+     * @param sourceStatus the sourceStatus value to set
+     * @return the ConnectionMonitorQueryResultInner object itself.
+     */
+    public ConnectionMonitorQueryResultInner withSourceStatus(ConnectionMonitorSourceStatus sourceStatus) {
+        this.sourceStatus = sourceStatus;
+        return this;
+    }
+
+    /**
+     * Get information about connection states.
+     *
+     * @return the states value
+     */
+    public List<ConnectionStateSnapshot> states() {
+        return this.states;
+    }
+
+    /**
+     * Set information about connection states.
+     *
+     * @param states the states value to set
+     * @return the ConnectionMonitorQueryResultInner object itself.
+     */
+    public ConnectionMonitorQueryResultInner withStates(List<ConnectionStateSnapshot> states) {
+        this.states = states;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultImpl.java
new file mode 100644
index 000000000000..23d8258bc8c9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorResult;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorSource;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorDestination;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestGroup;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorOutput;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorType;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import org.joda.time.DateTime;
+import rx.functions.Func1;
+
+class ConnectionMonitorResultImpl extends CreatableUpdatableImpl<ConnectionMonitorResult, ConnectionMonitorResultInner, ConnectionMonitorResultImpl> implements ConnectionMonitorResult, ConnectionMonitorResult.Definition, ConnectionMonitorResult.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkWatcherName;
+    private String connectionMonitorName;
+    private ConnectionMonitorInner createOrUpdateParameter;
+
+    ConnectionMonitorResultImpl(String name, NetworkManager manager) {
+        super(name, new ConnectionMonitorResultInner());
+        this.manager = manager;
+        // Set resource name
+        this.connectionMonitorName = name;
+        //
+        this.createOrUpdateParameter = new ConnectionMonitorInner();
+    }
+
+    ConnectionMonitorResultImpl(ConnectionMonitorResultInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.connectionMonitorName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkWatcherName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkWatchers");
+        this.connectionMonitorName = IdParsingUtils.getValueFromIdByName(inner.id(), "connectionMonitors");
+        //
+        this.createOrUpdateParameter = new ConnectionMonitorInner();
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ConnectionMonitorResult> createResourceAsync() {
+        ConnectionMonitorsInner client = this.manager().inner().connectionMonitors();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkWatcherName, this.connectionMonitorName, this.createOrUpdateParameter)
+            .map(new Func1<ConnectionMonitorResultInner, ConnectionMonitorResultInner>() {
+               @Override
+               public ConnectionMonitorResultInner call(ConnectionMonitorResultInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ConnectionMonitorResult> updateResourceAsync() {
+        ConnectionMonitorsInner client = this.manager().inner().connectionMonitors();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkWatcherName, this.connectionMonitorName, this.createOrUpdateParameter)
+            .map(new Func1<ConnectionMonitorResultInner, ConnectionMonitorResultInner>() {
+               @Override
+               public ConnectionMonitorResultInner call(ConnectionMonitorResultInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ConnectionMonitorResultInner> getInnerAsync() {
+        ConnectionMonitorsInner client = this.manager().inner().connectionMonitors();
+        return client.getAsync(this.resourceGroupName, this.networkWatcherName, this.connectionMonitorName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new ConnectionMonitorInner();
+    }
+
+    @Override
+    public Boolean autoStart() {
+        return this.inner().autoStart();
+    }
+
+    @Override
+    public ConnectionMonitorType connectionMonitorType() {
+        return this.inner().connectionMonitorType();
+    }
+
+    @Override
+    public ConnectionMonitorDestination destination() {
+        return this.inner().destination();
+    }
+
+    @Override
+    public List<ConnectionMonitorEndpoint> endpoints() {
+        return this.inner().endpoints();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public Integer monitoringIntervalInSeconds() {
+        return this.inner().monitoringIntervalInSeconds();
+    }
+
+    @Override
+    public String monitoringStatus() {
+        return this.inner().monitoringStatus();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String notes() {
+        return this.inner().notes();
+    }
+
+    @Override
+    public List<ConnectionMonitorOutput> outputs() {
+        return this.inner().outputs();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public ConnectionMonitorSource source() {
+        return this.inner().source();
+    }
+
+    @Override
+    public DateTime startTime() {
+        return this.inner().startTime();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public List<ConnectionMonitorTestConfiguration> testConfigurations() {
+        return this.inner().testConfigurations();
+    }
+
+    @Override
+    public List<ConnectionMonitorTestGroup> testGroups() {
+        return this.inner().testGroups();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName) {
+        this.resourceGroupName = resourceGroupName;
+        this.networkWatcherName = networkWatcherName;
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withAutoStart(Boolean autoStart) {
+        this.createOrUpdateParameter.withAutoStart(autoStart);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withDestination(ConnectionMonitorDestination destination) {
+        this.createOrUpdateParameter.withDestination(destination);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withEndpoints(List<ConnectionMonitorEndpoint> endpoints) {
+        this.createOrUpdateParameter.withEndpoints(endpoints);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withLocation(String location) {
+        this.createOrUpdateParameter.withLocation(location);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds) {
+        this.createOrUpdateParameter.withMonitoringIntervalInSeconds(monitoringIntervalInSeconds);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withNotes(String notes) {
+        this.createOrUpdateParameter.withNotes(notes);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withOutputs(List<ConnectionMonitorOutput> outputs) {
+        this.createOrUpdateParameter.withOutputs(outputs);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withSource(ConnectionMonitorSource source) {
+        this.createOrUpdateParameter.withSource(source);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withTags(Map<String, String> tags) {
+        this.createOrUpdateParameter.withTags(tags);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations) {
+        this.createOrUpdateParameter.withTestConfigurations(testConfigurations);
+        return this;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl withTestGroups(List<ConnectionMonitorTestGroup> testGroups) {
+        this.createOrUpdateParameter.withTestGroups(testGroups);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultInner.java
new file mode 100644
index 000000000000..9edd937fa626
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorResultInner.java
@@ -0,0 +1,342 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorSource;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorDestination;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorTestGroup;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorOutput;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorType;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * Information about the connection monitor.
+ */
+@JsonFlatten
+public class ConnectionMonitorResultInner extends Resource {
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Describes the source of connection monitor.
+     */
+    @JsonProperty(value = "properties.source")
+    private ConnectionMonitorSource source;
+
+    /**
+     * Describes the destination of connection monitor.
+     */
+    @JsonProperty(value = "properties.destination")
+    private ConnectionMonitorDestination destination;
+
+    /**
+     * Determines if the connection monitor will start automatically once
+     * created.
+     */
+    @JsonProperty(value = "properties.autoStart")
+    private Boolean autoStart;
+
+    /**
+     * Monitoring interval in seconds.
+     */
+    @JsonProperty(value = "properties.monitoringIntervalInSeconds")
+    private Integer monitoringIntervalInSeconds;
+
+    /**
+     * List of connection monitor endpoints.
+     */
+    @JsonProperty(value = "properties.endpoints")
+    private List<ConnectionMonitorEndpoint> endpoints;
+
+    /**
+     * List of connection monitor test configurations.
+     */
+    @JsonProperty(value = "properties.testConfigurations")
+    private List<ConnectionMonitorTestConfiguration> testConfigurations;
+
+    /**
+     * List of connection monitor test groups.
+     */
+    @JsonProperty(value = "properties.testGroups")
+    private List<ConnectionMonitorTestGroup> testGroups;
+
+    /**
+     * List of connection monitor outputs.
+     */
+    @JsonProperty(value = "properties.outputs")
+    private List<ConnectionMonitorOutput> outputs;
+
+    /**
+     * Optional notes to be associated with the connection monitor.
+     */
+    @JsonProperty(value = "properties.notes")
+    private String notes;
+
+    /**
+     * The provisioning state of the connection monitor. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The date and time when the connection monitor was started.
+     */
+    @JsonProperty(value = "properties.startTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startTime;
+
+    /**
+     * The monitoring status of the connection monitor.
+     */
+    @JsonProperty(value = "properties.monitoringStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private String monitoringStatus;
+
+    /**
+     * Type of connection monitor. Possible values include: 'MultiEndpoint',
+     * 'SingleSourceDestination'.
+     */
+    @JsonProperty(value = "properties.connectionMonitorType", access = JsonProperty.Access.WRITE_ONLY)
+    private ConnectionMonitorType connectionMonitorType;
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get describes the source of connection monitor.
+     *
+     * @return the source value
+     */
+    public ConnectionMonitorSource source() {
+        return this.source;
+    }
+
+    /**
+     * Set describes the source of connection monitor.
+     *
+     * @param source the source value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withSource(ConnectionMonitorSource source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get describes the destination of connection monitor.
+     *
+     * @return the destination value
+     */
+    public ConnectionMonitorDestination destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set describes the destination of connection monitor.
+     *
+     * @param destination the destination value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withDestination(ConnectionMonitorDestination destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get determines if the connection monitor will start automatically once created.
+     *
+     * @return the autoStart value
+     */
+    public Boolean autoStart() {
+        return this.autoStart;
+    }
+
+    /**
+     * Set determines if the connection monitor will start automatically once created.
+     *
+     * @param autoStart the autoStart value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withAutoStart(Boolean autoStart) {
+        this.autoStart = autoStart;
+        return this;
+    }
+
+    /**
+     * Get monitoring interval in seconds.
+     *
+     * @return the monitoringIntervalInSeconds value
+     */
+    public Integer monitoringIntervalInSeconds() {
+        return this.monitoringIntervalInSeconds;
+    }
+
+    /**
+     * Set monitoring interval in seconds.
+     *
+     * @param monitoringIntervalInSeconds the monitoringIntervalInSeconds value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds) {
+        this.monitoringIntervalInSeconds = monitoringIntervalInSeconds;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor endpoints.
+     *
+     * @return the endpoints value
+     */
+    public List<ConnectionMonitorEndpoint> endpoints() {
+        return this.endpoints;
+    }
+
+    /**
+     * Set list of connection monitor endpoints.
+     *
+     * @param endpoints the endpoints value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withEndpoints(List<ConnectionMonitorEndpoint> endpoints) {
+        this.endpoints = endpoints;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test configurations.
+     *
+     * @return the testConfigurations value
+     */
+    public List<ConnectionMonitorTestConfiguration> testConfigurations() {
+        return this.testConfigurations;
+    }
+
+    /**
+     * Set list of connection monitor test configurations.
+     *
+     * @param testConfigurations the testConfigurations value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withTestConfigurations(List<ConnectionMonitorTestConfiguration> testConfigurations) {
+        this.testConfigurations = testConfigurations;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor test groups.
+     *
+     * @return the testGroups value
+     */
+    public List<ConnectionMonitorTestGroup> testGroups() {
+        return this.testGroups;
+    }
+
+    /**
+     * Set list of connection monitor test groups.
+     *
+     * @param testGroups the testGroups value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withTestGroups(List<ConnectionMonitorTestGroup> testGroups) {
+        this.testGroups = testGroups;
+        return this;
+    }
+
+    /**
+     * Get list of connection monitor outputs.
+     *
+     * @return the outputs value
+     */
+    public List<ConnectionMonitorOutput> outputs() {
+        return this.outputs;
+    }
+
+    /**
+     * Set list of connection monitor outputs.
+     *
+     * @param outputs the outputs value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withOutputs(List<ConnectionMonitorOutput> outputs) {
+        this.outputs = outputs;
+        return this;
+    }
+
+    /**
+     * Get optional notes to be associated with the connection monitor.
+     *
+     * @return the notes value
+     */
+    public String notes() {
+        return this.notes;
+    }
+
+    /**
+     * Set optional notes to be associated with the connection monitor.
+     *
+     * @param notes the notes value to set
+     * @return the ConnectionMonitorResultInner object itself.
+     */
+    public ConnectionMonitorResultInner withNotes(String notes) {
+        this.notes = notes;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the connection monitor. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the date and time when the connection monitor was started.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Get the monitoring status of the connection monitor.
+     *
+     * @return the monitoringStatus value
+     */
+    public String monitoringStatus() {
+        return this.monitoringStatus;
+    }
+
+    /**
+     * Get type of connection monitor. Possible values include: 'MultiEndpoint', 'SingleSourceDestination'.
+     *
+     * @return the connectionMonitorType value
+     */
+    public ConnectionMonitorType connectionMonitorType() {
+        return this.connectionMonitorType;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsImpl.java
new file mode 100644
index 000000000000..5d09f54f0144
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsImpl.java
@@ -0,0 +1,110 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitors;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorQueryResult;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitorResult;
+
+class ConnectionMonitorsImpl extends WrapperImpl<ConnectionMonitorsInner> implements ConnectionMonitors {
+    private final NetworkManager manager;
+
+    ConnectionMonitorsImpl(NetworkManager manager) {
+        super(manager.inner().connectionMonitors());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ConnectionMonitorResultImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ConnectionMonitorResultImpl wrapModel(ConnectionMonitorResultInner inner) {
+        return  new ConnectionMonitorResultImpl(inner, manager());
+    }
+
+    private ConnectionMonitorResultImpl wrapModel(String name) {
+        return new ConnectionMonitorResultImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable stopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.stopAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toCompletable();
+    }
+
+    @Override
+    public Completable startAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.startAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toCompletable();
+    }
+
+    @Override
+    public Observable<ConnectionMonitorQueryResult> queryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.queryAsync(resourceGroupName, networkWatcherName, connectionMonitorName)
+        .map(new Func1<ConnectionMonitorQueryResultInner, ConnectionMonitorQueryResult>() {
+            @Override
+            public ConnectionMonitorQueryResult call(ConnectionMonitorQueryResultInner inner) {
+                return new ConnectionMonitorQueryResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConnectionMonitorResult> listAsync(String resourceGroupName, String networkWatcherName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkWatcherName)
+        .flatMap(new Func1<List<ConnectionMonitorResultInner>, Observable<ConnectionMonitorResultInner>>() {
+            @Override
+            public Observable<ConnectionMonitorResultInner> call(List<ConnectionMonitorResultInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<ConnectionMonitorResultInner, ConnectionMonitorResult>() {
+            @Override
+            public ConnectionMonitorResult call(ConnectionMonitorResultInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConnectionMonitorResult> getAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkWatcherName, connectionMonitorName)
+        .flatMap(new Func1<ConnectionMonitorResultInner, Observable<ConnectionMonitorResult>>() {
+            @Override
+            public Observable<ConnectionMonitorResult> call(ConnectionMonitorResultInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ConnectionMonitorResult)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        ConnectionMonitorsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsInner.java
new file mode 100644
index 000000000000..203d1f073bf6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionMonitorsInner.java
@@ -0,0 +1,1324 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.network.v2020_04_01.ErrorResponseException;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ConnectionMonitors.
+ */
+public class ConnectionMonitorsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ConnectionMonitorsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ConnectionMonitorsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ConnectionMonitorsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ConnectionMonitorsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ConnectionMonitors to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ConnectionMonitorsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitors createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @Path("subscriptionId") String subscriptionId, @Body ConnectionMonitorInner 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.network.v2020_04_01.ConnectionMonitors beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @Path("subscriptionId") String subscriptionId, @Body ConnectionMonitorInner 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.network.v2020_04_01.ConnectionMonitors get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitors stop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/stop")
+        Observable<Response<ResponseBody>> stop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors beginStop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/stop")
+        Observable<Response<ResponseBody>> beginStop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors start" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/start")
+        Observable<Response<ResponseBody>> start(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors beginStart" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/start")
+        Observable<Response<ResponseBody>> beginStart(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors query" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/query")
+        Observable<Response<ResponseBody>> query(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors beginQuery" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}/query")
+        Observable<Response<ResponseBody>> beginQuery(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("connectionMonitorName") String connectionMonitorName, @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.network.v2020_04_01.ConnectionMonitors list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @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 ConnectionMonitorResultInner object if successful.
+     */
+    public ConnectionMonitorResultInner createOrUpdate(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @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<ConnectionMonitorResultInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters, final ServiceCallback<ConnectionMonitorResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ConnectionMonitorResultInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters).map(new Func1<ServiceResponse<ConnectionMonitorResultInner>, ConnectionMonitorResultInner>() {
+            @Override
+            public ConnectionMonitorResultInner call(ServiceResponse<ConnectionMonitorResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ConnectionMonitorResultInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ConnectionMonitorResultInner>() { }.getType());
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @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 ConnectionMonitorResultInner object if successful.
+     */
+    public ConnectionMonitorResultInner beginCreateOrUpdate(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @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<ConnectionMonitorResultInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters, final ServiceCallback<ConnectionMonitorResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ConnectionMonitorResultInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, parameters).map(new Func1<ServiceResponse<ConnectionMonitorResultInner>, ConnectionMonitorResultInner>() {
+            @Override
+            public ConnectionMonitorResultInner call(ServiceResponse<ConnectionMonitorResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update a connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param parameters Parameters that define the operation to create a connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ServiceResponse<ConnectionMonitorResultInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, ConnectionMonitorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionMonitorResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionMonitorResultInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionMonitorResultInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
+                .register(201, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a connection monitor by name.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 ConnectionMonitorResultInner object if successful.
+     */
+    public ConnectionMonitorResultInner get(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a connection monitor by name.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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<ConnectionMonitorResultInner> getAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<ConnectionMonitorResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Gets a connection monitor by name.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ConnectionMonitorResultInner> getAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<ConnectionMonitorResultInner>, ConnectionMonitorResultInner>() {
+            @Override
+            public ConnectionMonitorResultInner call(ServiceResponse<ConnectionMonitorResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a connection monitor by name.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ServiceResponse<ConnectionMonitorResultInner>> getWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionMonitorResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionMonitorResultInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionMonitorResultInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 networkWatcherName, String connectionMonitorName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 networkWatcherName, String connectionMonitorName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 ConnectionMonitorResultInner object if successful.
+     */
+    public ConnectionMonitorResultInner updateTags(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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<ConnectionMonitorResultInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<ConnectionMonitorResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ConnectionMonitorResultInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<ConnectionMonitorResultInner>, ConnectionMonitorResultInner>() {
+            @Override
+            public ConnectionMonitorResultInner call(ServiceResponse<ConnectionMonitorResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ServiceResponse<ConnectionMonitorResultInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionMonitorResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionMonitorResultInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param tags Resource tags.
+     * @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 ConnectionMonitorResultInner object if successful.
+     */
+    public ConnectionMonitorResultInner updateTags(String resourceGroupName, String networkWatcherName, String connectionMonitorName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param tags Resource tags.
+     * @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<ConnectionMonitorResultInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, Map<String, String> tags, final ServiceCallback<ConnectionMonitorResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, tags), serviceCallback);
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ConnectionMonitorResultInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName, tags).map(new Func1<ServiceResponse<ConnectionMonitorResultInner>, ConnectionMonitorResultInner>() {
+            @Override
+            public ConnectionMonitorResultInner call(ServiceResponse<ConnectionMonitorResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update tags of the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorResultInner object
+     */
+    public Observable<ServiceResponse<ConnectionMonitorResultInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionMonitorResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionMonitorResultInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionMonitorResultInner> updateTagsDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 stop(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().last().body();
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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> stopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> stopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> stopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.stop(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 beginStop(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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> beginStopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginStopAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginStopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginStop(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), 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 = beginStopDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginStopDelegate(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())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 start(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        startWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().last().body();
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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> startAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(startWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> startAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return startWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> startWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.start(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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 beginStart(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        beginStartWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @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> beginStartAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginStartAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return beginStartWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts the specified connection monitor.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name of the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginStartWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginStart(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), 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 = beginStartDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginStartDelegate(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())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @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 ConnectionMonitorQueryResultInner object if successful.
+     */
+    public ConnectionMonitorQueryResultInner query(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return queryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().last().body();
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @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<ConnectionMonitorQueryResultInner> queryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<ConnectionMonitorQueryResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(queryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ConnectionMonitorQueryResultInner> queryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return queryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<ConnectionMonitorQueryResultInner>, ConnectionMonitorQueryResultInner>() {
+            @Override
+            public ConnectionMonitorQueryResultInner call(ServiceResponse<ConnectionMonitorQueryResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ConnectionMonitorQueryResultInner>> queryWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.query(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ConnectionMonitorQueryResultInner>() { }.getType());
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @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 ConnectionMonitorQueryResultInner object if successful.
+     */
+    public ConnectionMonitorQueryResultInner beginQuery(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return beginQueryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).toBlocking().single().body();
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @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<ConnectionMonitorQueryResultInner> beginQueryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName, final ServiceCallback<ConnectionMonitorQueryResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginQueryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName), serviceCallback);
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorQueryResultInner object
+     */
+    public Observable<ConnectionMonitorQueryResultInner> beginQueryAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        return beginQueryWithServiceResponseAsync(resourceGroupName, networkWatcherName, connectionMonitorName).map(new Func1<ServiceResponse<ConnectionMonitorQueryResultInner>, ConnectionMonitorQueryResultInner>() {
+            @Override
+            public ConnectionMonitorQueryResultInner call(ServiceResponse<ConnectionMonitorQueryResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Query a snapshot of the most recent connection states.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param connectionMonitorName The name given to the connection monitor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionMonitorQueryResultInner object
+     */
+    public Observable<ServiceResponse<ConnectionMonitorQueryResultInner>> beginQueryWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (connectionMonitorName == null) {
+            throw new IllegalArgumentException("Parameter connectionMonitorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginQuery(resourceGroupName, networkWatcherName, connectionMonitorName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionMonitorQueryResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionMonitorQueryResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionMonitorQueryResultInner> clientResponse = beginQueryDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionMonitorQueryResultInner> beginQueryDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorQueryResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionMonitorQueryResultInner>() { }.getType())
+                .register(202, new TypeToken<ConnectionMonitorQueryResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all connection monitors for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher 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 List&lt;ConnectionMonitorResultInner&gt; object if successful.
+     */
+    public List<ConnectionMonitorResultInner> list(String resourceGroupName, String networkWatcherName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().single().body();
+    }
+
+    /**
+     * Lists all connection monitors for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher 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<List<ConnectionMonitorResultInner>> listAsync(String resourceGroupName, String networkWatcherName, final ServiceCallback<List<ConnectionMonitorResultInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Lists all connection monitors for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;ConnectionMonitorResultInner&gt; object
+     */
+    public Observable<List<ConnectionMonitorResultInner>> listAsync(String resourceGroupName, String networkWatcherName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<List<ConnectionMonitorResultInner>>, List<ConnectionMonitorResultInner>>() {
+            @Override
+            public List<ConnectionMonitorResultInner> call(ServiceResponse<List<ConnectionMonitorResultInner>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all connection monitors for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;ConnectionMonitorResultInner&gt; object
+     */
+    public Observable<ServiceResponse<List<ConnectionMonitorResultInner>>> listWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<ConnectionMonitorResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<ConnectionMonitorResultInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<ConnectionMonitorResultInner>> result = listDelegate(response);
+                        List<ConnectionMonitorResultInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<ConnectionMonitorResultInner>> clientResponse = new ServiceResponse<List<ConnectionMonitorResultInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<ConnectionMonitorResultInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<ConnectionMonitorResultInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<ConnectionMonitorResultInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyImpl.java
new file mode 100644
index 000000000000..11deb8eaf99f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionResetSharedKey;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class ConnectionResetSharedKeyImpl extends WrapperImpl<ConnectionResetSharedKeyInner> implements ConnectionResetSharedKey {
+    private final NetworkManager manager;
+    ConnectionResetSharedKeyImpl(ConnectionResetSharedKeyInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public int keyLength() {
+        return this.inner().keyLength();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyInner.java
new file mode 100644
index 000000000000..bf59bddf60af
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionResetSharedKeyInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The virtual network connection reset shared key.
+ */
+public class ConnectionResetSharedKeyInner {
+    /**
+     * The virtual network connection reset shared key length, should between 1
+     * and 128.
+     */
+    @JsonProperty(value = "keyLength", required = true)
+    private int keyLength;
+
+    /**
+     * Get the virtual network connection reset shared key length, should between 1 and 128.
+     *
+     * @return the keyLength value
+     */
+    public int keyLength() {
+        return this.keyLength;
+    }
+
+    /**
+     * Set the virtual network connection reset shared key length, should between 1 and 128.
+     *
+     * @param keyLength the keyLength value to set
+     * @return the ConnectionResetSharedKeyInner object itself.
+     */
+    public ConnectionResetSharedKeyInner withKeyLength(int keyLength) {
+        this.keyLength = keyLength;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyImpl.java
new file mode 100644
index 000000000000..db135047b101
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyImpl.java
@@ -0,0 +1,36 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionSharedKey;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class ConnectionSharedKeyImpl extends WrapperImpl<ConnectionSharedKeyInner> implements ConnectionSharedKey {
+    private final NetworkManager manager;
+    ConnectionSharedKeyImpl(ConnectionSharedKeyInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyInner.java
new file mode 100644
index 000000000000..5e50c04c766b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectionSharedKeyInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Response for GetConnectionSharedKey API service call.
+ */
+public class ConnectionSharedKeyInner extends SubResource {
+    /**
+     * The virtual network connection shared key value.
+     */
+    @JsonProperty(value = "value", required = true)
+    private String value;
+
+    /**
+     * Get the virtual network connection shared key value.
+     *
+     * @return the value value
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set the virtual network connection shared key value.
+     *
+     * @param value the value value to set
+     * @return the ConnectionSharedKeyInner object itself.
+     */
+    public ConnectionSharedKeyInner withValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationImpl.java
new file mode 100644
index 000000000000..d6dcd016b38c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationImpl.java
@@ -0,0 +1,64 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityInformation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityHop;
+
+class ConnectivityInformationImpl extends WrapperImpl<ConnectivityInformationInner> implements ConnectivityInformation {
+    private final NetworkManager manager;
+    ConnectivityInformationImpl(ConnectivityInformationInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Integer avgLatencyInMs() {
+        return this.inner().avgLatencyInMs();
+    }
+
+    @Override
+    public ConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public List<ConnectivityHop> hops() {
+        return this.inner().hops();
+    }
+
+    @Override
+    public Integer maxLatencyInMs() {
+        return this.inner().maxLatencyInMs();
+    }
+
+    @Override
+    public Integer minLatencyInMs() {
+        return this.inner().minLatencyInMs();
+    }
+
+    @Override
+    public Integer probesFailed() {
+        return this.inner().probesFailed();
+    }
+
+    @Override
+    public Integer probesSent() {
+        return this.inner().probesSent();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationInner.java
new file mode 100644
index 000000000000..b9566af83039
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ConnectivityInformationInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityHop;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionStatus;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information on the connectivity status.
+ */
+public class ConnectivityInformationInner {
+    /**
+     * List of hops between the source and the destination.
+     */
+    @JsonProperty(value = "hops", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectivityHop> hops;
+
+    /**
+     * The connection status. Possible values include: 'Unknown', 'Connected',
+     * 'Disconnected', 'Degraded'.
+     */
+    @JsonProperty(value = "connectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private ConnectionStatus connectionStatus;
+
+    /**
+     * Average latency in milliseconds.
+     */
+    @JsonProperty(value = "avgLatencyInMs", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer avgLatencyInMs;
+
+    /**
+     * Minimum latency in milliseconds.
+     */
+    @JsonProperty(value = "minLatencyInMs", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer minLatencyInMs;
+
+    /**
+     * Maximum latency in milliseconds.
+     */
+    @JsonProperty(value = "maxLatencyInMs", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer maxLatencyInMs;
+
+    /**
+     * Total number of probes sent.
+     */
+    @JsonProperty(value = "probesSent", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer probesSent;
+
+    /**
+     * Number of failed probes.
+     */
+    @JsonProperty(value = "probesFailed", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer probesFailed;
+
+    /**
+     * Get list of hops between the source and the destination.
+     *
+     * @return the hops value
+     */
+    public List<ConnectivityHop> hops() {
+        return this.hops;
+    }
+
+    /**
+     * Get the connection status. Possible values include: 'Unknown', 'Connected', 'Disconnected', 'Degraded'.
+     *
+     * @return the connectionStatus value
+     */
+    public ConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Get average latency in milliseconds.
+     *
+     * @return the avgLatencyInMs value
+     */
+    public Integer avgLatencyInMs() {
+        return this.avgLatencyInMs;
+    }
+
+    /**
+     * Get minimum latency in milliseconds.
+     *
+     * @return the minLatencyInMs value
+     */
+    public Integer minLatencyInMs() {
+        return this.minLatencyInMs;
+    }
+
+    /**
+     * Get maximum latency in milliseconds.
+     *
+     * @return the maxLatencyInMs value
+     */
+    public Integer maxLatencyInMs() {
+        return this.maxLatencyInMs;
+    }
+
+    /**
+     * Get total number of probes sent.
+     *
+     * @return the probesSent value
+     */
+    public Integer probesSent() {
+        return this.probesSent;
+    }
+
+    /**
+     * Get number of failed probes.
+     *
+     * @return the probesFailed value
+     */
+    public Integer probesFailed() {
+        return this.probesFailed;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesImpl.java
new file mode 100644
index 000000000000..c862e65e47ac
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DdosCustomPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.DdosCustomPolicy;
+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;
+
+class DdosCustomPoliciesImpl extends GroupableResourcesCoreImpl<DdosCustomPolicy, DdosCustomPolicyImpl, DdosCustomPolicyInner, DdosCustomPoliciesInner, NetworkManager>  implements DdosCustomPolicies {
+    protected DdosCustomPoliciesImpl(NetworkManager manager) {
+        super(manager.inner().ddosCustomPolicies(), manager);
+    }
+
+    @Override
+    protected Observable<DdosCustomPolicyInner> getInnerAsync(String resourceGroupName, String name) {
+        DdosCustomPoliciesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        DdosCustomPoliciesInner 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 DdosCustomPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected DdosCustomPolicyImpl wrapModel(DdosCustomPolicyInner inner) {
+        return  new DdosCustomPolicyImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected DdosCustomPolicyImpl wrapModel(String name) {
+        return new DdosCustomPolicyImpl(name, new DdosCustomPolicyInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesInner.java
new file mode 100644
index 000000000000..3b48ba65eb92
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPoliciesInner.java
@@ -0,0 +1,663 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+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 DdosCustomPolicies.
+ */
+public class DdosCustomPoliciesInner implements InnerSupportsGet<DdosCustomPolicyInner>, InnerSupportsDelete<Void> {
+    /** The Retrofit service to perform REST calls. */
+    private DdosCustomPoliciesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DdosCustomPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DdosCustomPoliciesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(DdosCustomPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for DdosCustomPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface DdosCustomPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.DdosCustomPolicies delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @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.network.v2020_04_01.DdosCustomPolicies beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @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.network.v2020_04_01.DdosCustomPolicies getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @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.network.v2020_04_01.DdosCustomPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @Path("subscriptionId") String subscriptionId, @Body DdosCustomPolicyInner 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.network.v2020_04_01.DdosCustomPolicies beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @Path("subscriptionId") String subscriptionId, @Body DdosCustomPolicyInner 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.network.v2020_04_01.DdosCustomPolicies updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("ddosCustomPolicyName") String ddosCustomPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 ddosCustomPolicyName) {
+        deleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 ddosCustomPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 ddosCustomPolicyName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 ddosCustomPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), 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 information about the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 DdosCustomPolicyInner object if successful.
+     */
+    public DdosCustomPolicyInner getByResourceGroup(String resourceGroupName, String ddosCustomPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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<DdosCustomPolicyInner> getByResourceGroupAsync(String resourceGroupName, String ddosCustomPolicyName, final ServiceCallback<DdosCustomPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<DdosCustomPolicyInner> getByResourceGroupAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).map(new Func1<ServiceResponse<DdosCustomPolicyInner>, DdosCustomPolicyInner>() {
+            @Override
+            public DdosCustomPolicyInner call(ServiceResponse<DdosCustomPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<ServiceResponse<DdosCustomPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosCustomPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosCustomPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosCustomPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosCustomPolicyInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosCustomPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosCustomPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update 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 DdosCustomPolicyInner object if successful.
+     */
+    public DdosCustomPolicyInner createOrUpdate(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @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<DdosCustomPolicyInner> createOrUpdateAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters, final ServiceCallback<DdosCustomPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<DdosCustomPolicyInner> createOrUpdateAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters).map(new Func1<ServiceResponse<DdosCustomPolicyInner>, DdosCustomPolicyInner>() {
+            @Override
+            public DdosCustomPolicyInner call(ServiceResponse<DdosCustomPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<DdosCustomPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<DdosCustomPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update 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 DdosCustomPolicyInner object if successful.
+     */
+    public DdosCustomPolicyInner beginCreateOrUpdate(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @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<DdosCustomPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters, final ServiceCallback<DdosCustomPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<DdosCustomPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, parameters).map(new Func1<ServiceResponse<DdosCustomPolicyInner>, DdosCustomPolicyInner>() {
+            @Override
+            public DdosCustomPolicyInner call(ServiceResponse<DdosCustomPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a DDoS custom policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<ServiceResponse<DdosCustomPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName, DdosCustomPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosCustomPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosCustomPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosCustomPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosCustomPolicyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosCustomPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosCustomPolicyInner>() { }.getType())
+                .register(201, new TypeToken<DdosCustomPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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 DdosCustomPolicyInner object if successful.
+     */
+    public DdosCustomPolicyInner updateTags(String resourceGroupName, String ddosCustomPolicyName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @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<DdosCustomPolicyInner> updateTagsAsync(String resourceGroupName, String ddosCustomPolicyName, final ServiceCallback<DdosCustomPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName), serviceCallback);
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<DdosCustomPolicyInner> updateTagsAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName).map(new Func1<ServiceResponse<DdosCustomPolicyInner>, DdosCustomPolicyInner>() {
+            @Override
+            public DdosCustomPolicyInner call(ServiceResponse<DdosCustomPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<ServiceResponse<DdosCustomPolicyInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosCustomPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosCustomPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosCustomPolicyInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param tags Resource tags.
+     * @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 DdosCustomPolicyInner object if successful.
+     */
+    public DdosCustomPolicyInner updateTags(String resourceGroupName, String ddosCustomPolicyName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param tags Resource tags.
+     * @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<DdosCustomPolicyInner> updateTagsAsync(String resourceGroupName, String ddosCustomPolicyName, Map<String, String> tags, final ServiceCallback<DdosCustomPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, tags), serviceCallback);
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<DdosCustomPolicyInner> updateTagsAsync(String resourceGroupName, String ddosCustomPolicyName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosCustomPolicyName, tags).map(new Func1<ServiceResponse<DdosCustomPolicyInner>, DdosCustomPolicyInner>() {
+            @Override
+            public DdosCustomPolicyInner call(ServiceResponse<DdosCustomPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update a DDoS custom policy tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosCustomPolicyName The name of the DDoS custom policy.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosCustomPolicyInner object
+     */
+    public Observable<ServiceResponse<DdosCustomPolicyInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosCustomPolicyName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosCustomPolicyName == null) {
+            throw new IllegalArgumentException("Parameter ddosCustomPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, ddosCustomPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosCustomPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosCustomPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosCustomPolicyInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosCustomPolicyInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosCustomPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosCustomPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyImpl.java
new file mode 100644
index 000000000000..320fd06e140a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DdosCustomPolicy;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProtocolCustomSettingsFormat;
+
+class DdosCustomPolicyImpl extends GroupableResourceCoreImpl<DdosCustomPolicy, DdosCustomPolicyInner, DdosCustomPolicyImpl, NetworkManager> implements DdosCustomPolicy, DdosCustomPolicy.Definition, DdosCustomPolicy.Update {
+    DdosCustomPolicyImpl(String name, DdosCustomPolicyInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<DdosCustomPolicy> createResourceAsync() {
+        DdosCustomPoliciesInner client = this.manager().inner().ddosCustomPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<DdosCustomPolicy> updateResourceAsync() {
+        DdosCustomPoliciesInner client = this.manager().inner().ddosCustomPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<DdosCustomPolicyInner> getInnerAsync() {
+        DdosCustomPoliciesInner client = this.manager().inner().ddosCustomPolicies();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<ProtocolCustomSettingsFormat> protocolCustomSettings() {
+        return this.inner().protocolCustomSettings();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<SubResource> publicIPAddresses() {
+        return this.inner().publicIPAddresses();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public DdosCustomPolicyImpl withProtocolCustomSettings(List<ProtocolCustomSettingsFormat> protocolCustomSettings) {
+        this.inner().withProtocolCustomSettings(protocolCustomSettings);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyInner.java
new file mode 100644
index 000000000000..bd895d2494b4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosCustomPolicyInner.java
@@ -0,0 +1,142 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProtocolCustomSettingsFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A DDoS custom policy in a resource group.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class DdosCustomPolicyInner extends Resource {
+    /**
+     * The resource GUID property of the DDoS custom policy resource. It
+     * uniquely identifies the resource, even if the user changes its name or
+     * migrate the resource across subscriptions or resource groups.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the DDoS custom policy resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The list of public IPs associated with the DDoS custom policy resource.
+     * This list is read-only.
+     */
+    @JsonProperty(value = "properties.publicIPAddresses", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> publicIPAddresses;
+
+    /**
+     * The protocol-specific DDoS policy customization parameters.
+     */
+    @JsonProperty(value = "properties.protocolCustomSettings")
+    private List<ProtocolCustomSettingsFormat> protocolCustomSettings;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the resource GUID property of the DDoS custom policy resource. It uniquely identifies the resource, even if the user changes its name or migrate the resource across subscriptions or resource groups.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the DDoS custom policy resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the list of public IPs associated with the DDoS custom policy resource. This list is read-only.
+     *
+     * @return the publicIPAddresses value
+     */
+    public List<SubResource> publicIPAddresses() {
+        return this.publicIPAddresses;
+    }
+
+    /**
+     * Get the protocol-specific DDoS policy customization parameters.
+     *
+     * @return the protocolCustomSettings value
+     */
+    public List<ProtocolCustomSettingsFormat> protocolCustomSettings() {
+        return this.protocolCustomSettings;
+    }
+
+    /**
+     * Set the protocol-specific DDoS policy customization parameters.
+     *
+     * @param protocolCustomSettings the protocolCustomSettings value to set
+     * @return the DdosCustomPolicyInner object itself.
+     */
+    public DdosCustomPolicyInner withProtocolCustomSettings(List<ProtocolCustomSettingsFormat> protocolCustomSettings) {
+        this.protocolCustomSettings = protocolCustomSettings;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the DdosCustomPolicyInner object itself.
+     */
+    public DdosCustomPolicyInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanImpl.java
new file mode 100644
index 000000000000..52b63b898652
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlan;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+class DdosProtectionPlanImpl extends GroupableResourceCoreImpl<DdosProtectionPlan, DdosProtectionPlanInner, DdosProtectionPlanImpl, NetworkManager> implements DdosProtectionPlan, DdosProtectionPlan.Definition, DdosProtectionPlan.Update {
+    DdosProtectionPlanImpl(String name, DdosProtectionPlanInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<DdosProtectionPlan> createResourceAsync() {
+        DdosProtectionPlansInner client = this.manager().inner().ddosProtectionPlans();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<DdosProtectionPlan> updateResourceAsync() {
+        DdosProtectionPlansInner client = this.manager().inner().ddosProtectionPlans();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<DdosProtectionPlanInner> getInnerAsync() {
+        DdosProtectionPlansInner client = this.manager().inner().ddosProtectionPlans();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<SubResource> virtualNetworks() {
+        return this.inner().virtualNetworks();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanInner.java
new file mode 100644
index 000000000000..35c1db481b45
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlanInner.java
@@ -0,0 +1,87 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * A DDoS protection plan in a resource group.
+ */
+@JsonFlatten
+public class DdosProtectionPlanInner extends Resource {
+    /**
+     * The resource GUID property of the DDoS protection plan resource. It
+     * uniquely identifies the resource, even if the user changes its name or
+     * migrate the resource across subscriptions or resource groups.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the DDoS protection plan resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The list of virtual networks associated with the DDoS protection plan
+     * resource. This list is read-only.
+     */
+    @JsonProperty(value = "properties.virtualNetworks", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> virtualNetworks;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the resource GUID property of the DDoS protection plan resource. It uniquely identifies the resource, even if the user changes its name or migrate the resource across subscriptions or resource groups.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the DDoS protection plan resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the list of virtual networks associated with the DDoS protection plan resource. This list is read-only.
+     *
+     * @return the virtualNetworks value
+     */
+    public List<SubResource> virtualNetworks() {
+        return this.virtualNetworks;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansImpl.java
new file mode 100644
index 000000000000..70c0fac62d88
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlans;
+import com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlan;
+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;
+
+class DdosProtectionPlansImpl extends GroupableResourcesCoreImpl<DdosProtectionPlan, DdosProtectionPlanImpl, DdosProtectionPlanInner, DdosProtectionPlansInner, NetworkManager>  implements DdosProtectionPlans {
+    protected DdosProtectionPlansImpl(NetworkManager manager) {
+        super(manager.inner().ddosProtectionPlans(), manager);
+    }
+
+    @Override
+    protected Observable<DdosProtectionPlanInner> getInnerAsync(String resourceGroupName, String name) {
+        DdosProtectionPlansInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        DdosProtectionPlansInner 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<DdosProtectionPlan> listByResourceGroup(String resourceGroupName) {
+        DdosProtectionPlansInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<DdosProtectionPlan> listByResourceGroupAsync(String resourceGroupName) {
+        DdosProtectionPlansInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<DdosProtectionPlanInner>, Iterable<DdosProtectionPlanInner>>() {
+            @Override
+            public Iterable<DdosProtectionPlanInner> call(Page<DdosProtectionPlanInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<DdosProtectionPlanInner, DdosProtectionPlan>() {
+            @Override
+            public DdosProtectionPlan call(DdosProtectionPlanInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<DdosProtectionPlan> list() {
+        DdosProtectionPlansInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<DdosProtectionPlan> listAsync() {
+        DdosProtectionPlansInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<DdosProtectionPlanInner>, Iterable<DdosProtectionPlanInner>>() {
+            @Override
+            public Iterable<DdosProtectionPlanInner> call(Page<DdosProtectionPlanInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<DdosProtectionPlanInner, DdosProtectionPlan>() {
+            @Override
+            public DdosProtectionPlan call(DdosProtectionPlanInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public DdosProtectionPlanImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected DdosProtectionPlanImpl wrapModel(DdosProtectionPlanInner inner) {
+        return  new DdosProtectionPlanImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected DdosProtectionPlanImpl wrapModel(String name) {
+        return new DdosProtectionPlanImpl(name, new DdosProtectionPlanInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansInner.java
new file mode 100644
index 000000000000..2f4efe24d843
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DdosProtectionPlansInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 DdosProtectionPlans.
+ */
+public class DdosProtectionPlansInner implements InnerSupportsGet<DdosProtectionPlanInner>, InnerSupportsDelete<Void>, InnerSupportsListing<DdosProtectionPlanInner> {
+    /** The Retrofit service to perform REST calls. */
+    private DdosProtectionPlansService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DdosProtectionPlansInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DdosProtectionPlansInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(DdosProtectionPlansService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for DdosProtectionPlans to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface DdosProtectionPlansService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlans delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @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.network.v2020_04_01.DdosProtectionPlans beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @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.network.v2020_04_01.DdosProtectionPlans getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @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.network.v2020_04_01.DdosProtectionPlans createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Body DdosProtectionPlanInner 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.network.v2020_04_01.DdosProtectionPlans beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Body DdosProtectionPlanInner 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.network.v2020_04_01.DdosProtectionPlans updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("ddosProtectionPlanName") String ddosProtectionPlanName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlans list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ddosProtectionPlans")
+        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.network.v2020_04_01.DdosProtectionPlans listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans")
+        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.network.v2020_04_01.DdosProtectionPlans 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.network.v2020_04_01.DdosProtectionPlans listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 ddosProtectionPlanName) {
+        deleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 ddosProtectionPlanName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 ddosProtectionPlanName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 ddosProtectionPlanName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), 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 information about the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 DdosProtectionPlanInner object if successful.
+     */
+    public DdosProtectionPlanInner getByResourceGroup(String resourceGroupName, String ddosProtectionPlanName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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<DdosProtectionPlanInner> getByResourceGroupAsync(String resourceGroupName, String ddosProtectionPlanName, final ServiceCallback<DdosProtectionPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<DdosProtectionPlanInner> getByResourceGroupAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1<ServiceResponse<DdosProtectionPlanInner>, DdosProtectionPlanInner>() {
+            @Override
+            public DdosProtectionPlanInner call(ServiceResponse<DdosProtectionPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<ServiceResponse<DdosProtectionPlanInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosProtectionPlanInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosProtectionPlanInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosProtectionPlanInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosProtectionPlanInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosProtectionPlanInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosProtectionPlanInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update 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 DdosProtectionPlanInner object if successful.
+     */
+    public DdosProtectionPlanInner createOrUpdate(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @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<DdosProtectionPlanInner> createOrUpdateAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters, final ServiceCallback<DdosProtectionPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<DdosProtectionPlanInner> createOrUpdateAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters).map(new Func1<ServiceResponse<DdosProtectionPlanInner>, DdosProtectionPlanInner>() {
+            @Override
+            public DdosProtectionPlanInner call(ServiceResponse<DdosProtectionPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<DdosProtectionPlanInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<DdosProtectionPlanInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update 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 DdosProtectionPlanInner object if successful.
+     */
+    public DdosProtectionPlanInner beginCreateOrUpdate(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @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<DdosProtectionPlanInner> beginCreateOrUpdateAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters, final ServiceCallback<DdosProtectionPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<DdosProtectionPlanInner> beginCreateOrUpdateAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, parameters).map(new Func1<ServiceResponse<DdosProtectionPlanInner>, DdosProtectionPlanInner>() {
+            @Override
+            public DdosProtectionPlanInner call(ServiceResponse<DdosProtectionPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a DDoS protection plan.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param parameters Parameters supplied to the create or update operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<ServiceResponse<DdosProtectionPlanInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName, DdosProtectionPlanInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosProtectionPlanInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosProtectionPlanInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosProtectionPlanInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosProtectionPlanInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosProtectionPlanInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosProtectionPlanInner>() { }.getType())
+                .register(201, new TypeToken<DdosProtectionPlanInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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 DdosProtectionPlanInner object if successful.
+     */
+    public DdosProtectionPlanInner updateTags(String resourceGroupName, String ddosProtectionPlanName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).toBlocking().single().body();
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @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<DdosProtectionPlanInner> updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, final ServiceCallback<DdosProtectionPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName), serviceCallback);
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<DdosProtectionPlanInner> updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName).map(new Func1<ServiceResponse<DdosProtectionPlanInner>, DdosProtectionPlanInner>() {
+            @Override
+            public DdosProtectionPlanInner call(ServiceResponse<DdosProtectionPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<ServiceResponse<DdosProtectionPlanInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosProtectionPlanInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosProtectionPlanInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosProtectionPlanInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param tags Resource tags.
+     * @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 DdosProtectionPlanInner object if successful.
+     */
+    public DdosProtectionPlanInner updateTags(String resourceGroupName, String ddosProtectionPlanName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param tags Resource tags.
+     * @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<DdosProtectionPlanInner> updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map<String, String> tags, final ServiceCallback<DdosProtectionPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags), serviceCallback);
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<DdosProtectionPlanInner> updateTagsAsync(String resourceGroupName, String ddosProtectionPlanName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ddosProtectionPlanName, tags).map(new Func1<ServiceResponse<DdosProtectionPlanInner>, DdosProtectionPlanInner>() {
+            @Override
+            public DdosProtectionPlanInner call(ServiceResponse<DdosProtectionPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update a DDoS protection plan tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ddosProtectionPlanName The name of the DDoS protection plan.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DdosProtectionPlanInner object
+     */
+    public Observable<ServiceResponse<DdosProtectionPlanInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ddosProtectionPlanName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ddosProtectionPlanName == null) {
+            throw new IllegalArgumentException("Parameter ddosProtectionPlanName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, ddosProtectionPlanName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DdosProtectionPlanInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DdosProtectionPlanInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DdosProtectionPlanInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DdosProtectionPlanInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DdosProtectionPlanInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DdosProtectionPlanInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all DDoS protection plans in a 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;DdosProtectionPlanInner&gt; object if successful.
+     */
+    public PagedList<DdosProtectionPlanInner> list() {
+        ServiceResponse<Page<DdosProtectionPlanInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<DdosProtectionPlanInner>(response.body()) {
+            @Override
+            public Page<DdosProtectionPlanInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all DDoS protection plans in a 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<DdosProtectionPlanInner>> listAsync(final ListOperationCallback<DdosProtectionPlanInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<Page<DdosProtectionPlanInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Page<DdosProtectionPlanInner>>() {
+                @Override
+                public Page<DdosProtectionPlanInner> call(ServiceResponse<Page<DdosProtectionPlanInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(ServiceResponse<Page<DdosProtectionPlanInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DdosProtectionPlanInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DdosProtectionPlanInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DdosProtectionPlanInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DdosProtectionPlanInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DdosProtectionPlanInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DdosProtectionPlanInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;DdosProtectionPlanInner&gt; object if successful.
+     */
+    public PagedList<DdosProtectionPlanInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<DdosProtectionPlanInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<DdosProtectionPlanInner>(response.body()) {
+            @Override
+            public Page<DdosProtectionPlanInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<DdosProtectionPlanInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<DdosProtectionPlanInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<Page<DdosProtectionPlanInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Page<DdosProtectionPlanInner>>() {
+                @Override
+                public Page<DdosProtectionPlanInner> call(ServiceResponse<Page<DdosProtectionPlanInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(ServiceResponse<Page<DdosProtectionPlanInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+    ServiceResponse<PageImpl<DdosProtectionPlanInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DdosProtectionPlanInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DdosProtectionPlanInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DdosProtectionPlanInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DdosProtectionPlanInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DdosProtectionPlanInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DdosProtectionPlanInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @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;DdosProtectionPlanInner&gt; object if successful.
+     */
+    public PagedList<DdosProtectionPlanInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<DdosProtectionPlanInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<DdosProtectionPlanInner>(response.body()) {
+            @Override
+            public Page<DdosProtectionPlanInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @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<DdosProtectionPlanInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<DdosProtectionPlanInner>> serviceFuture, final ListOperationCallback<DdosProtectionPlanInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @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;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<Page<DdosProtectionPlanInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Page<DdosProtectionPlanInner>>() {
+                @Override
+                public Page<DdosProtectionPlanInner> call(ServiceResponse<Page<DdosProtectionPlanInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+     * @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;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(ServiceResponse<Page<DdosProtectionPlanInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all DDoS protection plans in a subscription.
+     *
+    ServiceResponse<PageImpl<DdosProtectionPlanInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DdosProtectionPlanInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> 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<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DdosProtectionPlanInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DdosProtectionPlanInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DdosProtectionPlanInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DdosProtectionPlanInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DdosProtectionPlanInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the DDoS protection plans in 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;DdosProtectionPlanInner&gt; object if successful.
+     */
+    public PagedList<DdosProtectionPlanInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<DdosProtectionPlanInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<DdosProtectionPlanInner>(response.body()) {
+            @Override
+            public Page<DdosProtectionPlanInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the DDoS protection plans in 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<DdosProtectionPlanInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<DdosProtectionPlanInner>> serviceFuture, final ListOperationCallback<DdosProtectionPlanInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the DDoS protection plans in 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;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<Page<DdosProtectionPlanInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Page<DdosProtectionPlanInner>>() {
+                @Override
+                public Page<DdosProtectionPlanInner> call(ServiceResponse<Page<DdosProtectionPlanInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the DDoS protection plans in 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;DdosProtectionPlanInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<DdosProtectionPlanInner>>, Observable<ServiceResponse<Page<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(ServiceResponse<Page<DdosProtectionPlanInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the DDoS protection plans in a resource group.
+     *
+    ServiceResponse<PageImpl<DdosProtectionPlanInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DdosProtectionPlanInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> 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<DdosProtectionPlanInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DdosProtectionPlanInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DdosProtectionPlanInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DdosProtectionPlanInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DdosProtectionPlanInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DdosProtectionPlanInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DdosProtectionPlanInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesImpl.java
new file mode 100644
index 000000000000..32bb389a0961
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DefaultSecurityRules;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroupSecurityRuleModel;
+
+class DefaultSecurityRulesImpl extends WrapperImpl<DefaultSecurityRulesInner> implements DefaultSecurityRules {
+    private final NetworkManager manager;
+
+    DefaultSecurityRulesImpl(NetworkManager manager) {
+        super(manager.inner().defaultSecurityRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private NetworkSecurityGroupSecurityRuleModelImpl wrapModel(SecurityRuleInner inner) {
+        return  new NetworkSecurityGroupSecurityRuleModelImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRuleModel> listAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        DefaultSecurityRulesInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkSecurityGroupName)
+        .flatMapIterable(new Func1<Page<SecurityRuleInner>, Iterable<SecurityRuleInner>>() {
+            @Override
+            public Iterable<SecurityRuleInner> call(Page<SecurityRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SecurityRuleInner, NetworkSecurityGroupSecurityRuleModel>() {
+            @Override
+            public NetworkSecurityGroupSecurityRuleModel call(SecurityRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRuleModel> getAsync(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName) {
+        DefaultSecurityRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
+        .flatMap(new Func1<SecurityRuleInner, Observable<NetworkSecurityGroupSecurityRuleModel>>() {
+            @Override
+            public Observable<NetworkSecurityGroupSecurityRuleModel> call(SecurityRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NetworkSecurityGroupSecurityRuleModel)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesInner.java
new file mode 100644
index 000000000000..e0036b7571b2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DefaultSecurityRulesInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 DefaultSecurityRules.
+ */
+public class DefaultSecurityRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private DefaultSecurityRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DefaultSecurityRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DefaultSecurityRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(DefaultSecurityRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for DefaultSecurityRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface DefaultSecurityRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.DefaultSecurityRules list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/defaultSecurityRules")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @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.network.v2020_04_01.DefaultSecurityRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/defaultSecurityRules/{defaultSecurityRuleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("defaultSecurityRuleName") String defaultSecurityRuleName, @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.network.v2020_04_01.DefaultSecurityRules listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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;SecurityRuleInner&gt; object if successful.
+     */
+    public PagedList<SecurityRuleInner> list(final String resourceGroupName, final String networkSecurityGroupName) {
+        ServiceResponse<Page<SecurityRuleInner>> response = listSinglePageAsync(resourceGroupName, networkSecurityGroupName).toBlocking().single();
+        return new PagedList<SecurityRuleInner>(response.body()) {
+            @Override
+            public Page<SecurityRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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<SecurityRuleInner>> listAsync(final String resourceGroupName, final String networkSecurityGroupName, final ListOperationCallback<SecurityRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkSecurityGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityRuleInner&gt; object
+     */
+    public Observable<Page<SecurityRuleInner>> listAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName)
+            .map(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Page<SecurityRuleInner>>() {
+                @Override
+                public Page<SecurityRuleInner> call(ServiceResponse<Page<SecurityRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        return listSinglePageAsync(resourceGroupName, networkSecurityGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(ServiceResponse<Page<SecurityRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listSinglePageAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityRuleInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityRuleInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified default network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param defaultSecurityRuleName The name of the default security rule.
+     * @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 SecurityRuleInner object if successful.
+     */
+    public SecurityRuleInner get(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified default network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param defaultSecurityRuleName The name of the default security 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<SecurityRuleInner> getAsync(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName, final ServiceCallback<SecurityRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName), serviceCallback);
+    }
+
+    /**
+     * Get the specified default network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param defaultSecurityRuleName The name of the default security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<SecurityRuleInner> getAsync(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName).map(new Func1<ServiceResponse<SecurityRuleInner>, SecurityRuleInner>() {
+            @Override
+            public SecurityRuleInner call(ServiceResponse<SecurityRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified default network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param defaultSecurityRuleName The name of the default security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<ServiceResponse<SecurityRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String defaultSecurityRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (defaultSecurityRuleName == null) {
+            throw new IllegalArgumentException("Parameter defaultSecurityRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all default security rules in a network security 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;SecurityRuleInner&gt; object if successful.
+     */
+    public PagedList<SecurityRuleInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<SecurityRuleInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SecurityRuleInner>(response.body()) {
+            @Override
+            public Page<SecurityRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all default security rules in a network security 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<SecurityRuleInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<SecurityRuleInner>> serviceFuture, final ListOperationCallback<SecurityRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all default security rules in a network security 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;SecurityRuleInner&gt; object
+     */
+    public Observable<Page<SecurityRuleInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Page<SecurityRuleInner>>() {
+                @Override
+                public Page<SecurityRuleInner> call(ServiceResponse<Page<SecurityRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all default security rules in a network security 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;SecurityRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(ServiceResponse<Page<SecurityRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all default security rules in a network security group.
+     *
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> 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<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityRuleInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityRuleInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DnsNameAvailabilityResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DnsNameAvailabilityResultInner.java
new file mode 100644
index 000000000000..c85b1bd8afa2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/DnsNameAvailabilityResultInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for the CheckDnsNameAvailability API service call.
+ */
+public class DnsNameAvailabilityResultInner {
+    /**
+     * Domain availability (True/False).
+     */
+    @JsonProperty(value = "available")
+    private Boolean available;
+
+    /**
+     * Get domain availability (True/False).
+     *
+     * @return the available value
+     */
+    public Boolean available() {
+        return this.available;
+    }
+
+    /**
+     * Set domain availability (True/False).
+     *
+     * @param available the available value to set
+     * @return the DnsNameAvailabilityResultInner object itself.
+     */
+    public DnsNameAvailabilityResultInner withAvailable(Boolean available) {
+        this.available = available;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultImpl.java
new file mode 100644
index 000000000000..dbdb94ddaf6a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveNetworkSecurityGroupListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveNetworkSecurityGroup;
+
+class EffectiveNetworkSecurityGroupListResultImpl extends WrapperImpl<EffectiveNetworkSecurityGroupListResultInner> implements EffectiveNetworkSecurityGroupListResult {
+    private final NetworkManager manager;
+    EffectiveNetworkSecurityGroupListResultImpl(EffectiveNetworkSecurityGroupListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<EffectiveNetworkSecurityGroup> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultInner.java
new file mode 100644
index 000000000000..3c1d4c868426
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveNetworkSecurityGroupListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveNetworkSecurityGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for list effective network security groups API service call.
+ */
+public class EffectiveNetworkSecurityGroupListResultInner {
+    /**
+     * A list of effective network security groups.
+     */
+    @JsonProperty(value = "value")
+    private List<EffectiveNetworkSecurityGroup> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /**
+     * Get a list of effective network security groups.
+     *
+     * @return the value value
+     */
+    public List<EffectiveNetworkSecurityGroup> value() {
+        return this.value;
+    }
+
+    /**
+     * Set a list of effective network security groups.
+     *
+     * @param value the value value to set
+     * @return the EffectiveNetworkSecurityGroupListResultInner object itself.
+     */
+    public EffectiveNetworkSecurityGroupListResultInner withValue(List<EffectiveNetworkSecurityGroup> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultImpl.java
new file mode 100644
index 000000000000..cf458f01a955
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveRouteListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveRoute;
+
+class EffectiveRouteListResultImpl extends WrapperImpl<EffectiveRouteListResultInner> implements EffectiveRouteListResult {
+    private final NetworkManager manager;
+    EffectiveRouteListResultImpl(EffectiveRouteListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<EffectiveRoute> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultInner.java
new file mode 100644
index 000000000000..656d60cc38cc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EffectiveRouteListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveRoute;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for list effective route API service call.
+ */
+public class EffectiveRouteListResultInner {
+    /**
+     * A list of effective routes.
+     */
+    @JsonProperty(value = "value")
+    private List<EffectiveRoute> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /**
+     * Get a list of effective routes.
+     *
+     * @return the value value
+     */
+    public List<EffectiveRoute> value() {
+        return this.value;
+    }
+
+    /**
+     * Set a list of effective routes.
+     *
+     * @param value the value value to set
+     * @return the EffectiveRouteListResultInner object itself.
+     */
+    public EffectiveRouteListResultInner withValue(List<EffectiveRoute> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultImpl.java
new file mode 100644
index 000000000000..04aea1dfb6a9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.EndpointServiceResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+
+class EndpointServiceResultImpl extends WrapperImpl<EndpointServiceResultInner> implements EndpointServiceResult {
+    private final NetworkManager manager;
+
+    EndpointServiceResultImpl(EndpointServiceResultInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultInner.java
new file mode 100644
index 000000000000..d45fc104cd79
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/EndpointServiceResultInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Endpoint service.
+ */
+public class EndpointServiceResultInner extends SubResource {
+    /**
+     * Name of the endpoint service.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Type of the endpoint service.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get name of the endpoint service.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get type of the endpoint service.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationImpl.java
new file mode 100644
index 000000000000..889557fb4201
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationImpl.java
@@ -0,0 +1,140 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorization;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.AuthorizationUseStatus;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ExpressRouteCircuitAuthorizationImpl extends CreatableUpdatableImpl<ExpressRouteCircuitAuthorization, ExpressRouteCircuitAuthorizationInner, ExpressRouteCircuitAuthorizationImpl> implements ExpressRouteCircuitAuthorization, ExpressRouteCircuitAuthorization.Definition, ExpressRouteCircuitAuthorization.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String circuitName;
+    private String authorizationName;
+
+    ExpressRouteCircuitAuthorizationImpl(String name, NetworkManager manager) {
+        super(name, new ExpressRouteCircuitAuthorizationInner());
+        this.manager = manager;
+        // Set resource name
+        this.authorizationName = name;
+        //
+    }
+
+    ExpressRouteCircuitAuthorizationImpl(ExpressRouteCircuitAuthorizationInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.authorizationName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
+        this.authorizationName = IdParsingUtils.getValueFromIdByName(inner.id(), "authorizations");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitAuthorization> createResourceAsync() {
+        ExpressRouteCircuitAuthorizationsInner client = this.manager().inner().expressRouteCircuitAuthorizations();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.authorizationName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitAuthorization> updateResourceAsync() {
+        ExpressRouteCircuitAuthorizationsInner client = this.manager().inner().expressRouteCircuitAuthorizations();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.authorizationName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCircuitAuthorizationInner> getInnerAsync() {
+        ExpressRouteCircuitAuthorizationsInner client = this.manager().inner().expressRouteCircuitAuthorizations();
+        return client.getAsync(this.resourceGroupName, this.circuitName, this.authorizationName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String authorizationKey() {
+        return this.inner().authorizationKey();
+    }
+
+    @Override
+    public AuthorizationUseStatus authorizationUseStatus() {
+        return this.inner().authorizationUseStatus();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl withExistingExpressRouteCircuit(String resourceGroupName, String circuitName) {
+        this.resourceGroupName = resourceGroupName;
+        this.circuitName = circuitName;
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl withAuthorizationKey(String authorizationKey) {
+        this.inner().withAuthorizationKey(authorizationKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus) {
+        this.inner().withAuthorizationUseStatus(authorizationUseStatus);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationInner.java
new file mode 100644
index 000000000000..36408834fca9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationInner.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AuthorizationUseStatus;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Authorization in an ExpressRouteCircuit resource.
+ */
+@JsonFlatten
+public class ExpressRouteCircuitAuthorizationInner extends SubResource {
+    /**
+     * The authorization key.
+     */
+    @JsonProperty(value = "properties.authorizationKey")
+    private String authorizationKey;
+
+    /**
+     * The authorization use status. Possible values include: 'Available',
+     * 'InUse'.
+     */
+    @JsonProperty(value = "properties.authorizationUseStatus")
+    private AuthorizationUseStatus authorizationUseStatus;
+
+    /**
+     * The provisioning state of the authorization resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the authorization key.
+     *
+     * @return the authorizationKey value
+     */
+    public String authorizationKey() {
+        return this.authorizationKey;
+    }
+
+    /**
+     * Set the authorization key.
+     *
+     * @param authorizationKey the authorizationKey value to set
+     * @return the ExpressRouteCircuitAuthorizationInner object itself.
+     */
+    public ExpressRouteCircuitAuthorizationInner withAuthorizationKey(String authorizationKey) {
+        this.authorizationKey = authorizationKey;
+        return this;
+    }
+
+    /**
+     * Get the authorization use status. Possible values include: 'Available', 'InUse'.
+     *
+     * @return the authorizationUseStatus value
+     */
+    public AuthorizationUseStatus authorizationUseStatus() {
+        return this.authorizationUseStatus;
+    }
+
+    /**
+     * Set the authorization use status. Possible values include: 'Available', 'InUse'.
+     *
+     * @param authorizationUseStatus the authorizationUseStatus value to set
+     * @return the ExpressRouteCircuitAuthorizationInner object itself.
+     */
+    public ExpressRouteCircuitAuthorizationInner withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus) {
+        this.authorizationUseStatus = authorizationUseStatus;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the authorization resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteCircuitAuthorizationInner object itself.
+     */
+    public ExpressRouteCircuitAuthorizationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsImpl.java
new file mode 100644
index 000000000000..4ce9ae5700e2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorizations;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorization;
+
+class ExpressRouteCircuitAuthorizationsImpl extends WrapperImpl<ExpressRouteCircuitAuthorizationsInner> implements ExpressRouteCircuitAuthorizations {
+    private final NetworkManager manager;
+
+    ExpressRouteCircuitAuthorizationsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCircuitAuthorizations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ExpressRouteCircuitAuthorizationImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ExpressRouteCircuitAuthorizationImpl wrapModel(ExpressRouteCircuitAuthorizationInner inner) {
+        return  new ExpressRouteCircuitAuthorizationImpl(inner, manager());
+    }
+
+    private ExpressRouteCircuitAuthorizationImpl wrapModel(String name) {
+        return new ExpressRouteCircuitAuthorizationImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitAuthorization> listAsync(final String resourceGroupName, final String circuitName) {
+        ExpressRouteCircuitAuthorizationsInner client = this.inner();
+        return client.listAsync(resourceGroupName, circuitName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCircuitAuthorizationInner>, Iterable<ExpressRouteCircuitAuthorizationInner>>() {
+            @Override
+            public Iterable<ExpressRouteCircuitAuthorizationInner> call(Page<ExpressRouteCircuitAuthorizationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCircuitAuthorizationInner, ExpressRouteCircuitAuthorization>() {
+            @Override
+            public ExpressRouteCircuitAuthorization call(ExpressRouteCircuitAuthorizationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitAuthorization> getAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        ExpressRouteCircuitAuthorizationsInner client = this.inner();
+        return client.getAsync(resourceGroupName, circuitName, authorizationName)
+        .flatMap(new Func1<ExpressRouteCircuitAuthorizationInner, Observable<ExpressRouteCircuitAuthorization>>() {
+            @Override
+            public Observable<ExpressRouteCircuitAuthorization> call(ExpressRouteCircuitAuthorizationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteCircuitAuthorization)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        ExpressRouteCircuitAuthorizationsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, circuitName, authorizationName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsInner.java
new file mode 100644
index 000000000000..f33ab8a2f764
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitAuthorizationsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 ExpressRouteCircuitAuthorizations.
+ */
+public class ExpressRouteCircuitAuthorizationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCircuitAuthorizationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCircuitAuthorizationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCircuitAuthorizationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCircuitAuthorizationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCircuitAuthorizations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCircuitAuthorizationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorizations delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("authorizationName") String authorizationName, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("authorizationName") String authorizationName, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("authorizationName") String authorizationName, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("authorizationName") String authorizationName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitAuthorizationInner authorizationParameters, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("authorizationName") String authorizationName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitAuthorizationInner authorizationParameters, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuitAuthorizations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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 circuitName, String authorizationName) {
+        deleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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 circuitName, String authorizationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (authorizationName == null) {
+            throw new IllegalArgumentException("Parameter authorizationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, circuitName, authorizationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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 circuitName, String authorizationName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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 circuitName, String authorizationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (authorizationName == null) {
+            throw new IllegalArgumentException("Parameter authorizationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, circuitName, authorizationName, this.client.subscriptionId(), 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 specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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 ExpressRouteCircuitAuthorizationInner object if successful.
+     */
+    public ExpressRouteCircuitAuthorizationInner get(String resourceGroupName, String circuitName, String authorizationName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @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<ExpressRouteCircuitAuthorizationInner> getAsync(String resourceGroupName, String circuitName, String authorizationName, final ServiceCallback<ExpressRouteCircuitAuthorizationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitAuthorizationInner object
+     */
+    public Observable<ExpressRouteCircuitAuthorizationInner> getAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName).map(new Func1<ServiceResponse<ExpressRouteCircuitAuthorizationInner>, ExpressRouteCircuitAuthorizationInner>() {
+            @Override
+            public ExpressRouteCircuitAuthorizationInner call(ServiceResponse<ExpressRouteCircuitAuthorizationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified authorization from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitAuthorizationInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>> getWithServiceResponseAsync(String resourceGroupName, String circuitName, String authorizationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (authorizationName == null) {
+            throw new IllegalArgumentException("Parameter authorizationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, circuitName, authorizationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitAuthorizationInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitAuthorizationInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitAuthorizationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitAuthorizationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization 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 ExpressRouteCircuitAuthorizationInner object if successful.
+     */
+    public ExpressRouteCircuitAuthorizationInner createOrUpdate(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @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<ExpressRouteCircuitAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters, final ServiceCallback<ExpressRouteCircuitAuthorizationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitAuthorizationInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitAuthorizationInner>, ExpressRouteCircuitAuthorizationInner>() {
+            @Override
+            public ExpressRouteCircuitAuthorizationInner call(ServiceResponse<ExpressRouteCircuitAuthorizationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (authorizationName == null) {
+            throw new IllegalArgumentException("Parameter authorizationName 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 (authorizationParameters == null) {
+            throw new IllegalArgumentException("Parameter authorizationParameters is required and cannot be null.");
+        }
+        Validator.validate(authorizationParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, circuitName, authorizationName, this.client.subscriptionId(), authorizationParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCircuitAuthorizationInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization 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 ExpressRouteCircuitAuthorizationInner object if successful.
+     */
+    public ExpressRouteCircuitAuthorizationInner beginCreateOrUpdate(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @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<ExpressRouteCircuitAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters, final ServiceCallback<ExpressRouteCircuitAuthorizationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitAuthorizationInner object
+     */
+    public Observable<ExpressRouteCircuitAuthorizationInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, authorizationName, authorizationParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitAuthorizationInner>, ExpressRouteCircuitAuthorizationInner>() {
+            @Override
+            public ExpressRouteCircuitAuthorizationInner call(ServiceResponse<ExpressRouteCircuitAuthorizationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an authorization in the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param authorizationName The name of the authorization.
+     * @param authorizationParameters Parameters supplied to the create or update express route circuit authorization operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitAuthorizationInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String authorizationName, ExpressRouteCircuitAuthorizationInner authorizationParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (authorizationName == null) {
+            throw new IllegalArgumentException("Parameter authorizationName 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 (authorizationParameters == null) {
+            throw new IllegalArgumentException("Parameter authorizationParameters is required and cannot be null.");
+        }
+        Validator.validate(authorizationParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, circuitName, authorizationName, this.client.subscriptionId(), authorizationParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitAuthorizationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitAuthorizationInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitAuthorizationInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitAuthorizationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitAuthorizationInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteCircuitAuthorizationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @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;ExpressRouteCircuitAuthorizationInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitAuthorizationInner> list(final String resourceGroupName, final String circuitName) {
+        ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> response = listSinglePageAsync(resourceGroupName, circuitName).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitAuthorizationInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitAuthorizationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @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<ExpressRouteCircuitAuthorizationInner>> listAsync(final String resourceGroupName, final String circuitName, final ListOperationCallback<ExpressRouteCircuitAuthorizationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, circuitName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitAuthorizationInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitAuthorizationInner>> listAsync(final String resourceGroupName, final String circuitName) {
+        return listWithServiceResponseAsync(resourceGroupName, circuitName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>, Page<ExpressRouteCircuitAuthorizationInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitAuthorizationInner> call(ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitAuthorizationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String circuitName) {
+        return listSinglePageAsync(resourceGroupName, circuitName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitAuthorizationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> listSinglePageAsync(final String resourceGroupName, final String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitAuthorizationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitAuthorizationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitAuthorizationInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitAuthorizationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitAuthorizationInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitAuthorizationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @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<ExpressRouteCircuitAuthorizationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCircuitAuthorizationInner>> serviceFuture, final ListOperationCallback<ExpressRouteCircuitAuthorizationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitAuthorizationInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitAuthorizationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>, Page<ExpressRouteCircuitAuthorizationInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitAuthorizationInner> call(ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitAuthorizationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all authorizations in an express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitAuthorizationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> 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<ExpressRouteCircuitAuthorizationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitAuthorizationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitAuthorizationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitAuthorizationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitAuthorizationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionImpl.java
new file mode 100644
index 000000000000..d773a6bdb972
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnection;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6CircuitConnectionConfig;
+import com.microsoft.azure.management.network.v2020_04_01.CircuitConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ExpressRouteCircuitConnectionImpl extends CreatableUpdatableImpl<ExpressRouteCircuitConnection, ExpressRouteCircuitConnectionInner, ExpressRouteCircuitConnectionImpl> implements ExpressRouteCircuitConnection, ExpressRouteCircuitConnection.Definition, ExpressRouteCircuitConnection.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String circuitName;
+    private String peeringName;
+    private String connectionName;
+
+    ExpressRouteCircuitConnectionImpl(String name, NetworkManager manager) {
+        super(name, new ExpressRouteCircuitConnectionInner());
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = name;
+        //
+    }
+
+    ExpressRouteCircuitConnectionImpl(ExpressRouteCircuitConnectionInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
+        this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "connections");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitConnection> createResourceAsync() {
+        ExpressRouteCircuitConnectionsInner client = this.manager().inner().expressRouteCircuitConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitConnection> updateResourceAsync() {
+        ExpressRouteCircuitConnectionsInner client = this.manager().inner().expressRouteCircuitConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCircuitConnectionInner> getInnerAsync() {
+        ExpressRouteCircuitConnectionsInner client = this.manager().inner().expressRouteCircuitConnections();
+        return client.getAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.connectionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String addressPrefix() {
+        return this.inner().addressPrefix();
+    }
+
+    @Override
+    public String authorizationKey() {
+        return this.inner().authorizationKey();
+    }
+
+    @Override
+    public CircuitConnectionStatus circuitConnectionStatus() {
+        return this.inner().circuitConnectionStatus();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource expressRouteCircuitPeering() {
+        return this.inner().expressRouteCircuitPeering();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig() {
+        return this.inner().ipv6CircuitConnectionConfig();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource peerExpressRouteCircuitPeering() {
+        return this.inner().peerExpressRouteCircuitPeering();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withExistingPeering(String resourceGroupName, String circuitName, String peeringName) {
+        this.resourceGroupName = resourceGroupName;
+        this.circuitName = circuitName;
+        this.peeringName = peeringName;
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withAddressPrefix(String addressPrefix) {
+        this.inner().withAddressPrefix(addressPrefix);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withAuthorizationKey(String authorizationKey) {
+        this.inner().withAuthorizationKey(authorizationKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withCircuitConnectionStatus(CircuitConnectionStatus circuitConnectionStatus) {
+        this.inner().withCircuitConnectionStatus(circuitConnectionStatus);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering) {
+        this.inner().withExpressRouteCircuitPeering(expressRouteCircuitPeering);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withIpv6CircuitConnectionConfig(Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig) {
+        this.inner().withIpv6CircuitConnectionConfig(ipv6CircuitConnectionConfig);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering) {
+        this.inner().withPeerExpressRouteCircuitPeering(peerExpressRouteCircuitPeering);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionInner.java
new file mode 100644
index 000000000000..b1226681553d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionInner.java
@@ -0,0 +1,255 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6CircuitConnectionConfig;
+import com.microsoft.azure.management.network.v2020_04_01.CircuitConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Express Route Circuit Connection in an ExpressRouteCircuitPeering resource.
+ */
+@JsonFlatten
+public class ExpressRouteCircuitConnectionInner extends SubResource {
+    /**
+     * Reference to Express Route Circuit Private Peering Resource of the
+     * circuit initiating connection.
+     */
+    @JsonProperty(value = "properties.expressRouteCircuitPeering")
+    private SubResource expressRouteCircuitPeering;
+
+    /**
+     * Reference to Express Route Circuit Private Peering Resource of the
+     * peered circuit.
+     */
+    @JsonProperty(value = "properties.peerExpressRouteCircuitPeering")
+    private SubResource peerExpressRouteCircuitPeering;
+
+    /**
+     * /29 IP address space to carve out Customer addresses for tunnels.
+     */
+    @JsonProperty(value = "properties.addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * The authorization key.
+     */
+    @JsonProperty(value = "properties.authorizationKey")
+    private String authorizationKey;
+
+    /**
+     * IPv6 Address PrefixProperties of the express route circuit connection.
+     */
+    @JsonProperty(value = "properties.ipv6CircuitConnectionConfig")
+    private Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig;
+
+    /**
+     * Express Route Circuit connection state. Possible values include:
+     * 'Connected', 'Connecting', 'Disconnected'.
+     */
+    @JsonProperty(value = "properties.circuitConnectionStatus")
+    private CircuitConnectionStatus circuitConnectionStatus;
+
+    /**
+     * The provisioning state of the express route circuit connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get reference to Express Route Circuit Private Peering Resource of the circuit initiating connection.
+     *
+     * @return the expressRouteCircuitPeering value
+     */
+    public SubResource expressRouteCircuitPeering() {
+        return this.expressRouteCircuitPeering;
+    }
+
+    /**
+     * Set reference to Express Route Circuit Private Peering Resource of the circuit initiating connection.
+     *
+     * @param expressRouteCircuitPeering the expressRouteCircuitPeering value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering) {
+        this.expressRouteCircuitPeering = expressRouteCircuitPeering;
+        return this;
+    }
+
+    /**
+     * Get reference to Express Route Circuit Private Peering Resource of the peered circuit.
+     *
+     * @return the peerExpressRouteCircuitPeering value
+     */
+    public SubResource peerExpressRouteCircuitPeering() {
+        return this.peerExpressRouteCircuitPeering;
+    }
+
+    /**
+     * Set reference to Express Route Circuit Private Peering Resource of the peered circuit.
+     *
+     * @param peerExpressRouteCircuitPeering the peerExpressRouteCircuitPeering value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering) {
+        this.peerExpressRouteCircuitPeering = peerExpressRouteCircuitPeering;
+        return this;
+    }
+
+    /**
+     * Get /29 IP address space to carve out Customer addresses for tunnels.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set /29 IP address space to carve out Customer addresses for tunnels.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the authorization key.
+     *
+     * @return the authorizationKey value
+     */
+    public String authorizationKey() {
+        return this.authorizationKey;
+    }
+
+    /**
+     * Set the authorization key.
+     *
+     * @param authorizationKey the authorizationKey value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withAuthorizationKey(String authorizationKey) {
+        this.authorizationKey = authorizationKey;
+        return this;
+    }
+
+    /**
+     * Get iPv6 Address PrefixProperties of the express route circuit connection.
+     *
+     * @return the ipv6CircuitConnectionConfig value
+     */
+    public Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig() {
+        return this.ipv6CircuitConnectionConfig;
+    }
+
+    /**
+     * Set iPv6 Address PrefixProperties of the express route circuit connection.
+     *
+     * @param ipv6CircuitConnectionConfig the ipv6CircuitConnectionConfig value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withIpv6CircuitConnectionConfig(Ipv6CircuitConnectionConfig ipv6CircuitConnectionConfig) {
+        this.ipv6CircuitConnectionConfig = ipv6CircuitConnectionConfig;
+        return this;
+    }
+
+    /**
+     * Get express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'.
+     *
+     * @return the circuitConnectionStatus value
+     */
+    public CircuitConnectionStatus circuitConnectionStatus() {
+        return this.circuitConnectionStatus;
+    }
+
+    /**
+     * Set express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'.
+     *
+     * @param circuitConnectionStatus the circuitConnectionStatus value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withCircuitConnectionStatus(CircuitConnectionStatus circuitConnectionStatus) {
+        this.circuitConnectionStatus = circuitConnectionStatus;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route circuit connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteCircuitConnectionInner object itself.
+     */
+    public ExpressRouteCircuitConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsImpl.java
new file mode 100644
index 000000000000..f93073730087
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnections;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnection;
+
+class ExpressRouteCircuitConnectionsImpl extends WrapperImpl<ExpressRouteCircuitConnectionsInner> implements ExpressRouteCircuitConnections {
+    private final NetworkManager manager;
+
+    ExpressRouteCircuitConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCircuitConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ExpressRouteCircuitConnectionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ExpressRouteCircuitConnectionImpl wrapModel(ExpressRouteCircuitConnectionInner inner) {
+        return  new ExpressRouteCircuitConnectionImpl(inner, manager());
+    }
+
+    private ExpressRouteCircuitConnectionImpl wrapModel(String name) {
+        return new ExpressRouteCircuitConnectionImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitConnection> listAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        ExpressRouteCircuitConnectionsInner client = this.inner();
+        return client.listAsync(resourceGroupName, circuitName, peeringName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCircuitConnectionInner>, Iterable<ExpressRouteCircuitConnectionInner>>() {
+            @Override
+            public Iterable<ExpressRouteCircuitConnectionInner> call(Page<ExpressRouteCircuitConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCircuitConnectionInner, ExpressRouteCircuitConnection>() {
+            @Override
+            public ExpressRouteCircuitConnection call(ExpressRouteCircuitConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitConnection> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        ExpressRouteCircuitConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, circuitName, peeringName, connectionName)
+        .flatMap(new Func1<ExpressRouteCircuitConnectionInner, Observable<ExpressRouteCircuitConnection>>() {
+            @Override
+            public Observable<ExpressRouteCircuitConnection> call(ExpressRouteCircuitConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteCircuitConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        ExpressRouteCircuitConnectionsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, circuitName, peeringName, connectionName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsInner.java
new file mode 100644
index 000000000000..2bdb9d9b9959
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitConnectionsInner.java
@@ -0,0 +1,807 @@
+/**
+ * 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.network.v2020_04_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.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 ExpressRouteCircuitConnections.
+ */
+public class ExpressRouteCircuitConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCircuitConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCircuitConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCircuitConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCircuitConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCircuitConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCircuitConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnections delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteCircuitConnections beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteCircuitConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteCircuitConnections createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters, @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.network.v2020_04_01.ExpressRouteCircuitConnections beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters, @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.network.v2020_04_01.ExpressRouteCircuitConnections list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCircuitConnections listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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 circuitName, String peeringName, String connectionName) {
+        deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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 circuitName, String peeringName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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 circuitName, String peeringName, String connectionName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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 circuitName, String peeringName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), 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 specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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 ExpressRouteCircuitConnectionInner object if successful.
+     */
+    public ExpressRouteCircuitConnectionInner get(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @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<ExpressRouteCircuitConnectionInner> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, final ServiceCallback<ExpressRouteCircuitConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitConnectionInner object
+     */
+    public Observable<ExpressRouteCircuitConnectionInner> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).map(new Func1<ServiceResponse<ExpressRouteCircuitConnectionInner>, ExpressRouteCircuitConnectionInner>() {
+            @Override
+            public ExpressRouteCircuitConnectionInner call(ServiceResponse<ExpressRouteCircuitConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection 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 ExpressRouteCircuitConnectionInner object if successful.
+     */
+    public ExpressRouteCircuitConnectionInner createOrUpdate(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @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<ExpressRouteCircuitConnectionInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters, final ServiceCallback<ExpressRouteCircuitConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitConnectionInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitConnectionInner>, ExpressRouteCircuitConnectionInner>() {
+            @Override
+            public ExpressRouteCircuitConnectionInner call(ServiceResponse<ExpressRouteCircuitConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName 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 (expressRouteCircuitConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter expressRouteCircuitConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(expressRouteCircuitConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), expressRouteCircuitConnectionParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCircuitConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection 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 ExpressRouteCircuitConnectionInner object if successful.
+     */
+    public ExpressRouteCircuitConnectionInner beginCreateOrUpdate(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @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<ExpressRouteCircuitConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters, final ServiceCallback<ExpressRouteCircuitConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitConnectionInner object
+     */
+    public Observable<ExpressRouteCircuitConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName, expressRouteCircuitConnectionParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitConnectionInner>, ExpressRouteCircuitConnectionInner>() {
+            @Override
+            public ExpressRouteCircuitConnectionInner call(ServiceResponse<ExpressRouteCircuitConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Express Route Circuit Connection in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the express route circuit connection.
+     * @param expressRouteCircuitConnectionParameters Parameters supplied to the create or update express route circuit connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, ExpressRouteCircuitConnectionInner expressRouteCircuitConnectionParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName 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 (expressRouteCircuitConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter expressRouteCircuitConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(expressRouteCircuitConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), expressRouteCircuitConnectionParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitConnectionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitConnectionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitConnectionInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteCircuitConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @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;ExpressRouteCircuitConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitConnectionInner> list(final String resourceGroupName, final String circuitName, final String peeringName) {
+        ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> response = listSinglePageAsync(resourceGroupName, circuitName, peeringName).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @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<ExpressRouteCircuitConnectionInner>> listAsync(final String resourceGroupName, final String circuitName, final String peeringName, final ListOperationCallback<ExpressRouteCircuitConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, circuitName, peeringName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitConnectionInner>> listAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        return listWithServiceResponseAsync(resourceGroupName, circuitName, peeringName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>, Page<ExpressRouteCircuitConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitConnectionInner> call(ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        return listSinglePageAsync(resourceGroupName, circuitName, peeringName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> * @param circuitName The name of the circuit.
+    ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> listSinglePageAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitConnectionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @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<ExpressRouteCircuitConnectionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCircuitConnectionInner>> serviceFuture, final ListOperationCallback<ExpressRouteCircuitConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitConnectionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>, Page<ExpressRouteCircuitConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitConnectionInner> call(ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+     * @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;ExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCircuitConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach connections associated with a private peering in an express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> 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<ExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitConnectionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitImpl.java
new file mode 100644
index 000000000000..06f67c8931be
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitImpl.java
@@ -0,0 +1,225 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuit;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitSku;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceProviderProvisioningState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitServiceProviderProperties;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorization;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeering;
+
+class ExpressRouteCircuitImpl extends GroupableResourceCoreImpl<ExpressRouteCircuit, ExpressRouteCircuitInner, ExpressRouteCircuitImpl, NetworkManager> implements ExpressRouteCircuit, ExpressRouteCircuit.Definition, ExpressRouteCircuit.Update {
+    ExpressRouteCircuitImpl(String name, ExpressRouteCircuitInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuit> createResourceAsync() {
+        ExpressRouteCircuitsInner client = this.manager().inner().expressRouteCircuits();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuit> updateResourceAsync() {
+        ExpressRouteCircuitsInner client = this.manager().inner().expressRouteCircuits();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCircuitInner> getInnerAsync() {
+        ExpressRouteCircuitsInner client = this.manager().inner().expressRouteCircuits();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean allowClassicOperations() {
+        return this.inner().allowClassicOperations();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitAuthorization> authorizations() {
+        List<ExpressRouteCircuitAuthorization> lst = new ArrayList<ExpressRouteCircuitAuthorization>();
+        if (this.inner().authorizations() != null) {
+            for (ExpressRouteCircuitAuthorizationInner inner : this.inner().authorizations()) {
+                lst.add( new ExpressRouteCircuitAuthorizationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public Double bandwidthInGbps() {
+        return this.inner().bandwidthInGbps();
+    }
+
+    @Override
+    public String circuitProvisioningState() {
+        return this.inner().circuitProvisioningState();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource expressRoutePort() {
+        return this.inner().expressRoutePort();
+    }
+
+    @Override
+    public String gatewayManagerEtag() {
+        return this.inner().gatewayManagerEtag();
+    }
+
+    @Override
+    public Boolean globalReachEnabled() {
+        return this.inner().globalReachEnabled();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitPeering> peerings() {
+        List<ExpressRouteCircuitPeering> lst = new ArrayList<ExpressRouteCircuitPeering>();
+        if (this.inner().peerings() != null) {
+            for (ExpressRouteCircuitPeeringInner inner : this.inner().peerings()) {
+                lst.add( new ExpressRouteCircuitPeeringImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String serviceKey() {
+        return this.inner().serviceKey();
+    }
+
+    @Override
+    public String serviceProviderNotes() {
+        return this.inner().serviceProviderNotes();
+    }
+
+    @Override
+    public ExpressRouteCircuitServiceProviderProperties serviceProviderProperties() {
+        return this.inner().serviceProviderProperties();
+    }
+
+    @Override
+    public ServiceProviderProvisioningState serviceProviderProvisioningState() {
+        return this.inner().serviceProviderProvisioningState();
+    }
+
+    @Override
+    public ExpressRouteCircuitSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public Integer stag() {
+        return this.inner().stag();
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withAllowClassicOperations(Boolean allowClassicOperations) {
+        this.inner().withAllowClassicOperations(allowClassicOperations);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations) {
+        this.inner().withAuthorizations(authorizations);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withBandwidthInGbps(Double bandwidthInGbps) {
+        this.inner().withBandwidthInGbps(bandwidthInGbps);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withCircuitProvisioningState(String circuitProvisioningState) {
+        this.inner().withCircuitProvisioningState(circuitProvisioningState);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withExpressRoutePort(SubResource expressRoutePort) {
+        this.inner().withExpressRoutePort(expressRoutePort);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.inner().withGatewayManagerEtag(gatewayManagerEtag);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withGlobalReachEnabled(Boolean globalReachEnabled) {
+        this.inner().withGlobalReachEnabled(globalReachEnabled);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withPeerings(List<ExpressRouteCircuitPeeringInner> peerings) {
+        this.inner().withPeerings(peerings);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withServiceKey(String serviceKey) {
+        this.inner().withServiceKey(serviceKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withServiceProviderNotes(String serviceProviderNotes) {
+        this.inner().withServiceProviderNotes(serviceProviderNotes);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties) {
+        this.inner().withServiceProviderProperties(serviceProviderProperties);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState) {
+        this.inner().withServiceProviderProvisioningState(serviceProviderProvisioningState);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl withSku(ExpressRouteCircuitSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitInner.java
new file mode 100644
index 000000000000..1f2263e95f71
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitInner.java
@@ -0,0 +1,442 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitSku;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceProviderProvisioningState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitServiceProviderProperties;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * ExpressRouteCircuit resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRouteCircuitInner extends Resource {
+    /**
+     * The SKU.
+     */
+    @JsonProperty(value = "sku")
+    private ExpressRouteCircuitSku sku;
+
+    /**
+     * Allow classic operations.
+     */
+    @JsonProperty(value = "properties.allowClassicOperations")
+    private Boolean allowClassicOperations;
+
+    /**
+     * The CircuitProvisioningState state of the resource.
+     */
+    @JsonProperty(value = "properties.circuitProvisioningState")
+    private String circuitProvisioningState;
+
+    /**
+     * The ServiceProviderProvisioningState state of the resource. Possible
+     * values include: 'NotProvisioned', 'Provisioning', 'Provisioned',
+     * 'Deprovisioning'.
+     */
+    @JsonProperty(value = "properties.serviceProviderProvisioningState")
+    private ServiceProviderProvisioningState serviceProviderProvisioningState;
+
+    /**
+     * The list of authorizations.
+     */
+    @JsonProperty(value = "properties.authorizations")
+    private List<ExpressRouteCircuitAuthorizationInner> authorizations;
+
+    /**
+     * The list of peerings.
+     */
+    @JsonProperty(value = "properties.peerings")
+    private List<ExpressRouteCircuitPeeringInner> peerings;
+
+    /**
+     * The ServiceKey.
+     */
+    @JsonProperty(value = "properties.serviceKey")
+    private String serviceKey;
+
+    /**
+     * The ServiceProviderNotes.
+     */
+    @JsonProperty(value = "properties.serviceProviderNotes")
+    private String serviceProviderNotes;
+
+    /**
+     * The ServiceProviderProperties.
+     */
+    @JsonProperty(value = "properties.serviceProviderProperties")
+    private ExpressRouteCircuitServiceProviderProperties serviceProviderProperties;
+
+    /**
+     * The reference to the ExpressRoutePort resource when the circuit is
+     * provisioned on an ExpressRoutePort resource.
+     */
+    @JsonProperty(value = "properties.expressRoutePort")
+    private SubResource expressRoutePort;
+
+    /**
+     * The bandwidth of the circuit when the circuit is provisioned on an
+     * ExpressRoutePort resource.
+     */
+    @JsonProperty(value = "properties.bandwidthInGbps")
+    private Double bandwidthInGbps;
+
+    /**
+     * The identifier of the circuit traffic. Outer tag for QinQ encapsulation.
+     */
+    @JsonProperty(value = "properties.stag", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer stag;
+
+    /**
+     * The provisioning state of the express route circuit resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The GatewayManager Etag.
+     */
+    @JsonProperty(value = "properties.gatewayManagerEtag")
+    private String gatewayManagerEtag;
+
+    /**
+     * Flag denoting global reach status.
+     */
+    @JsonProperty(value = "properties.globalReachEnabled")
+    private Boolean globalReachEnabled;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the SKU.
+     *
+     * @return the sku value
+     */
+    public ExpressRouteCircuitSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the SKU.
+     *
+     * @param sku the sku value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withSku(ExpressRouteCircuitSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get allow classic operations.
+     *
+     * @return the allowClassicOperations value
+     */
+    public Boolean allowClassicOperations() {
+        return this.allowClassicOperations;
+    }
+
+    /**
+     * Set allow classic operations.
+     *
+     * @param allowClassicOperations the allowClassicOperations value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withAllowClassicOperations(Boolean allowClassicOperations) {
+        this.allowClassicOperations = allowClassicOperations;
+        return this;
+    }
+
+    /**
+     * Get the CircuitProvisioningState state of the resource.
+     *
+     * @return the circuitProvisioningState value
+     */
+    public String circuitProvisioningState() {
+        return this.circuitProvisioningState;
+    }
+
+    /**
+     * Set the CircuitProvisioningState state of the resource.
+     *
+     * @param circuitProvisioningState the circuitProvisioningState value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withCircuitProvisioningState(String circuitProvisioningState) {
+        this.circuitProvisioningState = circuitProvisioningState;
+        return this;
+    }
+
+    /**
+     * Get the ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'.
+     *
+     * @return the serviceProviderProvisioningState value
+     */
+    public ServiceProviderProvisioningState serviceProviderProvisioningState() {
+        return this.serviceProviderProvisioningState;
+    }
+
+    /**
+     * Set the ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'.
+     *
+     * @param serviceProviderProvisioningState the serviceProviderProvisioningState value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState) {
+        this.serviceProviderProvisioningState = serviceProviderProvisioningState;
+        return this;
+    }
+
+    /**
+     * Get the list of authorizations.
+     *
+     * @return the authorizations value
+     */
+    public List<ExpressRouteCircuitAuthorizationInner> authorizations() {
+        return this.authorizations;
+    }
+
+    /**
+     * Set the list of authorizations.
+     *
+     * @param authorizations the authorizations value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations) {
+        this.authorizations = authorizations;
+        return this;
+    }
+
+    /**
+     * Get the list of peerings.
+     *
+     * @return the peerings value
+     */
+    public List<ExpressRouteCircuitPeeringInner> peerings() {
+        return this.peerings;
+    }
+
+    /**
+     * Set the list of peerings.
+     *
+     * @param peerings the peerings value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withPeerings(List<ExpressRouteCircuitPeeringInner> peerings) {
+        this.peerings = peerings;
+        return this;
+    }
+
+    /**
+     * Get the ServiceKey.
+     *
+     * @return the serviceKey value
+     */
+    public String serviceKey() {
+        return this.serviceKey;
+    }
+
+    /**
+     * Set the ServiceKey.
+     *
+     * @param serviceKey the serviceKey value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withServiceKey(String serviceKey) {
+        this.serviceKey = serviceKey;
+        return this;
+    }
+
+    /**
+     * Get the ServiceProviderNotes.
+     *
+     * @return the serviceProviderNotes value
+     */
+    public String serviceProviderNotes() {
+        return this.serviceProviderNotes;
+    }
+
+    /**
+     * Set the ServiceProviderNotes.
+     *
+     * @param serviceProviderNotes the serviceProviderNotes value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withServiceProviderNotes(String serviceProviderNotes) {
+        this.serviceProviderNotes = serviceProviderNotes;
+        return this;
+    }
+
+    /**
+     * Get the ServiceProviderProperties.
+     *
+     * @return the serviceProviderProperties value
+     */
+    public ExpressRouteCircuitServiceProviderProperties serviceProviderProperties() {
+        return this.serviceProviderProperties;
+    }
+
+    /**
+     * Set the ServiceProviderProperties.
+     *
+     * @param serviceProviderProperties the serviceProviderProperties value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties) {
+        this.serviceProviderProperties = serviceProviderProperties;
+        return this;
+    }
+
+    /**
+     * Get the reference to the ExpressRoutePort resource when the circuit is provisioned on an ExpressRoutePort resource.
+     *
+     * @return the expressRoutePort value
+     */
+    public SubResource expressRoutePort() {
+        return this.expressRoutePort;
+    }
+
+    /**
+     * Set the reference to the ExpressRoutePort resource when the circuit is provisioned on an ExpressRoutePort resource.
+     *
+     * @param expressRoutePort the expressRoutePort value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withExpressRoutePort(SubResource expressRoutePort) {
+        this.expressRoutePort = expressRoutePort;
+        return this;
+    }
+
+    /**
+     * Get the bandwidth of the circuit when the circuit is provisioned on an ExpressRoutePort resource.
+     *
+     * @return the bandwidthInGbps value
+     */
+    public Double bandwidthInGbps() {
+        return this.bandwidthInGbps;
+    }
+
+    /**
+     * Set the bandwidth of the circuit when the circuit is provisioned on an ExpressRoutePort resource.
+     *
+     * @param bandwidthInGbps the bandwidthInGbps value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withBandwidthInGbps(Double bandwidthInGbps) {
+        this.bandwidthInGbps = bandwidthInGbps;
+        return this;
+    }
+
+    /**
+     * Get the identifier of the circuit traffic. Outer tag for QinQ encapsulation.
+     *
+     * @return the stag value
+     */
+    public Integer stag() {
+        return this.stag;
+    }
+
+    /**
+     * Get the provisioning state of the express route circuit resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the GatewayManager Etag.
+     *
+     * @return the gatewayManagerEtag value
+     */
+    public String gatewayManagerEtag() {
+        return this.gatewayManagerEtag;
+    }
+
+    /**
+     * Set the GatewayManager Etag.
+     *
+     * @param gatewayManagerEtag the gatewayManagerEtag value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.gatewayManagerEtag = gatewayManagerEtag;
+        return this;
+    }
+
+    /**
+     * Get flag denoting global reach status.
+     *
+     * @return the globalReachEnabled value
+     */
+    public Boolean globalReachEnabled() {
+        return this.globalReachEnabled;
+    }
+
+    /**
+     * Set flag denoting global reach status.
+     *
+     * @param globalReachEnabled the globalReachEnabled value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withGlobalReachEnabled(Boolean globalReachEnabled) {
+        this.globalReachEnabled = globalReachEnabled;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteCircuitInner object itself.
+     */
+    public ExpressRouteCircuitInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringImpl.java
new file mode 100644
index 000000000000..85e7e587fb94
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringImpl.java
@@ -0,0 +1,342 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeering;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnectionId;
+import java.util.List;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnection;
+import com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnection;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitStats;
+
+class ExpressRouteCircuitPeeringImpl extends CreatableUpdatableImpl<ExpressRouteCircuitPeering, ExpressRouteCircuitPeeringInner, ExpressRouteCircuitPeeringImpl> implements ExpressRouteCircuitPeering, ExpressRouteCircuitPeering.Definition, ExpressRouteCircuitPeering.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String circuitName;
+    private String peeringName;
+
+    ExpressRouteCircuitPeeringImpl(String name, NetworkManager manager) {
+        super(name, new ExpressRouteCircuitPeeringInner());
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = name;
+        //
+    }
+
+    ExpressRouteCircuitPeeringImpl(ExpressRouteCircuitPeeringInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
+        this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitPeering> createResourceAsync() {
+        ExpressRouteCircuitPeeringsInner client = this.manager().inner().expressRouteCircuitPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitPeering> updateResourceAsync() {
+        ExpressRouteCircuitPeeringsInner client = this.manager().inner().expressRouteCircuitPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCircuitPeeringInner> getInnerAsync() {
+        ExpressRouteCircuitPeeringsInner client = this.manager().inner().expressRouteCircuitPeerings();
+        return client.getAsync(this.resourceGroupName, this.circuitName, this.peeringName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Integer azureASN() {
+        return this.inner().azureASN();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitConnection> connections() {
+        List<ExpressRouteCircuitConnection> lst = new ArrayList<ExpressRouteCircuitConnection>();
+        if (this.inner().connections() != null) {
+            for (ExpressRouteCircuitConnectionInner inner : this.inner().connections()) {
+                lst.add( new ExpressRouteCircuitConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ExpressRouteConnectionId expressRouteConnection() {
+        return this.inner().expressRouteConnection();
+    }
+
+    @Override
+    public String gatewayManagerEtag() {
+        return this.inner().gatewayManagerEtag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig() {
+        return this.inner().ipv6PeeringConfig();
+    }
+
+    @Override
+    public String lastModifiedBy() {
+        return this.inner().lastModifiedBy();
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringConfig microsoftPeeringConfig() {
+        return this.inner().microsoftPeeringConfig();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long peerASN() {
+        return this.inner().peerASN();
+    }
+
+    @Override
+    public List<PeerExpressRouteCircuitConnection> peeredConnections() {
+        List<PeerExpressRouteCircuitConnection> lst = new ArrayList<PeerExpressRouteCircuitConnection>();
+        if (this.inner().peeredConnections() != null) {
+            for (PeerExpressRouteCircuitConnectionInner inner : this.inner().peeredConnections()) {
+                lst.add( new PeerExpressRouteCircuitConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ExpressRoutePeeringType peeringType() {
+        return this.inner().peeringType();
+    }
+
+    @Override
+    public String primaryAzurePort() {
+        return this.inner().primaryAzurePort();
+    }
+
+    @Override
+    public String primaryPeerAddressPrefix() {
+        return this.inner().primaryPeerAddressPrefix();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SubResource routeFilter() {
+        return this.inner().routeFilter();
+    }
+
+    @Override
+    public String secondaryAzurePort() {
+        return this.inner().secondaryAzurePort();
+    }
+
+    @Override
+    public String secondaryPeerAddressPrefix() {
+        return this.inner().secondaryPeerAddressPrefix();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public ExpressRoutePeeringState state() {
+        return this.inner().state();
+    }
+
+    @Override
+    public ExpressRouteCircuitStats stats() {
+        ExpressRouteCircuitStatsInner inner = this.inner().stats();
+        if (inner != null) {
+            return  new ExpressRouteCircuitStatsImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public Integer vlanId() {
+        return this.inner().vlanId();
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withExistingExpressRouteCircuit(String resourceGroupName, String circuitName) {
+        this.resourceGroupName = resourceGroupName;
+        this.circuitName = circuitName;
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withAzureASN(Integer azureASN) {
+        this.inner().withAzureASN(azureASN);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withConnections(List<ExpressRouteCircuitConnectionInner> connections) {
+        this.inner().withConnections(connections);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withExpressRouteConnection(ExpressRouteConnectionId expressRouteConnection) {
+        this.inner().withExpressRouteConnection(expressRouteConnection);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.inner().withGatewayManagerEtag(gatewayManagerEtag);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig) {
+        this.inner().withIpv6PeeringConfig(ipv6PeeringConfig);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig) {
+        this.inner().withMicrosoftPeeringConfig(microsoftPeeringConfig);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withPeerASN(Long peerASN) {
+        this.inner().withPeerASN(peerASN);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withPeeringType(ExpressRoutePeeringType peeringType) {
+        this.inner().withPeeringType(peeringType);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withPrimaryAzurePort(String primaryAzurePort) {
+        this.inner().withPrimaryAzurePort(primaryAzurePort);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix) {
+        this.inner().withPrimaryPeerAddressPrefix(primaryPeerAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withRouteFilter(SubResource routeFilter) {
+        this.inner().withRouteFilter(routeFilter);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withSecondaryAzurePort(String secondaryAzurePort) {
+        this.inner().withSecondaryAzurePort(secondaryAzurePort);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix) {
+        this.inner().withSecondaryPeerAddressPrefix(secondaryPeerAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withSharedKey(String sharedKey) {
+        this.inner().withSharedKey(sharedKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withState(ExpressRoutePeeringState state) {
+        this.inner().withState(state);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withStats(ExpressRouteCircuitStatsInner stats) {
+        this.inner().withStats(stats);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl withVlanId(Integer vlanId) {
+        this.inner().withVlanId(vlanId);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringInner.java
new file mode 100644
index 000000000000..382b11d69916
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringInner.java
@@ -0,0 +1,575 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnectionId;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Peering in an ExpressRouteCircuit resource.
+ */
+@JsonFlatten
+public class ExpressRouteCircuitPeeringInner extends SubResource {
+    /**
+     * The peering type. Possible values include: 'AzurePublicPeering',
+     * 'AzurePrivatePeering', 'MicrosoftPeering'.
+     */
+    @JsonProperty(value = "properties.peeringType")
+    private ExpressRoutePeeringType peeringType;
+
+    /**
+     * The peering state. Possible values include: 'Disabled', 'Enabled'.
+     */
+    @JsonProperty(value = "properties.state")
+    private ExpressRoutePeeringState state;
+
+    /**
+     * The Azure ASN.
+     */
+    @JsonProperty(value = "properties.azureASN")
+    private Integer azureASN;
+
+    /**
+     * The peer ASN.
+     */
+    @JsonProperty(value = "properties.peerASN")
+    private Long peerASN;
+
+    /**
+     * The primary address prefix.
+     */
+    @JsonProperty(value = "properties.primaryPeerAddressPrefix")
+    private String primaryPeerAddressPrefix;
+
+    /**
+     * The secondary address prefix.
+     */
+    @JsonProperty(value = "properties.secondaryPeerAddressPrefix")
+    private String secondaryPeerAddressPrefix;
+
+    /**
+     * The primary port.
+     */
+    @JsonProperty(value = "properties.primaryAzurePort")
+    private String primaryAzurePort;
+
+    /**
+     * The secondary port.
+     */
+    @JsonProperty(value = "properties.secondaryAzurePort")
+    private String secondaryAzurePort;
+
+    /**
+     * The shared key.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * The VLAN ID.
+     */
+    @JsonProperty(value = "properties.vlanId")
+    private Integer vlanId;
+
+    /**
+     * The Microsoft peering configuration.
+     */
+    @JsonProperty(value = "properties.microsoftPeeringConfig")
+    private ExpressRouteCircuitPeeringConfig microsoftPeeringConfig;
+
+    /**
+     * The peering stats of express route circuit.
+     */
+    @JsonProperty(value = "properties.stats")
+    private ExpressRouteCircuitStatsInner stats;
+
+    /**
+     * The provisioning state of the express route circuit peering resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The GatewayManager Etag.
+     */
+    @JsonProperty(value = "properties.gatewayManagerEtag")
+    private String gatewayManagerEtag;
+
+    /**
+     * Who was the last to modify the peering.
+     */
+    @JsonProperty(value = "properties.lastModifiedBy", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastModifiedBy;
+
+    /**
+     * The reference to the RouteFilter resource.
+     */
+    @JsonProperty(value = "properties.routeFilter")
+    private SubResource routeFilter;
+
+    /**
+     * The IPv6 peering configuration.
+     */
+    @JsonProperty(value = "properties.ipv6PeeringConfig")
+    private Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig;
+
+    /**
+     * The ExpressRoute connection.
+     */
+    @JsonProperty(value = "properties.expressRouteConnection")
+    private ExpressRouteConnectionId expressRouteConnection;
+
+    /**
+     * The list of circuit connections associated with Azure Private Peering
+     * for this circuit.
+     */
+    @JsonProperty(value = "properties.connections")
+    private List<ExpressRouteCircuitConnectionInner> connections;
+
+    /**
+     * The list of peered circuit connections associated with Azure Private
+     * Peering for this circuit.
+     */
+    @JsonProperty(value = "properties.peeredConnections", access = JsonProperty.Access.WRITE_ONLY)
+    private List<PeerExpressRouteCircuitConnectionInner> peeredConnections;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'.
+     *
+     * @return the peeringType value
+     */
+    public ExpressRoutePeeringType peeringType() {
+        return this.peeringType;
+    }
+
+    /**
+     * Set the peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'.
+     *
+     * @param peeringType the peeringType value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withPeeringType(ExpressRoutePeeringType peeringType) {
+        this.peeringType = peeringType;
+        return this;
+    }
+
+    /**
+     * Get the peering state. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @return the state value
+     */
+    public ExpressRoutePeeringState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the peering state. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @param state the state value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withState(ExpressRoutePeeringState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the Azure ASN.
+     *
+     * @return the azureASN value
+     */
+    public Integer azureASN() {
+        return this.azureASN;
+    }
+
+    /**
+     * Set the Azure ASN.
+     *
+     * @param azureASN the azureASN value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withAzureASN(Integer azureASN) {
+        this.azureASN = azureASN;
+        return this;
+    }
+
+    /**
+     * Get the peer ASN.
+     *
+     * @return the peerASN value
+     */
+    public Long peerASN() {
+        return this.peerASN;
+    }
+
+    /**
+     * Set the peer ASN.
+     *
+     * @param peerASN the peerASN value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withPeerASN(Long peerASN) {
+        this.peerASN = peerASN;
+        return this;
+    }
+
+    /**
+     * Get the primary address prefix.
+     *
+     * @return the primaryPeerAddressPrefix value
+     */
+    public String primaryPeerAddressPrefix() {
+        return this.primaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the primary address prefix.
+     *
+     * @param primaryPeerAddressPrefix the primaryPeerAddressPrefix value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix) {
+        this.primaryPeerAddressPrefix = primaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the secondary address prefix.
+     *
+     * @return the secondaryPeerAddressPrefix value
+     */
+    public String secondaryPeerAddressPrefix() {
+        return this.secondaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the secondary address prefix.
+     *
+     * @param secondaryPeerAddressPrefix the secondaryPeerAddressPrefix value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix) {
+        this.secondaryPeerAddressPrefix = secondaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the primary port.
+     *
+     * @return the primaryAzurePort value
+     */
+    public String primaryAzurePort() {
+        return this.primaryAzurePort;
+    }
+
+    /**
+     * Set the primary port.
+     *
+     * @param primaryAzurePort the primaryAzurePort value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withPrimaryAzurePort(String primaryAzurePort) {
+        this.primaryAzurePort = primaryAzurePort;
+        return this;
+    }
+
+    /**
+     * Get the secondary port.
+     *
+     * @return the secondaryAzurePort value
+     */
+    public String secondaryAzurePort() {
+        return this.secondaryAzurePort;
+    }
+
+    /**
+     * Set the secondary port.
+     *
+     * @param secondaryAzurePort the secondaryAzurePort value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withSecondaryAzurePort(String secondaryAzurePort) {
+        this.secondaryAzurePort = secondaryAzurePort;
+        return this;
+    }
+
+    /**
+     * Get the shared key.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set the shared key.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get the VLAN ID.
+     *
+     * @return the vlanId value
+     */
+    public Integer vlanId() {
+        return this.vlanId;
+    }
+
+    /**
+     * Set the VLAN ID.
+     *
+     * @param vlanId the vlanId value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withVlanId(Integer vlanId) {
+        this.vlanId = vlanId;
+        return this;
+    }
+
+    /**
+     * Get the Microsoft peering configuration.
+     *
+     * @return the microsoftPeeringConfig value
+     */
+    public ExpressRouteCircuitPeeringConfig microsoftPeeringConfig() {
+        return this.microsoftPeeringConfig;
+    }
+
+    /**
+     * Set the Microsoft peering configuration.
+     *
+     * @param microsoftPeeringConfig the microsoftPeeringConfig value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig) {
+        this.microsoftPeeringConfig = microsoftPeeringConfig;
+        return this;
+    }
+
+    /**
+     * Get the peering stats of express route circuit.
+     *
+     * @return the stats value
+     */
+    public ExpressRouteCircuitStatsInner stats() {
+        return this.stats;
+    }
+
+    /**
+     * Set the peering stats of express route circuit.
+     *
+     * @param stats the stats value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withStats(ExpressRouteCircuitStatsInner stats) {
+        this.stats = stats;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route circuit peering resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the GatewayManager Etag.
+     *
+     * @return the gatewayManagerEtag value
+     */
+    public String gatewayManagerEtag() {
+        return this.gatewayManagerEtag;
+    }
+
+    /**
+     * Set the GatewayManager Etag.
+     *
+     * @param gatewayManagerEtag the gatewayManagerEtag value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.gatewayManagerEtag = gatewayManagerEtag;
+        return this;
+    }
+
+    /**
+     * Get who was the last to modify the peering.
+     *
+     * @return the lastModifiedBy value
+     */
+    public String lastModifiedBy() {
+        return this.lastModifiedBy;
+    }
+
+    /**
+     * Get the reference to the RouteFilter resource.
+     *
+     * @return the routeFilter value
+     */
+    public SubResource routeFilter() {
+        return this.routeFilter;
+    }
+
+    /**
+     * Set the reference to the RouteFilter resource.
+     *
+     * @param routeFilter the routeFilter value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withRouteFilter(SubResource routeFilter) {
+        this.routeFilter = routeFilter;
+        return this;
+    }
+
+    /**
+     * Get the IPv6 peering configuration.
+     *
+     * @return the ipv6PeeringConfig value
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig() {
+        return this.ipv6PeeringConfig;
+    }
+
+    /**
+     * Set the IPv6 peering configuration.
+     *
+     * @param ipv6PeeringConfig the ipv6PeeringConfig value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig) {
+        this.ipv6PeeringConfig = ipv6PeeringConfig;
+        return this;
+    }
+
+    /**
+     * Get the ExpressRoute connection.
+     *
+     * @return the expressRouteConnection value
+     */
+    public ExpressRouteConnectionId expressRouteConnection() {
+        return this.expressRouteConnection;
+    }
+
+    /**
+     * Set the ExpressRoute connection.
+     *
+     * @param expressRouteConnection the expressRouteConnection value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withExpressRouteConnection(ExpressRouteConnectionId expressRouteConnection) {
+        this.expressRouteConnection = expressRouteConnection;
+        return this;
+    }
+
+    /**
+     * Get the list of circuit connections associated with Azure Private Peering for this circuit.
+     *
+     * @return the connections value
+     */
+    public List<ExpressRouteCircuitConnectionInner> connections() {
+        return this.connections;
+    }
+
+    /**
+     * Set the list of circuit connections associated with Azure Private Peering for this circuit.
+     *
+     * @param connections the connections value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withConnections(List<ExpressRouteCircuitConnectionInner> connections) {
+        this.connections = connections;
+        return this;
+    }
+
+    /**
+     * Get the list of peered circuit connections associated with Azure Private Peering for this circuit.
+     *
+     * @return the peeredConnections value
+     */
+    public List<PeerExpressRouteCircuitConnectionInner> peeredConnections() {
+        return this.peeredConnections;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteCircuitPeeringInner object itself.
+     */
+    public ExpressRouteCircuitPeeringInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsImpl.java
new file mode 100644
index 000000000000..40f387580b31
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeerings;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeering;
+
+class ExpressRouteCircuitPeeringsImpl extends WrapperImpl<ExpressRouteCircuitPeeringsInner> implements ExpressRouteCircuitPeerings {
+    private final NetworkManager manager;
+
+    ExpressRouteCircuitPeeringsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCircuitPeerings());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ExpressRouteCircuitPeeringImpl wrapModel(ExpressRouteCircuitPeeringInner inner) {
+        return  new ExpressRouteCircuitPeeringImpl(inner, manager());
+    }
+
+    private ExpressRouteCircuitPeeringImpl wrapModel(String name) {
+        return new ExpressRouteCircuitPeeringImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitPeering> listAsync(final String resourceGroupName, final String circuitName) {
+        ExpressRouteCircuitPeeringsInner client = this.inner();
+        return client.listAsync(resourceGroupName, circuitName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCircuitPeeringInner>, Iterable<ExpressRouteCircuitPeeringInner>>() {
+            @Override
+            public Iterable<ExpressRouteCircuitPeeringInner> call(Page<ExpressRouteCircuitPeeringInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCircuitPeeringInner, ExpressRouteCircuitPeering>() {
+            @Override
+            public ExpressRouteCircuitPeering call(ExpressRouteCircuitPeeringInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitPeering> getAsync(String resourceGroupName, String circuitName, String peeringName) {
+        ExpressRouteCircuitPeeringsInner client = this.inner();
+        return client.getAsync(resourceGroupName, circuitName, peeringName)
+        .flatMap(new Func1<ExpressRouteCircuitPeeringInner, Observable<ExpressRouteCircuitPeering>>() {
+            @Override
+            public Observable<ExpressRouteCircuitPeering> call(ExpressRouteCircuitPeeringInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteCircuitPeering)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String circuitName, String peeringName) {
+        ExpressRouteCircuitPeeringsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, circuitName, peeringName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsInner.java
new file mode 100644
index 000000000000..406852985fc0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitPeeringsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 ExpressRouteCircuitPeerings.
+ */
+public class ExpressRouteCircuitPeeringsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCircuitPeeringsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCircuitPeeringsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCircuitPeeringsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCircuitPeeringsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCircuitPeerings to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCircuitPeeringsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeerings delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCircuitPeerings beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCircuitPeerings get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCircuitPeerings createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitPeeringInner peeringParameters, @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.network.v2020_04_01.ExpressRouteCircuitPeerings beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitPeeringInner peeringParameters, @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.network.v2020_04_01.ExpressRouteCircuitPeerings list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuitPeerings listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 circuitName, String peeringName) {
+        deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 circuitName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String circuitName, String peeringName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 circuitName, String peeringName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 circuitName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String circuitName, String peeringName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), 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 specified peering for the express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 ExpressRouteCircuitPeeringInner object if successful.
+     */
+    public ExpressRouteCircuitPeeringInner get(String resourceGroupName, String circuitName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified peering for the express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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<ExpressRouteCircuitPeeringInner> getAsync(String resourceGroupName, String circuitName, String peeringName, final ServiceCallback<ExpressRouteCircuitPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified peering for the express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitPeeringInner object
+     */
+    public Observable<ExpressRouteCircuitPeeringInner> getAsync(String resourceGroupName, String circuitName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).map(new Func1<ServiceResponse<ExpressRouteCircuitPeeringInner>, ExpressRouteCircuitPeeringInner>() {
+            @Override
+            public ExpressRouteCircuitPeeringInner call(ServiceResponse<ExpressRouteCircuitPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified peering for the express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitPeeringInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>> getWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitPeeringInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitPeeringInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering 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 ExpressRouteCircuitPeeringInner object if successful.
+     */
+    public ExpressRouteCircuitPeeringInner createOrUpdate(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @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<ExpressRouteCircuitPeeringInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters, final ServiceCallback<ExpressRouteCircuitPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitPeeringInner> createOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitPeeringInner>, ExpressRouteCircuitPeeringInner>() {
+            @Override
+            public ExpressRouteCircuitPeeringInner call(ServiceResponse<ExpressRouteCircuitPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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 (peeringParameters == null) {
+            throw new IllegalArgumentException("Parameter peeringParameters is required and cannot be null.");
+        }
+        Validator.validate(peeringParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), peeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCircuitPeeringInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering 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 ExpressRouteCircuitPeeringInner object if successful.
+     */
+    public ExpressRouteCircuitPeeringInner beginCreateOrUpdate(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @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<ExpressRouteCircuitPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters, final ServiceCallback<ExpressRouteCircuitPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitPeeringInner object
+     */
+    public Observable<ExpressRouteCircuitPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, peeringParameters).map(new Func1<ServiceResponse<ExpressRouteCircuitPeeringInner>, ExpressRouteCircuitPeeringInner>() {
+            @Override
+            public ExpressRouteCircuitPeeringInner call(ServiceResponse<ExpressRouteCircuitPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified express route circuits.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update express route circuit peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitPeeringInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, ExpressRouteCircuitPeeringInner peeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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 (peeringParameters == null) {
+            throw new IllegalArgumentException("Parameter peeringParameters is required and cannot be null.");
+        }
+        Validator.validate(peeringParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), peeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitPeeringInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitPeeringInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitPeeringInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteCircuitPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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;ExpressRouteCircuitPeeringInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitPeeringInner> list(final String resourceGroupName, final String circuitName) {
+        ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> response = listSinglePageAsync(resourceGroupName, circuitName).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitPeeringInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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<ExpressRouteCircuitPeeringInner>> listAsync(final String resourceGroupName, final String circuitName, final ListOperationCallback<ExpressRouteCircuitPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, circuitName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitPeeringInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitPeeringInner>> listAsync(final String resourceGroupName, final String circuitName) {
+        return listWithServiceResponseAsync(resourceGroupName, circuitName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>, Page<ExpressRouteCircuitPeeringInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitPeeringInner> call(ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String circuitName) {
+        return listSinglePageAsync(resourceGroupName, circuitName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> listSinglePageAsync(final String resourceGroupName, final String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @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;ExpressRouteCircuitPeeringInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitPeeringInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitPeeringInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @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<ExpressRouteCircuitPeeringInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCircuitPeeringInner>> serviceFuture, final ListOperationCallback<ExpressRouteCircuitPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @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;ExpressRouteCircuitPeeringInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitPeeringInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>, Page<ExpressRouteCircuitPeeringInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitPeeringInner> call(ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+     * @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;ExpressRouteCircuitPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(ServiceResponse<Page<ExpressRouteCircuitPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified express route circuit.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> 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<ExpressRouteCircuitPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitPeeringInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsImpl.java
new file mode 100644
index 000000000000..76fa0cdae794
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitStats;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class ExpressRouteCircuitStatsImpl extends WrapperImpl<ExpressRouteCircuitStatsInner> implements ExpressRouteCircuitStats {
+    private final NetworkManager manager;
+    ExpressRouteCircuitStatsImpl(ExpressRouteCircuitStatsInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Long primarybytesIn() {
+        return this.inner().primarybytesIn();
+    }
+
+    @Override
+    public Long primarybytesOut() {
+        return this.inner().primarybytesOut();
+    }
+
+    @Override
+    public Long secondarybytesIn() {
+        return this.inner().secondarybytesIn();
+    }
+
+    @Override
+    public Long secondarybytesOut() {
+        return this.inner().secondarybytesOut();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsInner.java
new file mode 100644
index 000000000000..56dac2c2dc0f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitStatsInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains stats associated with the peering.
+ */
+public class ExpressRouteCircuitStatsInner {
+    /**
+     * The Primary BytesIn of the peering.
+     */
+    @JsonProperty(value = "primarybytesIn")
+    private Long primarybytesIn;
+
+    /**
+     * The primary BytesOut of the peering.
+     */
+    @JsonProperty(value = "primarybytesOut")
+    private Long primarybytesOut;
+
+    /**
+     * The secondary BytesIn of the peering.
+     */
+    @JsonProperty(value = "secondarybytesIn")
+    private Long secondarybytesIn;
+
+    /**
+     * The secondary BytesOut of the peering.
+     */
+    @JsonProperty(value = "secondarybytesOut")
+    private Long secondarybytesOut;
+
+    /**
+     * Get the Primary BytesIn of the peering.
+     *
+     * @return the primarybytesIn value
+     */
+    public Long primarybytesIn() {
+        return this.primarybytesIn;
+    }
+
+    /**
+     * Set the Primary BytesIn of the peering.
+     *
+     * @param primarybytesIn the primarybytesIn value to set
+     * @return the ExpressRouteCircuitStatsInner object itself.
+     */
+    public ExpressRouteCircuitStatsInner withPrimarybytesIn(Long primarybytesIn) {
+        this.primarybytesIn = primarybytesIn;
+        return this;
+    }
+
+    /**
+     * Get the primary BytesOut of the peering.
+     *
+     * @return the primarybytesOut value
+     */
+    public Long primarybytesOut() {
+        return this.primarybytesOut;
+    }
+
+    /**
+     * Set the primary BytesOut of the peering.
+     *
+     * @param primarybytesOut the primarybytesOut value to set
+     * @return the ExpressRouteCircuitStatsInner object itself.
+     */
+    public ExpressRouteCircuitStatsInner withPrimarybytesOut(Long primarybytesOut) {
+        this.primarybytesOut = primarybytesOut;
+        return this;
+    }
+
+    /**
+     * Get the secondary BytesIn of the peering.
+     *
+     * @return the secondarybytesIn value
+     */
+    public Long secondarybytesIn() {
+        return this.secondarybytesIn;
+    }
+
+    /**
+     * Set the secondary BytesIn of the peering.
+     *
+     * @param secondarybytesIn the secondarybytesIn value to set
+     * @return the ExpressRouteCircuitStatsInner object itself.
+     */
+    public ExpressRouteCircuitStatsInner withSecondarybytesIn(Long secondarybytesIn) {
+        this.secondarybytesIn = secondarybytesIn;
+        return this;
+    }
+
+    /**
+     * Get the secondary BytesOut of the peering.
+     *
+     * @return the secondarybytesOut value
+     */
+    public Long secondarybytesOut() {
+        return this.secondarybytesOut;
+    }
+
+    /**
+     * Set the secondary BytesOut of the peering.
+     *
+     * @param secondarybytesOut the secondarybytesOut value to set
+     * @return the ExpressRouteCircuitStatsInner object itself.
+     */
+    public ExpressRouteCircuitStatsInner withSecondarybytesOut(Long secondarybytesOut) {
+        this.secondarybytesOut = secondarybytesOut;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultImpl.java
new file mode 100644
index 000000000000..687474975939
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsArpTableListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitArpTable;
+
+class ExpressRouteCircuitsArpTableListResultImpl extends WrapperImpl<ExpressRouteCircuitsArpTableListResultInner> implements ExpressRouteCircuitsArpTableListResult {
+    private final NetworkManager manager;
+    ExpressRouteCircuitsArpTableListResultImpl(ExpressRouteCircuitsArpTableListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitArpTable> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultInner.java
new file mode 100644
index 000000000000..75b7e2b206fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsArpTableListResultInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitArpTable;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ListArpTable associated with the Express Route Circuits API.
+ */
+public class ExpressRouteCircuitsArpTableListResultInner {
+    /**
+     * A list of the ARP tables.
+     */
+    @JsonProperty(value = "value")
+    private List<ExpressRouteCircuitArpTable> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink")
+    private String nextLink;
+
+    /**
+     * Get a list of the ARP tables.
+     *
+     * @return the value value
+     */
+    public List<ExpressRouteCircuitArpTable> value() {
+        return this.value;
+    }
+
+    /**
+     * Set a list of the ARP tables.
+     *
+     * @param value the value value to set
+     * @return the ExpressRouteCircuitsArpTableListResultInner object itself.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner withValue(List<ExpressRouteCircuitArpTable> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the URL to get the next set of results.
+     *
+     * @param nextLink the nextLink value to set
+     * @return the ExpressRouteCircuitsArpTableListResultInner object itself.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsImpl.java
new file mode 100644
index 000000000000..b71cc9ce5fc9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuits;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuit;
+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.network.v2020_04_01.ExpressRouteCircuitsArpTableListResult;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsRoutesTableListResult;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsRoutesTableSummaryListResult;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitStats;
+
+class ExpressRouteCircuitsImpl extends GroupableResourcesCoreImpl<ExpressRouteCircuit, ExpressRouteCircuitImpl, ExpressRouteCircuitInner, ExpressRouteCircuitsInner, NetworkManager>  implements ExpressRouteCircuits {
+    protected ExpressRouteCircuitsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCircuits(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRouteCircuitInner> getInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteCircuitsInner 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<ExpressRouteCircuit> listByResourceGroup(String resourceGroupName) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuit> listByResourceGroupAsync(String resourceGroupName) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCircuitInner>, Iterable<ExpressRouteCircuitInner>>() {
+            @Override
+            public Iterable<ExpressRouteCircuitInner> call(Page<ExpressRouteCircuitInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCircuitInner, ExpressRouteCircuit>() {
+            @Override
+            public ExpressRouteCircuit call(ExpressRouteCircuitInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ExpressRouteCircuit> list() {
+        ExpressRouteCircuitsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuit> listAsync() {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ExpressRouteCircuitInner>, Iterable<ExpressRouteCircuitInner>>() {
+            @Override
+            public Iterable<ExpressRouteCircuitInner> call(Page<ExpressRouteCircuitInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCircuitInner, ExpressRouteCircuit>() {
+            @Override
+            public ExpressRouteCircuit call(ExpressRouteCircuitInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ExpressRouteCircuitImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ExpressRouteCircuitImpl wrapModel(ExpressRouteCircuitInner inner) {
+        return  new ExpressRouteCircuitImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRouteCircuitImpl wrapModel(String name) {
+        return new ExpressRouteCircuitImpl(name, new ExpressRouteCircuitInner(), this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitsArpTableListResult> listArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.listArpTableAsync(resourceGroupName, circuitName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCircuitsArpTableListResultInner, ExpressRouteCircuitsArpTableListResult>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResult call(ExpressRouteCircuitsArpTableListResultInner inner) {
+                return new ExpressRouteCircuitsArpTableListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitsRoutesTableListResult> listRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.listRoutesTableAsync(resourceGroupName, circuitName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCircuitsRoutesTableListResultInner, ExpressRouteCircuitsRoutesTableListResult>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResult call(ExpressRouteCircuitsRoutesTableListResultInner inner) {
+                return new ExpressRouteCircuitsRoutesTableListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitsRoutesTableSummaryListResult> listRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.listRoutesTableSummaryAsync(resourceGroupName, circuitName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCircuitsRoutesTableSummaryListResultInner, ExpressRouteCircuitsRoutesTableSummaryListResult>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableSummaryListResult call(ExpressRouteCircuitsRoutesTableSummaryListResultInner inner) {
+                return new ExpressRouteCircuitsRoutesTableSummaryListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitStats> getStatsAsync(String resourceGroupName, String circuitName) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.getStatsAsync(resourceGroupName, circuitName)
+        .map(new Func1<ExpressRouteCircuitStatsInner, ExpressRouteCircuitStats>() {
+            @Override
+            public ExpressRouteCircuitStats call(ExpressRouteCircuitStatsInner inner) {
+                return new ExpressRouteCircuitStatsImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitStats> getPeeringStatsAsync(String resourceGroupName, String circuitName, String peeringName) {
+        ExpressRouteCircuitsInner client = this.inner();
+        return client.getPeeringStatsAsync(resourceGroupName, circuitName, peeringName)
+        .map(new Func1<ExpressRouteCircuitStatsInner, ExpressRouteCircuitStats>() {
+            @Override
+            public ExpressRouteCircuitStats call(ExpressRouteCircuitStatsInner inner) {
+                return new ExpressRouteCircuitStatsImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsInner.java
new file mode 100644
index 000000000000..34e27edd5428
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsInner.java
@@ -0,0 +1,1876 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ExpressRouteCircuits.
+ */
+public class ExpressRouteCircuitsInner implements InnerSupportsGet<ExpressRouteCircuitInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ExpressRouteCircuitInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCircuitsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCircuitsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCircuitsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCircuitsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCircuits to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCircuitsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuits delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuits beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuits getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuits createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitInner 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.network.v2020_04_01.ExpressRouteCircuits beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCircuitInner 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.network.v2020_04_01.ExpressRouteCircuits updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuits listArpTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/arpTables/{devicePath}")
+        Observable<Response<ResponseBody>> listArpTable(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits beginListArpTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/arpTables/{devicePath}")
+        Observable<Response<ResponseBody>> beginListArpTable(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits listRoutesTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routeTables/{devicePath}")
+        Observable<Response<ResponseBody>> listRoutesTable(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits beginListRoutesTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routeTables/{devicePath}")
+        Observable<Response<ResponseBody>> beginListRoutesTable(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits listRoutesTableSummary" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routeTablesSummary/{devicePath}")
+        Observable<Response<ResponseBody>> listRoutesTableSummary(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits beginListRoutesTableSummary" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routeTablesSummary/{devicePath}")
+        Observable<Response<ResponseBody>> beginListRoutesTableSummary(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCircuits getStats" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/stats")
+        Observable<Response<ResponseBody>> getStats(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @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.network.v2020_04_01.ExpressRouteCircuits getPeeringStats" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/stats")
+        Observable<Response<ResponseBody>> getPeeringStats(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCircuits listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits")
+        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.network.v2020_04_01.ExpressRouteCircuits list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteCircuits")
+        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.network.v2020_04_01.ExpressRouteCircuits 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.network.v2020_04_01.ExpressRouteCircuits listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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 circuitName) {
+        deleteWithServiceResponseAsync(resourceGroupName, circuitName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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 circuitName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, circuitName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String circuitName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, circuitName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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 circuitName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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 circuitName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String circuitName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, circuitName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, circuitName, this.client.subscriptionId(), 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 information about the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of express route circuit.
+     * @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 ExpressRouteCircuitInner object if successful.
+     */
+    public ExpressRouteCircuitInner getByResourceGroup(String resourceGroupName, String circuitName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, circuitName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of express route circuit.
+     * @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<ExpressRouteCircuitInner> getByResourceGroupAsync(String resourceGroupName, String circuitName, final ServiceCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, circuitName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ExpressRouteCircuitInner> getByResourceGroupAsync(String resourceGroupName, String circuitName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, circuitName).map(new Func1<ServiceResponse<ExpressRouteCircuitInner>, ExpressRouteCircuitInner>() {
+            @Override
+            public ExpressRouteCircuitInner call(ServiceResponse<ExpressRouteCircuitInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit 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 ExpressRouteCircuitInner object if successful.
+     */
+    public ExpressRouteCircuitInner createOrUpdate(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @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<ExpressRouteCircuitInner> createOrUpdateAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters, final ServiceCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitInner> createOrUpdateAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters).map(new Func1<ServiceResponse<ExpressRouteCircuitInner>, ExpressRouteCircuitInner>() {
+            @Override
+            public ExpressRouteCircuitInner call(ServiceResponse<ExpressRouteCircuitInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, circuitName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCircuitInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit 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 ExpressRouteCircuitInner object if successful.
+     */
+    public ExpressRouteCircuitInner beginCreateOrUpdate(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @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<ExpressRouteCircuitInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters, final ServiceCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ExpressRouteCircuitInner> beginCreateOrUpdateAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, circuitName, parameters).map(new Func1<ServiceResponse<ExpressRouteCircuitInner>, ExpressRouteCircuitInner>() {
+            @Override
+            public ExpressRouteCircuitInner call(ServiceResponse<ExpressRouteCircuitInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param parameters Parameters supplied to the create or update express route circuit operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String circuitName, ExpressRouteCircuitInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, circuitName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteCircuitInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @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 ExpressRouteCircuitInner object if successful.
+     */
+    public ExpressRouteCircuitInner updateTags(String resourceGroupName, String circuitName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, circuitName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @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<ExpressRouteCircuitInner> updateTagsAsync(String resourceGroupName, String circuitName, final ServiceCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, circuitName), serviceCallback);
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ExpressRouteCircuitInner> updateTagsAsync(String resourceGroupName, String circuitName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, circuitName).map(new Func1<ServiceResponse<ExpressRouteCircuitInner>, ExpressRouteCircuitInner>() {
+            @Override
+            public ExpressRouteCircuitInner call(ServiceResponse<ExpressRouteCircuitInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param tags Resource tags.
+     * @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 ExpressRouteCircuitInner object if successful.
+     */
+    public ExpressRouteCircuitInner updateTags(String resourceGroupName, String circuitName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, circuitName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param tags Resource tags.
+     * @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<ExpressRouteCircuitInner> updateTagsAsync(String resourceGroupName, String circuitName, Map<String, String> tags, final ServiceCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, circuitName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ExpressRouteCircuitInner> updateTagsAsync(String resourceGroupName, String circuitName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, circuitName, tags).map(new Func1<ServiceResponse<ExpressRouteCircuitInner>, ExpressRouteCircuitInner>() {
+            @Override
+            public ExpressRouteCircuitInner call(ServiceResponse<ExpressRouteCircuitInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an express route circuit tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String circuitName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsArpTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner listArpTable(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsArpTableListResultInner> listArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsArpTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitsArpTableListResultInner> listArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>, ExpressRouteCircuitsArpTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResultInner call(ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> listArpTableWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listArpTable(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCircuitsArpTableListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsArpTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner beginListArpTable(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsArpTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsArpTableListResultInner object
+     */
+    public Observable<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListArpTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>, ExpressRouteCircuitsArpTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResultInner call(ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsArpTableListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> beginListArpTableWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListArpTable(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> clientResponse = beginListArpTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitsArpTableListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitsArpTableListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner listRoutesTable(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableListResultInner> listRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableListResultInner> listRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>, ExpressRouteCircuitsRoutesTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> listRoutesTableWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listRoutesTable(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCircuitsRoutesTableListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner beginListRoutesTable(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableListResultInner object
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListRoutesTableWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>, ExpressRouteCircuitsRoutesTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> beginListRoutesTableWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListRoutesTable(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> clientResponse = beginListRoutesTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitsRoutesTableListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitsRoutesTableListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableSummaryListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableSummaryListResultInner listRoutesTableSummary(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableSummaryListResultInner> listRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableSummaryListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableSummaryListResultInner> listRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>, ExpressRouteCircuitsRoutesTableSummaryListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableSummaryListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>> listRoutesTableSummaryWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listRoutesTableSummary(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCircuitsRoutesTableSummaryListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableSummaryListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableSummaryListResultInner beginListRoutesTableSummary(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableSummaryListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableSummaryListResultInner object
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        return beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>, ExpressRouteCircuitsRoutesTableSummaryListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableSummaryListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table summary associated with the express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableSummaryListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>> beginListRoutesTableSummaryWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListRoutesTableSummary(resourceGroupName, circuitName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner> clientResponse = beginListRoutesTableSummaryDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitsRoutesTableSummaryListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitsRoutesTableSummaryListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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 ExpressRouteCircuitStatsInner object if successful.
+     */
+    public ExpressRouteCircuitStatsInner getStats(String resourceGroupName, String circuitName) {
+        return getStatsWithServiceResponseAsync(resourceGroupName, circuitName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets all the stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @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<ExpressRouteCircuitStatsInner> getStatsAsync(String resourceGroupName, String circuitName, final ServiceCallback<ExpressRouteCircuitStatsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getStatsWithServiceResponseAsync(resourceGroupName, circuitName), serviceCallback);
+    }
+
+    /**
+     * Gets all the stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitStatsInner object
+     */
+    public Observable<ExpressRouteCircuitStatsInner> getStatsAsync(String resourceGroupName, String circuitName) {
+        return getStatsWithServiceResponseAsync(resourceGroupName, circuitName).map(new Func1<ServiceResponse<ExpressRouteCircuitStatsInner>, ExpressRouteCircuitStatsInner>() {
+            @Override
+            public ExpressRouteCircuitStatsInner call(ServiceResponse<ExpressRouteCircuitStatsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all the stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitStatsInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitStatsInner>> getStatsWithServiceResponseAsync(String resourceGroupName, String circuitName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getStats(resourceGroupName, circuitName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitStatsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitStatsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitStatsInner> clientResponse = getStatsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitStatsInner> getStatsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitStatsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitStatsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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 ExpressRouteCircuitStatsInner object if successful.
+     */
+    public ExpressRouteCircuitStatsInner getPeeringStats(String resourceGroupName, String circuitName, String peeringName) {
+        return getPeeringStatsWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets all stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @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<ExpressRouteCircuitStatsInner> getPeeringStatsAsync(String resourceGroupName, String circuitName, String peeringName, final ServiceCallback<ExpressRouteCircuitStatsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getPeeringStatsWithServiceResponseAsync(resourceGroupName, circuitName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Gets all stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitStatsInner object
+     */
+    public Observable<ExpressRouteCircuitStatsInner> getPeeringStatsAsync(String resourceGroupName, String circuitName, String peeringName) {
+        return getPeeringStatsWithServiceResponseAsync(resourceGroupName, circuitName, peeringName).map(new Func1<ServiceResponse<ExpressRouteCircuitStatsInner>, ExpressRouteCircuitStatsInner>() {
+            @Override
+            public ExpressRouteCircuitStatsInner call(ServiceResponse<ExpressRouteCircuitStatsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all stats from an express route circuit in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitStatsInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitStatsInner>> getPeeringStatsWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getPeeringStats(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitStatsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitStatsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitStatsInner> clientResponse = getPeeringStatsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitStatsInner> getPeeringStatsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitStatsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitStatsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ExpressRouteCircuitInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ExpressRouteCircuitInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ExpressRouteCircuitInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Page<ExpressRouteCircuitInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitInner> call(ServiceResponse<Page<ExpressRouteCircuitInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(ServiceResponse<Page<ExpressRouteCircuitInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the express route circuits in a 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;ExpressRouteCircuitInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitInner> list() {
+        ServiceResponse<Page<ExpressRouteCircuitInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ExpressRouteCircuitInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the express route circuits in a 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<ExpressRouteCircuitInner>> listAsync(final ListOperationCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Page<ExpressRouteCircuitInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitInner> call(ServiceResponse<Page<ExpressRouteCircuitInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(ServiceResponse<Page<ExpressRouteCircuitInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the express route circuits in 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;ExpressRouteCircuitInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCircuitInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the express route circuits in 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<ExpressRouteCircuitInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCircuitInner>> serviceFuture, final ListOperationCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the express route circuits in 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;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Page<ExpressRouteCircuitInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitInner> call(ServiceResponse<Page<ExpressRouteCircuitInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in 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;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(ServiceResponse<Page<ExpressRouteCircuitInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> 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<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @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;ExpressRouteCircuitInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCircuitInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCircuitInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCircuitInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCircuitInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @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<ExpressRouteCircuitInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCircuitInner>> serviceFuture, final ListOperationCallback<ExpressRouteCircuitInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @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;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCircuitInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Page<ExpressRouteCircuitInner>>() {
+                @Override
+                public Page<ExpressRouteCircuitInner> call(ServiceResponse<Page<ExpressRouteCircuitInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+     * @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;ExpressRouteCircuitInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCircuitInner>>, Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(ServiceResponse<Page<ExpressRouteCircuitInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the express route circuits in a subscription.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCircuitInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCircuitInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> 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<ExpressRouteCircuitInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCircuitInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCircuitInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCircuitInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCircuitInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCircuitInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCircuitInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultImpl.java
new file mode 100644
index 000000000000..3b9cb28f982a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsRoutesTableListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitRoutesTable;
+
+class ExpressRouteCircuitsRoutesTableListResultImpl extends WrapperImpl<ExpressRouteCircuitsRoutesTableListResultInner> implements ExpressRouteCircuitsRoutesTableListResult {
+    private final NetworkManager manager;
+    ExpressRouteCircuitsRoutesTableListResultImpl(ExpressRouteCircuitsRoutesTableListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitRoutesTable> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultInner.java
new file mode 100644
index 000000000000..39b72881b2a6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableListResultInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitRoutesTable;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ListRoutesTable associated with the Express Route Circuits API.
+ */
+public class ExpressRouteCircuitsRoutesTableListResultInner {
+    /**
+     * The list of routes table.
+     */
+    @JsonProperty(value = "value")
+    private List<ExpressRouteCircuitRoutesTable> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink")
+    private String nextLink;
+
+    /**
+     * Get the list of routes table.
+     *
+     * @return the value value
+     */
+    public List<ExpressRouteCircuitRoutesTable> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the list of routes table.
+     *
+     * @param value the value value to set
+     * @return the ExpressRouteCircuitsRoutesTableListResultInner object itself.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner withValue(List<ExpressRouteCircuitRoutesTable> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the URL to get the next set of results.
+     *
+     * @param nextLink the nextLink value to set
+     * @return the ExpressRouteCircuitsRoutesTableListResultInner object itself.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultImpl.java
new file mode 100644
index 000000000000..c44b39e8f50f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsRoutesTableSummaryListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitRoutesTableSummary;
+
+class ExpressRouteCircuitsRoutesTableSummaryListResultImpl extends WrapperImpl<ExpressRouteCircuitsRoutesTableSummaryListResultInner> implements ExpressRouteCircuitsRoutesTableSummaryListResult {
+    private final NetworkManager manager;
+    ExpressRouteCircuitsRoutesTableSummaryListResultImpl(ExpressRouteCircuitsRoutesTableSummaryListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitRoutesTableSummary> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultInner.java
new file mode 100644
index 000000000000..b816e1af0963
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCircuitsRoutesTableSummaryListResultInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitRoutesTableSummary;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ListRoutesTable associated with the Express Route Circuits API.
+ */
+public class ExpressRouteCircuitsRoutesTableSummaryListResultInner {
+    /**
+     * A list of the routes table.
+     */
+    @JsonProperty(value = "value")
+    private List<ExpressRouteCircuitRoutesTableSummary> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink")
+    private String nextLink;
+
+    /**
+     * Get a list of the routes table.
+     *
+     * @return the value value
+     */
+    public List<ExpressRouteCircuitRoutesTableSummary> value() {
+        return this.value;
+    }
+
+    /**
+     * Set a list of the routes table.
+     *
+     * @param value the value value to set
+     * @return the ExpressRouteCircuitsRoutesTableSummaryListResultInner object itself.
+     */
+    public ExpressRouteCircuitsRoutesTableSummaryListResultInner withValue(List<ExpressRouteCircuitRoutesTableSummary> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the URL to get the next set of results.
+     *
+     * @param nextLink the nextLink value to set
+     * @return the ExpressRouteCircuitsRoutesTableSummaryListResultInner object itself.
+     */
+    public ExpressRouteCircuitsRoutesTableSummaryListResultInner withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionImpl.java
new file mode 100644
index 000000000000..b221039b3f59
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionImpl.java
@@ -0,0 +1,164 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnection;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringId;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+
+class ExpressRouteConnectionImpl extends CreatableUpdatableImpl<ExpressRouteConnection, ExpressRouteConnectionInner, ExpressRouteConnectionImpl> implements ExpressRouteConnection, ExpressRouteConnection.Definition, ExpressRouteConnection.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String expressRouteGatewayName;
+    private String connectionName;
+
+    ExpressRouteConnectionImpl(String name, NetworkManager manager) {
+        super(name, new ExpressRouteConnectionInner());
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = name;
+        //
+    }
+
+    ExpressRouteConnectionImpl(ExpressRouteConnectionInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.expressRouteGatewayName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteGateways");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteConnections");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ExpressRouteConnection> createResourceAsync() {
+        ExpressRouteConnectionsInner client = this.manager().inner().expressRouteConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.expressRouteGatewayName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteConnection> updateResourceAsync() {
+        ExpressRouteConnectionsInner client = this.manager().inner().expressRouteConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.expressRouteGatewayName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteConnectionInner> getInnerAsync() {
+        ExpressRouteConnectionsInner client = this.manager().inner().expressRouteConnections();
+        return client.getAsync(this.resourceGroupName, this.expressRouteGatewayName, this.connectionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String authorizationKey() {
+        return this.inner().authorizationKey();
+    }
+
+    @Override
+    public Boolean enableInternetSecurity() {
+        return this.inner().enableInternetSecurity();
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringId expressRouteCircuitPeering() {
+        return this.inner().expressRouteCircuitPeering();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public RoutingConfiguration routingConfiguration() {
+        return this.inner().routingConfiguration();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withExistingExpressRouteGateway(String resourceGroupName, String expressRouteGatewayName) {
+        this.resourceGroupName = resourceGroupName;
+        this.expressRouteGatewayName = expressRouteGatewayName;
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withExpressRouteCircuitPeering(ExpressRouteCircuitPeeringId expressRouteCircuitPeering) {
+        this.inner().withExpressRouteCircuitPeering(expressRouteCircuitPeering);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withAuthorizationKey(String authorizationKey) {
+        this.inner().withAuthorizationKey(authorizationKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withEnableInternetSecurity(Boolean enableInternetSecurity) {
+        this.inner().withEnableInternetSecurity(enableInternetSecurity);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.inner().withRoutingConfiguration(routingConfiguration);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl withRoutingWeight(Integer routingWeight) {
+        this.inner().withRoutingWeight(routingWeight);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionInner.java
new file mode 100644
index 000000000000..455dcaed3c86
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionInner.java
@@ -0,0 +1,196 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringId;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * ExpressRouteConnection resource.
+ */
+@JsonFlatten
+public class ExpressRouteConnectionInner extends SubResource {
+    /**
+     * The provisioning state of the express route connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The ExpressRoute circuit peering.
+     */
+    @JsonProperty(value = "properties.expressRouteCircuitPeering", required = true)
+    private ExpressRouteCircuitPeeringId expressRouteCircuitPeering;
+
+    /**
+     * Authorization key to establish the connection.
+     */
+    @JsonProperty(value = "properties.authorizationKey")
+    private String authorizationKey;
+
+    /**
+     * The routing weight associated to the connection.
+     */
+    @JsonProperty(value = "properties.routingWeight")
+    private Integer routingWeight;
+
+    /**
+     * Enable internet security.
+     */
+    @JsonProperty(value = "properties.enableInternetSecurity")
+    private Boolean enableInternetSecurity;
+
+    /**
+     * The Routing Configuration indicating the associated and propagated route
+     * tables on this connection.
+     */
+    @JsonProperty(value = "properties.routingConfiguration")
+    private RoutingConfiguration routingConfiguration;
+
+    /**
+     * The name of the resource.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Get the provisioning state of the express route connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the ExpressRoute circuit peering.
+     *
+     * @return the expressRouteCircuitPeering value
+     */
+    public ExpressRouteCircuitPeeringId expressRouteCircuitPeering() {
+        return this.expressRouteCircuitPeering;
+    }
+
+    /**
+     * Set the ExpressRoute circuit peering.
+     *
+     * @param expressRouteCircuitPeering the expressRouteCircuitPeering value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withExpressRouteCircuitPeering(ExpressRouteCircuitPeeringId expressRouteCircuitPeering) {
+        this.expressRouteCircuitPeering = expressRouteCircuitPeering;
+        return this;
+    }
+
+    /**
+     * Get authorization key to establish the connection.
+     *
+     * @return the authorizationKey value
+     */
+    public String authorizationKey() {
+        return this.authorizationKey;
+    }
+
+    /**
+     * Set authorization key to establish the connection.
+     *
+     * @param authorizationKey the authorizationKey value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withAuthorizationKey(String authorizationKey) {
+        this.authorizationKey = authorizationKey;
+        return this;
+    }
+
+    /**
+     * Get the routing weight associated to the connection.
+     *
+     * @return the routingWeight value
+     */
+    public Integer routingWeight() {
+        return this.routingWeight;
+    }
+
+    /**
+     * Set the routing weight associated to the connection.
+     *
+     * @param routingWeight the routingWeight value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withRoutingWeight(Integer routingWeight) {
+        this.routingWeight = routingWeight;
+        return this;
+    }
+
+    /**
+     * Get enable internet security.
+     *
+     * @return the enableInternetSecurity value
+     */
+    public Boolean enableInternetSecurity() {
+        return this.enableInternetSecurity;
+    }
+
+    /**
+     * Set enable internet security.
+     *
+     * @param enableInternetSecurity the enableInternetSecurity value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withEnableInternetSecurity(Boolean enableInternetSecurity) {
+        this.enableInternetSecurity = enableInternetSecurity;
+        return this;
+    }
+
+    /**
+     * Get the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @return the routingConfiguration value
+     */
+    public RoutingConfiguration routingConfiguration() {
+        return this.routingConfiguration;
+    }
+
+    /**
+     * Set the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @param routingConfiguration the routingConfiguration value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.routingConfiguration = routingConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteConnectionInner object itself.
+     */
+    public ExpressRouteConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListImpl.java
new file mode 100644
index 000000000000..73df44fe1bc0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnectionList;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class ExpressRouteConnectionListImpl extends WrapperImpl<ExpressRouteConnectionListInner> implements ExpressRouteConnectionList {
+    private final NetworkManager manager;
+    ExpressRouteConnectionListImpl(ExpressRouteConnectionListInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ExpressRouteConnectionInner> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListInner.java
new file mode 100644
index 000000000000..962060c680c0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionListInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ExpressRouteConnection list.
+ */
+public class ExpressRouteConnectionListInner {
+    /**
+     * The list of ExpressRoute connections.
+     */
+    @JsonProperty(value = "value")
+    private List<ExpressRouteConnectionInner> value;
+
+    /**
+     * Get the list of ExpressRoute connections.
+     *
+     * @return the value value
+     */
+    public List<ExpressRouteConnectionInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the list of ExpressRoute connections.
+     *
+     * @param value the value value to set
+     * @return the ExpressRouteConnectionListInner object itself.
+     */
+    public ExpressRouteConnectionListInner withValue(List<ExpressRouteConnectionInner> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsImpl.java
new file mode 100644
index 000000000000..8295221990d7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsImpl.java
@@ -0,0 +1,79 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnections;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnectionList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnection;
+
+class ExpressRouteConnectionsImpl extends WrapperImpl<ExpressRouteConnectionsInner> implements ExpressRouteConnections {
+    private final NetworkManager manager;
+
+    ExpressRouteConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ExpressRouteConnectionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ExpressRouteConnectionImpl wrapModel(ExpressRouteConnectionInner inner) {
+        return  new ExpressRouteConnectionImpl(inner, manager());
+    }
+
+    private ExpressRouteConnectionImpl wrapModel(String name) {
+        return new ExpressRouteConnectionImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteConnectionList> listAsync(String resourceGroupName, String expressRouteGatewayName) {
+        ExpressRouteConnectionsInner client = this.inner();
+        return client.listAsync(resourceGroupName, expressRouteGatewayName)
+        .map(new Func1<ExpressRouteConnectionListInner, ExpressRouteConnectionList>() {
+            @Override
+            public ExpressRouteConnectionList call(ExpressRouteConnectionListInner inner) {
+                return new ExpressRouteConnectionListImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteConnection> getAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        ExpressRouteConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, expressRouteGatewayName, connectionName)
+        .flatMap(new Func1<ExpressRouteConnectionInner, Observable<ExpressRouteConnection>>() {
+            @Override
+            public Observable<ExpressRouteConnection> call(ExpressRouteConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        ExpressRouteConnectionsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, expressRouteGatewayName, connectionName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsInner.java
new file mode 100644
index 000000000000..298cb88f5009
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteConnectionsInner.java
@@ -0,0 +1,606 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+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 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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ExpressRouteConnections.
+ */
+public class ExpressRouteConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnections createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("connectionName") String connectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteConnectionInner putExpressRouteConnectionParameters, @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.network.v2020_04_01.ExpressRouteConnections beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("connectionName") String connectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteConnectionInner putExpressRouteConnectionParameters, @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.network.v2020_04_01.ExpressRouteConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteConnections delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteConnections beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.ExpressRouteConnections list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT 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 ExpressRouteConnectionInner object if successful.
+     */
+    public ExpressRouteConnectionInner createOrUpdate(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @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<ExpressRouteConnectionInner> createOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters, final ServiceCallback<ExpressRouteConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteConnectionInner> createOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters).map(new Func1<ServiceResponse<ExpressRouteConnectionInner>, ExpressRouteConnectionInner>() {
+            @Override
+            public ExpressRouteConnectionInner call(ServiceResponse<ExpressRouteConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteConnectionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName 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 (putExpressRouteConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter putExpressRouteConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(putExpressRouteConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, expressRouteGatewayName, connectionName, this.client.subscriptionId(), putExpressRouteConnectionParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT 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 ExpressRouteConnectionInner object if successful.
+     */
+    public ExpressRouteConnectionInner beginCreateOrUpdate(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @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<ExpressRouteConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters, final ServiceCallback<ExpressRouteConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionInner object
+     */
+    public Observable<ExpressRouteConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName, putExpressRouteConnectionParameters).map(new Func1<ServiceResponse<ExpressRouteConnectionInner>, ExpressRouteConnectionInner>() {
+            @Override
+            public ExpressRouteConnectionInner call(ServiceResponse<ExpressRouteConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a connection between an ExpressRoute gateway and an ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @param putExpressRouteConnectionParameters Parameters required in an ExpressRouteConnection PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteConnectionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, ExpressRouteConnectionInner putExpressRouteConnectionParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName 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 (putExpressRouteConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter putExpressRouteConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(putExpressRouteConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, expressRouteGatewayName, connectionName, this.client.subscriptionId(), putExpressRouteConnectionParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteConnectionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteConnectionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteConnectionInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified ExpressRouteConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the ExpressRoute connection.
+     * @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 ExpressRouteConnectionInner object if successful.
+     */
+    public ExpressRouteConnectionInner get(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified ExpressRouteConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the ExpressRoute connection.
+     * @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<ExpressRouteConnectionInner> getAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName, final ServiceCallback<ExpressRouteConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified ExpressRouteConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the ExpressRoute connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionInner object
+     */
+    public Observable<ExpressRouteConnectionInner> getAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).map(new Func1<ServiceResponse<ExpressRouteConnectionInner>, ExpressRouteConnectionInner>() {
+            @Override
+            public ExpressRouteConnectionInner call(ServiceResponse<ExpressRouteConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified ExpressRouteConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the ExpressRoute connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, expressRouteGatewayName, connectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @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 expressRouteGatewayName, String connectionName) {
+        deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @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 expressRouteGatewayName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, expressRouteGatewayName, connectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @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 expressRouteGatewayName, String connectionName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @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 expressRouteGatewayName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a connection to a ExpressRoute circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param connectionName The name of the connection subresource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, expressRouteGatewayName, connectionName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Lists ExpressRouteConnections.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 ExpressRouteConnectionListInner object if successful.
+     */
+    public ExpressRouteConnectionListInner list(String resourceGroupName, String expressRouteGatewayName) {
+        return listWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Lists ExpressRouteConnections.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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<ExpressRouteConnectionListInner> listAsync(String resourceGroupName, String expressRouteGatewayName, final ServiceCallback<ExpressRouteConnectionListInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName), serviceCallback);
+    }
+
+    /**
+     * Lists ExpressRouteConnections.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionListInner object
+     */
+    public Observable<ExpressRouteConnectionListInner> listAsync(String resourceGroupName, String expressRouteGatewayName) {
+        return listWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).map(new Func1<ServiceResponse<ExpressRouteConnectionListInner>, ExpressRouteConnectionListInner>() {
+            @Override
+            public ExpressRouteConnectionListInner call(ServiceResponse<ExpressRouteConnectionListInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists ExpressRouteConnections.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteConnectionListInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteConnectionListInner>> listWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteConnectionListInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteConnectionListInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteConnectionListInner> clientResponse = listDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteConnectionListInner> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteConnectionListInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteConnectionListInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionImpl.java
new file mode 100644
index 000000000000..74eb83a4f287
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnection;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitReference;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceProviderProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeering;
+
+class ExpressRouteCrossConnectionImpl extends GroupableResourceCoreImpl<ExpressRouteCrossConnection, ExpressRouteCrossConnectionInner, ExpressRouteCrossConnectionImpl, NetworkManager> implements ExpressRouteCrossConnection, ExpressRouteCrossConnection.Definition, ExpressRouteCrossConnection.Update {
+    ExpressRouteCrossConnectionImpl(String name, ExpressRouteCrossConnectionInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnection> createResourceAsync() {
+        ExpressRouteCrossConnectionsInner client = this.manager().inner().expressRouteCrossConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnection> updateResourceAsync() {
+        ExpressRouteCrossConnectionsInner client = this.manager().inner().expressRouteCrossConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCrossConnectionInner> getInnerAsync() {
+        ExpressRouteCrossConnectionsInner client = this.manager().inner().expressRouteCrossConnections();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Integer bandwidthInMbps() {
+        return this.inner().bandwidthInMbps();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ExpressRouteCircuitReference expressRouteCircuit() {
+        return this.inner().expressRouteCircuit();
+    }
+
+    @Override
+    public String peeringLocation() {
+        return this.inner().peeringLocation();
+    }
+
+    @Override
+    public List<ExpressRouteCrossConnectionPeering> peerings() {
+        List<ExpressRouteCrossConnectionPeering> lst = new ArrayList<ExpressRouteCrossConnectionPeering>();
+        if (this.inner().peerings() != null) {
+            for (ExpressRouteCrossConnectionPeeringInner inner : this.inner().peerings()) {
+                lst.add( new ExpressRouteCrossConnectionPeeringImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String primaryAzurePort() {
+        return this.inner().primaryAzurePort();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String secondaryAzurePort() {
+        return this.inner().secondaryAzurePort();
+    }
+
+    @Override
+    public String serviceProviderNotes() {
+        return this.inner().serviceProviderNotes();
+    }
+
+    @Override
+    public ServiceProviderProvisioningState serviceProviderProvisioningState() {
+        return this.inner().serviceProviderProvisioningState();
+    }
+
+    @Override
+    public Integer sTag() {
+        return this.inner().sTag();
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withBandwidthInMbps(Integer bandwidthInMbps) {
+        this.inner().withBandwidthInMbps(bandwidthInMbps);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit) {
+        this.inner().withExpressRouteCircuit(expressRouteCircuit);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withPeeringLocation(String peeringLocation) {
+        this.inner().withPeeringLocation(peeringLocation);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings) {
+        this.inner().withPeerings(peerings);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withServiceProviderNotes(String serviceProviderNotes) {
+        this.inner().withServiceProviderNotes(serviceProviderNotes);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState) {
+        this.inner().withServiceProviderProvisioningState(serviceProviderProvisioningState);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionInner.java
new file mode 100644
index 000000000000..5057c8b4205d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionInner.java
@@ -0,0 +1,286 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitReference;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceProviderProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * ExpressRouteCrossConnection resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRouteCrossConnectionInner extends Resource {
+    /**
+     * The name of the primary port.
+     */
+    @JsonProperty(value = "properties.primaryAzurePort", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryAzurePort;
+
+    /**
+     * The name of the secondary port.
+     */
+    @JsonProperty(value = "properties.secondaryAzurePort", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryAzurePort;
+
+    /**
+     * The identifier of the circuit traffic.
+     */
+    @JsonProperty(value = "properties.sTag", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer sTag;
+
+    /**
+     * The peering location of the ExpressRoute circuit.
+     */
+    @JsonProperty(value = "properties.peeringLocation")
+    private String peeringLocation;
+
+    /**
+     * The circuit bandwidth In Mbps.
+     */
+    @JsonProperty(value = "properties.bandwidthInMbps")
+    private Integer bandwidthInMbps;
+
+    /**
+     * The ExpressRouteCircuit.
+     */
+    @JsonProperty(value = "properties.expressRouteCircuit")
+    private ExpressRouteCircuitReference expressRouteCircuit;
+
+    /**
+     * The provisioning state of the circuit in the connectivity provider
+     * system. Possible values include: 'NotProvisioned', 'Provisioning',
+     * 'Provisioned', 'Deprovisioning'.
+     */
+    @JsonProperty(value = "properties.serviceProviderProvisioningState")
+    private ServiceProviderProvisioningState serviceProviderProvisioningState;
+
+    /**
+     * Additional read only notes set by the connectivity provider.
+     */
+    @JsonProperty(value = "properties.serviceProviderNotes")
+    private String serviceProviderNotes;
+
+    /**
+     * The provisioning state of the express route cross connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The list of peerings.
+     */
+    @JsonProperty(value = "properties.peerings")
+    private List<ExpressRouteCrossConnectionPeeringInner> peerings;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the name of the primary port.
+     *
+     * @return the primaryAzurePort value
+     */
+    public String primaryAzurePort() {
+        return this.primaryAzurePort;
+    }
+
+    /**
+     * Get the name of the secondary port.
+     *
+     * @return the secondaryAzurePort value
+     */
+    public String secondaryAzurePort() {
+        return this.secondaryAzurePort;
+    }
+
+    /**
+     * Get the identifier of the circuit traffic.
+     *
+     * @return the sTag value
+     */
+    public Integer sTag() {
+        return this.sTag;
+    }
+
+    /**
+     * Get the peering location of the ExpressRoute circuit.
+     *
+     * @return the peeringLocation value
+     */
+    public String peeringLocation() {
+        return this.peeringLocation;
+    }
+
+    /**
+     * Set the peering location of the ExpressRoute circuit.
+     *
+     * @param peeringLocation the peeringLocation value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withPeeringLocation(String peeringLocation) {
+        this.peeringLocation = peeringLocation;
+        return this;
+    }
+
+    /**
+     * Get the circuit bandwidth In Mbps.
+     *
+     * @return the bandwidthInMbps value
+     */
+    public Integer bandwidthInMbps() {
+        return this.bandwidthInMbps;
+    }
+
+    /**
+     * Set the circuit bandwidth In Mbps.
+     *
+     * @param bandwidthInMbps the bandwidthInMbps value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withBandwidthInMbps(Integer bandwidthInMbps) {
+        this.bandwidthInMbps = bandwidthInMbps;
+        return this;
+    }
+
+    /**
+     * Get the ExpressRouteCircuit.
+     *
+     * @return the expressRouteCircuit value
+     */
+    public ExpressRouteCircuitReference expressRouteCircuit() {
+        return this.expressRouteCircuit;
+    }
+
+    /**
+     * Set the ExpressRouteCircuit.
+     *
+     * @param expressRouteCircuit the expressRouteCircuit value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit) {
+        this.expressRouteCircuit = expressRouteCircuit;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'.
+     *
+     * @return the serviceProviderProvisioningState value
+     */
+    public ServiceProviderProvisioningState serviceProviderProvisioningState() {
+        return this.serviceProviderProvisioningState;
+    }
+
+    /**
+     * Set the provisioning state of the circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'.
+     *
+     * @param serviceProviderProvisioningState the serviceProviderProvisioningState value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState) {
+        this.serviceProviderProvisioningState = serviceProviderProvisioningState;
+        return this;
+    }
+
+    /**
+     * Get additional read only notes set by the connectivity provider.
+     *
+     * @return the serviceProviderNotes value
+     */
+    public String serviceProviderNotes() {
+        return this.serviceProviderNotes;
+    }
+
+    /**
+     * Set additional read only notes set by the connectivity provider.
+     *
+     * @param serviceProviderNotes the serviceProviderNotes value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withServiceProviderNotes(String serviceProviderNotes) {
+        this.serviceProviderNotes = serviceProviderNotes;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route cross connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the list of peerings.
+     *
+     * @return the peerings value
+     */
+    public List<ExpressRouteCrossConnectionPeeringInner> peerings() {
+        return this.peerings;
+    }
+
+    /**
+     * Set the list of peerings.
+     *
+     * @param peerings the peerings value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings) {
+        this.peerings = peerings;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteCrossConnectionInner object itself.
+     */
+    public ExpressRouteCrossConnectionInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringImpl.java
new file mode 100644
index 000000000000..aa13a36d6e99
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringImpl.java
@@ -0,0 +1,246 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeering;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6ExpressRouteCircuitPeeringConfig;
+
+class ExpressRouteCrossConnectionPeeringImpl extends CreatableUpdatableImpl<ExpressRouteCrossConnectionPeering, ExpressRouteCrossConnectionPeeringInner, ExpressRouteCrossConnectionPeeringImpl> implements ExpressRouteCrossConnectionPeering, ExpressRouteCrossConnectionPeering.Definition, ExpressRouteCrossConnectionPeering.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String crossConnectionName;
+    private String peeringName;
+
+    ExpressRouteCrossConnectionPeeringImpl(String name, NetworkManager manager) {
+        super(name, new ExpressRouteCrossConnectionPeeringInner());
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = name;
+        //
+    }
+
+    ExpressRouteCrossConnectionPeeringImpl(ExpressRouteCrossConnectionPeeringInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.crossConnectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCrossConnections");
+        this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnectionPeering> createResourceAsync() {
+        ExpressRouteCrossConnectionPeeringsInner client = this.manager().inner().expressRouteCrossConnectionPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.crossConnectionName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnectionPeering> updateResourceAsync() {
+        ExpressRouteCrossConnectionPeeringsInner client = this.manager().inner().expressRouteCrossConnectionPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.crossConnectionName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteCrossConnectionPeeringInner> getInnerAsync() {
+        ExpressRouteCrossConnectionPeeringsInner client = this.manager().inner().expressRouteCrossConnectionPeerings();
+        return client.getAsync(this.resourceGroupName, this.crossConnectionName, this.peeringName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Integer azureASN() {
+        return this.inner().azureASN();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String gatewayManagerEtag() {
+        return this.inner().gatewayManagerEtag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig() {
+        return this.inner().ipv6PeeringConfig();
+    }
+
+    @Override
+    public String lastModifiedBy() {
+        return this.inner().lastModifiedBy();
+    }
+
+    @Override
+    public ExpressRouteCircuitPeeringConfig microsoftPeeringConfig() {
+        return this.inner().microsoftPeeringConfig();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long peerASN() {
+        return this.inner().peerASN();
+    }
+
+    @Override
+    public ExpressRoutePeeringType peeringType() {
+        return this.inner().peeringType();
+    }
+
+    @Override
+    public String primaryAzurePort() {
+        return this.inner().primaryAzurePort();
+    }
+
+    @Override
+    public String primaryPeerAddressPrefix() {
+        return this.inner().primaryPeerAddressPrefix();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String secondaryAzurePort() {
+        return this.inner().secondaryAzurePort();
+    }
+
+    @Override
+    public String secondaryPeerAddressPrefix() {
+        return this.inner().secondaryPeerAddressPrefix();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public ExpressRoutePeeringState state() {
+        return this.inner().state();
+    }
+
+    @Override
+    public Integer vlanId() {
+        return this.inner().vlanId();
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withExistingExpressRouteCrossConnection(String resourceGroupName, String crossConnectionName) {
+        this.resourceGroupName = resourceGroupName;
+        this.crossConnectionName = crossConnectionName;
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.inner().withGatewayManagerEtag(gatewayManagerEtag);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig) {
+        this.inner().withIpv6PeeringConfig(ipv6PeeringConfig);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig) {
+        this.inner().withMicrosoftPeeringConfig(microsoftPeeringConfig);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withPeerASN(Long peerASN) {
+        this.inner().withPeerASN(peerASN);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withPeeringType(ExpressRoutePeeringType peeringType) {
+        this.inner().withPeeringType(peeringType);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix) {
+        this.inner().withPrimaryPeerAddressPrefix(primaryPeerAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix) {
+        this.inner().withSecondaryPeerAddressPrefix(secondaryPeerAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withSharedKey(String sharedKey) {
+        this.inner().withSharedKey(sharedKey);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withState(ExpressRoutePeeringState state) {
+        this.inner().withState(state);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl withVlanId(Integer vlanId) {
+        this.inner().withVlanId(vlanId);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringInner.java
new file mode 100644
index 000000000000..7ae8e5358694
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringInner.java
@@ -0,0 +1,405 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeeringConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.Ipv6ExpressRouteCircuitPeeringConfig;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Peering in an ExpressRoute Cross Connection resource.
+ */
+@JsonFlatten
+public class ExpressRouteCrossConnectionPeeringInner extends SubResource {
+    /**
+     * The peering type. Possible values include: 'AzurePublicPeering',
+     * 'AzurePrivatePeering', 'MicrosoftPeering'.
+     */
+    @JsonProperty(value = "properties.peeringType")
+    private ExpressRoutePeeringType peeringType;
+
+    /**
+     * The peering state. Possible values include: 'Disabled', 'Enabled'.
+     */
+    @JsonProperty(value = "properties.state")
+    private ExpressRoutePeeringState state;
+
+    /**
+     * The Azure ASN.
+     */
+    @JsonProperty(value = "properties.azureASN", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer azureASN;
+
+    /**
+     * The peer ASN.
+     */
+    @JsonProperty(value = "properties.peerASN")
+    private Long peerASN;
+
+    /**
+     * The primary address prefix.
+     */
+    @JsonProperty(value = "properties.primaryPeerAddressPrefix")
+    private String primaryPeerAddressPrefix;
+
+    /**
+     * The secondary address prefix.
+     */
+    @JsonProperty(value = "properties.secondaryPeerAddressPrefix")
+    private String secondaryPeerAddressPrefix;
+
+    /**
+     * The primary port.
+     */
+    @JsonProperty(value = "properties.primaryAzurePort", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryAzurePort;
+
+    /**
+     * The secondary port.
+     */
+    @JsonProperty(value = "properties.secondaryAzurePort", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryAzurePort;
+
+    /**
+     * The shared key.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * The VLAN ID.
+     */
+    @JsonProperty(value = "properties.vlanId")
+    private Integer vlanId;
+
+    /**
+     * The Microsoft peering configuration.
+     */
+    @JsonProperty(value = "properties.microsoftPeeringConfig")
+    private ExpressRouteCircuitPeeringConfig microsoftPeeringConfig;
+
+    /**
+     * The provisioning state of the express route cross connection peering
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The GatewayManager Etag.
+     */
+    @JsonProperty(value = "properties.gatewayManagerEtag")
+    private String gatewayManagerEtag;
+
+    /**
+     * Who was the last to modify the peering.
+     */
+    @JsonProperty(value = "properties.lastModifiedBy", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastModifiedBy;
+
+    /**
+     * The IPv6 peering configuration.
+     */
+    @JsonProperty(value = "properties.ipv6PeeringConfig")
+    private Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'.
+     *
+     * @return the peeringType value
+     */
+    public ExpressRoutePeeringType peeringType() {
+        return this.peeringType;
+    }
+
+    /**
+     * Set the peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'.
+     *
+     * @param peeringType the peeringType value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withPeeringType(ExpressRoutePeeringType peeringType) {
+        this.peeringType = peeringType;
+        return this;
+    }
+
+    /**
+     * Get the peering state. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @return the state value
+     */
+    public ExpressRoutePeeringState state() {
+        return this.state;
+    }
+
+    /**
+     * Set the peering state. Possible values include: 'Disabled', 'Enabled'.
+     *
+     * @param state the state value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withState(ExpressRoutePeeringState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get the Azure ASN.
+     *
+     * @return the azureASN value
+     */
+    public Integer azureASN() {
+        return this.azureASN;
+    }
+
+    /**
+     * Get the peer ASN.
+     *
+     * @return the peerASN value
+     */
+    public Long peerASN() {
+        return this.peerASN;
+    }
+
+    /**
+     * Set the peer ASN.
+     *
+     * @param peerASN the peerASN value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withPeerASN(Long peerASN) {
+        this.peerASN = peerASN;
+        return this;
+    }
+
+    /**
+     * Get the primary address prefix.
+     *
+     * @return the primaryPeerAddressPrefix value
+     */
+    public String primaryPeerAddressPrefix() {
+        return this.primaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the primary address prefix.
+     *
+     * @param primaryPeerAddressPrefix the primaryPeerAddressPrefix value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix) {
+        this.primaryPeerAddressPrefix = primaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the secondary address prefix.
+     *
+     * @return the secondaryPeerAddressPrefix value
+     */
+    public String secondaryPeerAddressPrefix() {
+        return this.secondaryPeerAddressPrefix;
+    }
+
+    /**
+     * Set the secondary address prefix.
+     *
+     * @param secondaryPeerAddressPrefix the secondaryPeerAddressPrefix value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix) {
+        this.secondaryPeerAddressPrefix = secondaryPeerAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the primary port.
+     *
+     * @return the primaryAzurePort value
+     */
+    public String primaryAzurePort() {
+        return this.primaryAzurePort;
+    }
+
+    /**
+     * Get the secondary port.
+     *
+     * @return the secondaryAzurePort value
+     */
+    public String secondaryAzurePort() {
+        return this.secondaryAzurePort;
+    }
+
+    /**
+     * Get the shared key.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set the shared key.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get the VLAN ID.
+     *
+     * @return the vlanId value
+     */
+    public Integer vlanId() {
+        return this.vlanId;
+    }
+
+    /**
+     * Set the VLAN ID.
+     *
+     * @param vlanId the vlanId value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withVlanId(Integer vlanId) {
+        this.vlanId = vlanId;
+        return this;
+    }
+
+    /**
+     * Get the Microsoft peering configuration.
+     *
+     * @return the microsoftPeeringConfig value
+     */
+    public ExpressRouteCircuitPeeringConfig microsoftPeeringConfig() {
+        return this.microsoftPeeringConfig;
+    }
+
+    /**
+     * Set the Microsoft peering configuration.
+     *
+     * @param microsoftPeeringConfig the microsoftPeeringConfig value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig) {
+        this.microsoftPeeringConfig = microsoftPeeringConfig;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route cross connection peering resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the GatewayManager Etag.
+     *
+     * @return the gatewayManagerEtag value
+     */
+    public String gatewayManagerEtag() {
+        return this.gatewayManagerEtag;
+    }
+
+    /**
+     * Set the GatewayManager Etag.
+     *
+     * @param gatewayManagerEtag the gatewayManagerEtag value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withGatewayManagerEtag(String gatewayManagerEtag) {
+        this.gatewayManagerEtag = gatewayManagerEtag;
+        return this;
+    }
+
+    /**
+     * Get who was the last to modify the peering.
+     *
+     * @return the lastModifiedBy value
+     */
+    public String lastModifiedBy() {
+        return this.lastModifiedBy;
+    }
+
+    /**
+     * Get the IPv6 peering configuration.
+     *
+     * @return the ipv6PeeringConfig value
+     */
+    public Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig() {
+        return this.ipv6PeeringConfig;
+    }
+
+    /**
+     * Set the IPv6 peering configuration.
+     *
+     * @param ipv6PeeringConfig the ipv6PeeringConfig value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig) {
+        this.ipv6PeeringConfig = ipv6PeeringConfig;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteCrossConnectionPeeringInner object itself.
+     */
+    public ExpressRouteCrossConnectionPeeringInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsImpl.java
new file mode 100644
index 000000000000..1048bca8216c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeerings;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeering;
+
+class ExpressRouteCrossConnectionPeeringsImpl extends WrapperImpl<ExpressRouteCrossConnectionPeeringsInner> implements ExpressRouteCrossConnectionPeerings {
+    private final NetworkManager manager;
+
+    ExpressRouteCrossConnectionPeeringsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCrossConnectionPeerings());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionPeeringImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ExpressRouteCrossConnectionPeeringImpl wrapModel(ExpressRouteCrossConnectionPeeringInner inner) {
+        return  new ExpressRouteCrossConnectionPeeringImpl(inner, manager());
+    }
+
+    private ExpressRouteCrossConnectionPeeringImpl wrapModel(String name) {
+        return new ExpressRouteCrossConnectionPeeringImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnectionPeering> listAsync(final String resourceGroupName, final String crossConnectionName) {
+        ExpressRouteCrossConnectionPeeringsInner client = this.inner();
+        return client.listAsync(resourceGroupName, crossConnectionName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCrossConnectionPeeringInner>, Iterable<ExpressRouteCrossConnectionPeeringInner>>() {
+            @Override
+            public Iterable<ExpressRouteCrossConnectionPeeringInner> call(Page<ExpressRouteCrossConnectionPeeringInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCrossConnectionPeeringInner, ExpressRouteCrossConnectionPeering>() {
+            @Override
+            public ExpressRouteCrossConnectionPeering call(ExpressRouteCrossConnectionPeeringInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnectionPeering> getAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        ExpressRouteCrossConnectionPeeringsInner client = this.inner();
+        return client.getAsync(resourceGroupName, crossConnectionName, peeringName)
+        .flatMap(new Func1<ExpressRouteCrossConnectionPeeringInner, Observable<ExpressRouteCrossConnectionPeering>>() {
+            @Override
+            public Observable<ExpressRouteCrossConnectionPeering> call(ExpressRouteCrossConnectionPeeringInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteCrossConnectionPeering)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        ExpressRouteCrossConnectionPeeringsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, crossConnectionName, peeringName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsInner.java
new file mode 100644
index 000000000000..af99ad05f149
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionPeeringsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 ExpressRouteCrossConnectionPeerings.
+ */
+public class ExpressRouteCrossConnectionPeeringsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCrossConnectionPeeringsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCrossConnectionPeeringsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCrossConnectionPeeringsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCrossConnectionPeeringsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCrossConnectionPeerings to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCrossConnectionPeeringsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeerings list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCrossConnectionPeeringInner peeringParameters, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCrossConnectionPeeringInner peeringParameters, @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.network.v2020_04_01.ExpressRouteCrossConnectionPeerings listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @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;ExpressRouteCrossConnectionPeeringInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionPeeringInner> list(final String resourceGroupName, final String crossConnectionName) {
+        ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> response = listSinglePageAsync(resourceGroupName, crossConnectionName).toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionPeeringInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @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<ExpressRouteCrossConnectionPeeringInner>> listAsync(final String resourceGroupName, final String crossConnectionName, final ListOperationCallback<ExpressRouteCrossConnectionPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, crossConnectionName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionPeeringInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionPeeringInner>> listAsync(final String resourceGroupName, final String crossConnectionName) {
+        return listWithServiceResponseAsync(resourceGroupName, crossConnectionName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>, Page<ExpressRouteCrossConnectionPeeringInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionPeeringInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String crossConnectionName) {
+        return listSinglePageAsync(resourceGroupName, crossConnectionName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> listSinglePageAsync(final String resourceGroupName, final String crossConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, crossConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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 crossConnectionName, String peeringName) {
+        deleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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 crossConnectionName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, crossConnectionName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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 crossConnectionName, String peeringName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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 crossConnectionName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, crossConnectionName, peeringName, this.client.subscriptionId(), 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 specified peering for the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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 ExpressRouteCrossConnectionPeeringInner object if successful.
+     */
+    public ExpressRouteCrossConnectionPeeringInner get(String resourceGroupName, String crossConnectionName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified peering for the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @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<ExpressRouteCrossConnectionPeeringInner> getAsync(String resourceGroupName, String crossConnectionName, String peeringName, final ServiceCallback<ExpressRouteCrossConnectionPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified peering for the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionPeeringInner object
+     */
+    public Observable<ExpressRouteCrossConnectionPeeringInner> getAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>, ExpressRouteCrossConnectionPeeringInner>() {
+            @Override
+            public ExpressRouteCrossConnectionPeeringInner call(ServiceResponse<ExpressRouteCrossConnectionPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified peering for the ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionPeeringInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>> getWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, crossConnectionName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionPeeringInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionPeeringInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering 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 ExpressRouteCrossConnectionPeeringInner object if successful.
+     */
+    public ExpressRouteCrossConnectionPeeringInner createOrUpdate(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @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<ExpressRouteCrossConnectionPeeringInner> createOrUpdateAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters, final ServiceCallback<ExpressRouteCrossConnectionPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCrossConnectionPeeringInner> createOrUpdateAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>, ExpressRouteCrossConnectionPeeringInner>() {
+            @Override
+            public ExpressRouteCrossConnectionPeeringInner call(ServiceResponse<ExpressRouteCrossConnectionPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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 (peeringParameters == null) {
+            throw new IllegalArgumentException("Parameter peeringParameters is required and cannot be null.");
+        }
+        Validator.validate(peeringParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, crossConnectionName, peeringName, this.client.subscriptionId(), peeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCrossConnectionPeeringInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering 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 ExpressRouteCrossConnectionPeeringInner object if successful.
+     */
+    public ExpressRouteCrossConnectionPeeringInner beginCreateOrUpdate(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @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<ExpressRouteCrossConnectionPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters, final ServiceCallback<ExpressRouteCrossConnectionPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionPeeringInner object
+     */
+    public Observable<ExpressRouteCrossConnectionPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, peeringParameters).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>, ExpressRouteCrossConnectionPeeringInner>() {
+            @Override
+            public ExpressRouteCrossConnectionPeeringInner call(ServiceResponse<ExpressRouteCrossConnectionPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param peeringParameters Parameters supplied to the create or update ExpressRouteCrossConnection peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionPeeringInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, ExpressRouteCrossConnectionPeeringInner peeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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 (peeringParameters == null) {
+            throw new IllegalArgumentException("Parameter peeringParameters is required and cannot be null.");
+        }
+        Validator.validate(peeringParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, crossConnectionName, peeringName, this.client.subscriptionId(), peeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionPeeringInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionPeeringInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionPeeringInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteCrossConnectionPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @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;ExpressRouteCrossConnectionPeeringInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionPeeringInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionPeeringInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @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<ExpressRouteCrossConnectionPeeringInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCrossConnectionPeeringInner>> serviceFuture, final ListOperationCallback<ExpressRouteCrossConnectionPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @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;ExpressRouteCrossConnectionPeeringInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionPeeringInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>, Page<ExpressRouteCrossConnectionPeeringInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionPeeringInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+     * @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;ExpressRouteCrossConnectionPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all peerings in a specified ExpressRouteCrossConnection.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> 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<ExpressRouteCrossConnectionPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionPeeringInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsImpl.java
new file mode 100644
index 000000000000..eb95c7841d08
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsImpl.java
@@ -0,0 +1,140 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnections;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnection;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsArpTableListResult;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionsRoutesTableSummaryListResult;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitsRoutesTableListResult;
+
+class ExpressRouteCrossConnectionsImpl extends GroupableResourcesCoreImpl<ExpressRouteCrossConnection, ExpressRouteCrossConnectionImpl, ExpressRouteCrossConnectionInner, ExpressRouteCrossConnectionsInner, NetworkManager>  implements ExpressRouteCrossConnections {
+    protected ExpressRouteCrossConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteCrossConnections(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRouteCrossConnectionInner> getInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteCrossConnectionsInner 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<ExpressRouteCrossConnection> listByResourceGroup(String resourceGroupName) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnection> listByResourceGroupAsync(String resourceGroupName) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ExpressRouteCrossConnectionInner>, Iterable<ExpressRouteCrossConnectionInner>>() {
+            @Override
+            public Iterable<ExpressRouteCrossConnectionInner> call(Page<ExpressRouteCrossConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCrossConnectionInner, ExpressRouteCrossConnection>() {
+            @Override
+            public ExpressRouteCrossConnection call(ExpressRouteCrossConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ExpressRouteCrossConnection> list() {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnection> listAsync() {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ExpressRouteCrossConnectionInner>, Iterable<ExpressRouteCrossConnectionInner>>() {
+            @Override
+            public Iterable<ExpressRouteCrossConnectionInner> call(Page<ExpressRouteCrossConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteCrossConnectionInner, ExpressRouteCrossConnection>() {
+            @Override
+            public ExpressRouteCrossConnection call(ExpressRouteCrossConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ExpressRouteCrossConnectionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ExpressRouteCrossConnectionImpl wrapModel(ExpressRouteCrossConnectionInner inner) {
+        return  new ExpressRouteCrossConnectionImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRouteCrossConnectionImpl wrapModel(String name) {
+        return new ExpressRouteCrossConnectionImpl(name, new ExpressRouteCrossConnectionInner(), this.manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitsArpTableListResult> listArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.listArpTableAsync(resourceGroupName, crossConnectionName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCircuitsArpTableListResultInner, ExpressRouteCircuitsArpTableListResult>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResult call(ExpressRouteCircuitsArpTableListResultInner inner) {
+                return new ExpressRouteCircuitsArpTableListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCrossConnectionsRoutesTableSummaryListResult> listRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.listRoutesTableSummaryAsync(resourceGroupName, crossConnectionName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner, ExpressRouteCrossConnectionsRoutesTableSummaryListResult>() {
+            @Override
+            public ExpressRouteCrossConnectionsRoutesTableSummaryListResult call(ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner inner) {
+                return new ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteCircuitsRoutesTableListResult> listRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        ExpressRouteCrossConnectionsInner client = this.inner();
+        return client.listRoutesTableAsync(resourceGroupName, crossConnectionName, peeringName, devicePath)
+        .map(new Func1<ExpressRouteCircuitsRoutesTableListResultInner, ExpressRouteCircuitsRoutesTableListResult>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResult call(ExpressRouteCircuitsRoutesTableListResultInner inner) {
+                return new ExpressRouteCircuitsRoutesTableListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsInner.java
new file mode 100644
index 000000000000..43117e6d8998
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsInner.java
@@ -0,0 +1,1531 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+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.network.v2020_04_01.TagsObject;
+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 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.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ExpressRouteCrossConnections.
+ */
+public class ExpressRouteCrossConnectionsInner implements InnerSupportsGet<ExpressRouteCrossConnectionInner>, InnerSupportsListing<ExpressRouteCrossConnectionInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteCrossConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteCrossConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteCrossConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteCrossConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteCrossConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteCrossConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnections list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteCrossConnections")
+        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.network.v2020_04_01.ExpressRouteCrossConnections listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections")
+        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.network.v2020_04_01.ExpressRouteCrossConnections getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @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.network.v2020_04_01.ExpressRouteCrossConnections createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCrossConnectionInner 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.network.v2020_04_01.ExpressRouteCrossConnections beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteCrossConnectionInner 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.network.v2020_04_01.ExpressRouteCrossConnections updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject crossConnectionParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnections listArpTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/arpTables/{devicePath}")
+        Observable<Response<ResponseBody>> listArpTable(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections beginListArpTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/arpTables/{devicePath}")
+        Observable<Response<ResponseBody>> beginListArpTable(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections listRoutesTableSummary" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/routeTablesSummary/{devicePath}")
+        Observable<Response<ResponseBody>> listRoutesTableSummary(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections beginListRoutesTableSummary" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/routeTablesSummary/{devicePath}")
+        Observable<Response<ResponseBody>> beginListRoutesTableSummary(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections listRoutesTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/routeTables/{devicePath}")
+        Observable<Response<ResponseBody>> listRoutesTable(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections beginListRoutesTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings/{peeringName}/routeTables/{devicePath}")
+        Observable<Response<ResponseBody>> beginListRoutesTable(@Path("resourceGroupName") String resourceGroupName, @Path("crossConnectionName") String crossConnectionName, @Path("peeringName") String peeringName, @Path("devicePath") String devicePath, @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.network.v2020_04_01.ExpressRouteCrossConnections 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.network.v2020_04_01.ExpressRouteCrossConnections listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a 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;ExpressRouteCrossConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionInner> list() {
+        ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a 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<ExpressRouteCrossConnectionInner>> listAsync(final ListOperationCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Page<ExpressRouteCrossConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ExpressRouteCrossConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ExpressRouteCrossConnectionInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Page<ExpressRouteCrossConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets details about the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group (peering location of the circuit).
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection (service key of the circuit).
+     * @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 ExpressRouteCrossConnectionInner object if successful.
+     */
+    public ExpressRouteCrossConnectionInner getByResourceGroup(String resourceGroupName, String crossConnectionName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, crossConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets details about the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group (peering location of the circuit).
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection (service key of the circuit).
+     * @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<ExpressRouteCrossConnectionInner> getByResourceGroupAsync(String resourceGroupName, String crossConnectionName, final ServiceCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, crossConnectionName), serviceCallback);
+    }
+
+    /**
+     * Gets details about the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group (peering location of the circuit).
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection (service key of the circuit).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ExpressRouteCrossConnectionInner> getByResourceGroupAsync(String resourceGroupName, String crossConnectionName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, crossConnectionName).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionInner>, ExpressRouteCrossConnectionInner>() {
+            @Override
+            public ExpressRouteCrossConnectionInner call(ServiceResponse<ExpressRouteCrossConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets details about the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group (peering location of the circuit).
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection (service key of the circuit).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String crossConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, crossConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection 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 ExpressRouteCrossConnectionInner object if successful.
+     */
+    public ExpressRouteCrossConnectionInner createOrUpdate(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @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<ExpressRouteCrossConnectionInner> createOrUpdateAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters, final ServiceCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCrossConnectionInner> createOrUpdateAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionInner>, ExpressRouteCrossConnectionInner>() {
+            @Override
+            public ExpressRouteCrossConnectionInner call(ServiceResponse<ExpressRouteCrossConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, crossConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteCrossConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection 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 ExpressRouteCrossConnectionInner object if successful.
+     */
+    public ExpressRouteCrossConnectionInner beginCreateOrUpdate(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @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<ExpressRouteCrossConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters, final ServiceCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ExpressRouteCrossConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, crossConnectionName, parameters).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionInner>, ExpressRouteCrossConnectionInner>() {
+            @Override
+            public ExpressRouteCrossConnectionInner call(ServiceResponse<ExpressRouteCrossConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update the specified ExpressRouteCrossConnection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param parameters Parameters supplied to the update express route crossConnection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, ExpressRouteCrossConnectionInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, crossConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @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 ExpressRouteCrossConnectionInner object if successful.
+     */
+    public ExpressRouteCrossConnectionInner updateTags(String resourceGroupName, String crossConnectionName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @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<ExpressRouteCrossConnectionInner> updateTagsAsync(String resourceGroupName, String crossConnectionName, final ServiceCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName), serviceCallback);
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ExpressRouteCrossConnectionInner> updateTagsAsync(String resourceGroupName, String crossConnectionName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionInner>, ExpressRouteCrossConnectionInner>() {
+            @Override
+            public ExpressRouteCrossConnectionInner call(ServiceResponse<ExpressRouteCrossConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String crossConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject crossConnectionParameters = new TagsObject();
+        crossConnectionParameters.withTags(null);
+        return service.updateTags(resourceGroupName, crossConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), crossConnectionParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @param tags Resource tags.
+     * @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 ExpressRouteCrossConnectionInner object if successful.
+     */
+    public ExpressRouteCrossConnectionInner updateTags(String resourceGroupName, String crossConnectionName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @param tags Resource tags.
+     * @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<ExpressRouteCrossConnectionInner> updateTagsAsync(String resourceGroupName, String crossConnectionName, Map<String, String> tags, final ServiceCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ExpressRouteCrossConnectionInner> updateTagsAsync(String resourceGroupName, String crossConnectionName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, crossConnectionName, tags).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionInner>, ExpressRouteCrossConnectionInner>() {
+            @Override
+            public ExpressRouteCrossConnectionInner call(ServiceResponse<ExpressRouteCrossConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an express route cross connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the cross connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject crossConnectionParameters = new TagsObject();
+        crossConnectionParameters.withTags(tags);
+        return service.updateTags(resourceGroupName, crossConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), crossConnectionParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsArpTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner listArpTable(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsArpTableListResultInner> listArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsArpTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitsArpTableListResultInner> listArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>, ExpressRouteCircuitsArpTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResultInner call(ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> listArpTableWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listArpTable(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCircuitsArpTableListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsArpTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsArpTableListResultInner beginListArpTable(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsArpTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsArpTableListResultInner object
+     */
+    public Observable<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListArpTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>, ExpressRouteCircuitsArpTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsArpTableListResultInner call(ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised ARP table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsArpTableListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> beginListArpTableWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListArpTable(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitsArpTableListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> clientResponse = beginListArpTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitsArpTableListResultInner> beginListArpTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitsArpTableListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitsArpTableListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner object if successful.
+     */
+    public ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner listRoutesTableSummary(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> listRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> listRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>, ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>() {
+            @Override
+            public ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner call(ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>> listRoutesTableSummaryWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listRoutesTableSummary(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner object if successful.
+     */
+    public ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner beginListRoutesTableSummary(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner object
+     */
+    public Observable<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListRoutesTableSummaryWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>, ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>() {
+            @Override
+            public ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner call(ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the route table summary associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>> beginListRoutesTableSummaryWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListRoutesTableSummary(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> clientResponse = beginListRoutesTableSummaryDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> beginListRoutesTableSummaryDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner listRoutesTable(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableListResultInner> listRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableListResultInner> listRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return listRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>, ExpressRouteCircuitsRoutesTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> listRoutesTableWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listRoutesTable(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ExpressRouteCircuitsRoutesTableListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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 ExpressRouteCircuitsRoutesTableListResultInner object if successful.
+     */
+    public ExpressRouteCircuitsRoutesTableListResultInner beginListRoutesTable(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @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<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath, final ServiceCallback<ExpressRouteCircuitsRoutesTableListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath), serviceCallback);
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableListResultInner object
+     */
+    public Observable<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        return beginListRoutesTableWithServiceResponseAsync(resourceGroupName, crossConnectionName, peeringName, devicePath).map(new Func1<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>, ExpressRouteCircuitsRoutesTableListResultInner>() {
+            @Override
+            public ExpressRouteCircuitsRoutesTableListResultInner call(ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the currently advertised routes table associated with the express route cross connection in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param crossConnectionName The name of the ExpressRouteCrossConnection.
+     * @param peeringName The name of the peering.
+     * @param devicePath The path of the device.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteCircuitsRoutesTableListResultInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> beginListRoutesTableWithServiceResponseAsync(String resourceGroupName, String crossConnectionName, String peeringName, String devicePath) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (crossConnectionName == null) {
+            throw new IllegalArgumentException("Parameter crossConnectionName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (devicePath == null) {
+            throw new IllegalArgumentException("Parameter devicePath is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListRoutesTable(resourceGroupName, crossConnectionName, peeringName, devicePath, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> clientResponse = beginListRoutesTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteCircuitsRoutesTableListResultInner> beginListRoutesTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteCircuitsRoutesTableListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteCircuitsRoutesTableListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @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;ExpressRouteCrossConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @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<ExpressRouteCrossConnectionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCrossConnectionInner>> serviceFuture, final ListOperationCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @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;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Page<ExpressRouteCrossConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+     * @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;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a subscription.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> 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<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in 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;ExpressRouteCrossConnectionInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteCrossConnectionInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteCrossConnectionInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteCrossConnectionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in 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<ExpressRouteCrossConnectionInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteCrossConnectionInner>> serviceFuture, final ListOperationCallback<ExpressRouteCrossConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in 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;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<Page<ExpressRouteCrossConnectionInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Page<ExpressRouteCrossConnectionInner>>() {
+                @Override
+                public Page<ExpressRouteCrossConnectionInner> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in 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;ExpressRouteCrossConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>, Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(ServiceResponse<Page<ExpressRouteCrossConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all the ExpressRouteCrossConnections in a resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteCrossConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> 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<ExpressRouteCrossConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteCrossConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteCrossConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteCrossConnectionInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteCrossConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteCrossConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl.java
new file mode 100644
index 000000000000..b43cf5ff1e19
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionsRoutesTableSummaryListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionRoutesTableSummary;
+
+class ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl extends WrapperImpl<ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner> implements ExpressRouteCrossConnectionsRoutesTableSummaryListResult {
+    private final NetworkManager manager;
+    ExpressRouteCrossConnectionsRoutesTableSummaryListResultImpl(ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ExpressRouteCrossConnectionRoutesTableSummary> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner.java
new file mode 100644
index 000000000000..0a5e9e2a1ef5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionRoutesTableSummary;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ListRoutesTable associated with the Express Route Cross
+ * Connections.
+ */
+public class ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner {
+    /**
+     * A list of the routes table.
+     */
+    @JsonProperty(value = "value")
+    private List<ExpressRouteCrossConnectionRoutesTableSummary> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /**
+     * Get a list of the routes table.
+     *
+     * @return the value value
+     */
+    public List<ExpressRouteCrossConnectionRoutesTableSummary> value() {
+        return this.value;
+    }
+
+    /**
+     * Set a list of the routes table.
+     *
+     * @param value the value value to set
+     * @return the ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner object itself.
+     */
+    public ExpressRouteCrossConnectionsRoutesTableSummaryListResultInner withValue(List<ExpressRouteCrossConnectionRoutesTableSummary> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayImpl.java
new file mode 100644
index 000000000000..4727af028cdb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGateway;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGatewayPropertiesAutoScaleConfiguration;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubId;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnection;
+
+class ExpressRouteGatewayImpl extends GroupableResourceCoreImpl<ExpressRouteGateway, ExpressRouteGatewayInner, ExpressRouteGatewayImpl, NetworkManager> implements ExpressRouteGateway, ExpressRouteGateway.Definition, ExpressRouteGateway.Update {
+    ExpressRouteGatewayImpl(String name, ExpressRouteGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRouteGateway> createResourceAsync() {
+        ExpressRouteGatewaysInner client = this.manager().inner().expressRouteGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRouteGateway> updateResourceAsync() {
+        ExpressRouteGatewaysInner client = this.manager().inner().expressRouteGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRouteGatewayInner> getInnerAsync() {
+        ExpressRouteGatewaysInner client = this.manager().inner().expressRouteGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration() {
+        return this.inner().autoScaleConfiguration();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<ExpressRouteConnection> expressRouteConnections() {
+        List<ExpressRouteConnection> lst = new ArrayList<ExpressRouteConnection>();
+        if (this.inner().expressRouteConnections() != null) {
+            for (ExpressRouteConnectionInner inner : this.inner().expressRouteConnections()) {
+                lst.add( new ExpressRouteConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public VirtualHubId virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public ExpressRouteGatewayImpl withVirtualHub(VirtualHubId virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+    @Override
+    public ExpressRouteGatewayImpl withAutoScaleConfiguration(ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration) {
+        this.inner().withAutoScaleConfiguration(autoScaleConfiguration);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayInner.java
new file mode 100644
index 000000000000..546396b13557
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewayInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGatewayPropertiesAutoScaleConfiguration;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubId;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * ExpressRoute gateway resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRouteGatewayInner extends Resource {
+    /**
+     * Configuration for auto scaling.
+     */
+    @JsonProperty(value = "properties.autoScaleConfiguration")
+    private ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration;
+
+    /**
+     * List of ExpressRoute connections to the ExpressRoute gateway.
+     */
+    @JsonProperty(value = "properties.expressRouteConnections", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ExpressRouteConnectionInner> expressRouteConnections;
+
+    /**
+     * The provisioning state of the express route gateway resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The Virtual Hub where the ExpressRoute gateway is or will be deployed.
+     */
+    @JsonProperty(value = "properties.virtualHub", required = true)
+    private VirtualHubId virtualHub;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get configuration for auto scaling.
+     *
+     * @return the autoScaleConfiguration value
+     */
+    public ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration() {
+        return this.autoScaleConfiguration;
+    }
+
+    /**
+     * Set configuration for auto scaling.
+     *
+     * @param autoScaleConfiguration the autoScaleConfiguration value to set
+     * @return the ExpressRouteGatewayInner object itself.
+     */
+    public ExpressRouteGatewayInner withAutoScaleConfiguration(ExpressRouteGatewayPropertiesAutoScaleConfiguration autoScaleConfiguration) {
+        this.autoScaleConfiguration = autoScaleConfiguration;
+        return this;
+    }
+
+    /**
+     * Get list of ExpressRoute connections to the ExpressRoute gateway.
+     *
+     * @return the expressRouteConnections value
+     */
+    public List<ExpressRouteConnectionInner> expressRouteConnections() {
+        return this.expressRouteConnections;
+    }
+
+    /**
+     * Get the provisioning state of the express route gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the Virtual Hub where the ExpressRoute gateway is or will be deployed.
+     *
+     * @return the virtualHub value
+     */
+    public VirtualHubId virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the Virtual Hub where the ExpressRoute gateway is or will be deployed.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the ExpressRouteGatewayInner object itself.
+     */
+    public ExpressRouteGatewayInner withVirtualHub(VirtualHubId virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteGatewayInner object itself.
+     */
+    public ExpressRouteGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysImpl.java
new file mode 100644
index 000000000000..b7624728c7f4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGateways;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGateway;
+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;
+
+class ExpressRouteGatewaysImpl extends GroupableResourcesCoreImpl<ExpressRouteGateway, ExpressRouteGatewayImpl, ExpressRouteGatewayInner, ExpressRouteGatewaysInner, NetworkManager>  implements ExpressRouteGateways {
+    protected ExpressRouteGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteGateways(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRouteGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteGatewaysInner 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<ExpressRouteGateway> listByResourceGroup(String resourceGroupName) {
+        ExpressRouteGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ExpressRouteGateway> listByResourceGroupAsync(String resourceGroupName) {
+        ExpressRouteGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMap(new Func1<Page<ExpressRouteGatewayInner>, Observable<ExpressRouteGatewayInner>>() {
+            @Override
+            public Observable<ExpressRouteGatewayInner> call(Page<ExpressRouteGatewayInner> innerPage) {
+                return Observable.from(innerPage.items());
+            }
+        })
+        .map(new Func1<ExpressRouteGatewayInner, ExpressRouteGateway>() {
+            @Override
+            public ExpressRouteGateway call(ExpressRouteGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ExpressRouteGateway> list() {
+        ExpressRouteGatewaysInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRouteGateway> listAsync() {
+        ExpressRouteGatewaysInner client = this.inner();
+        return client.listAsync()
+        .flatMap(new Func1<Page<ExpressRouteGatewayInner>, Observable<ExpressRouteGatewayInner>>() {
+            @Override
+            public Observable<ExpressRouteGatewayInner> call(Page<ExpressRouteGatewayInner> innerPage) {
+                return Observable.from(innerPage.items());
+            }
+        })
+        .map(new Func1<ExpressRouteGatewayInner, ExpressRouteGateway>() {
+            @Override
+            public ExpressRouteGateway call(ExpressRouteGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ExpressRouteGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ExpressRouteGatewayImpl wrapModel(ExpressRouteGatewayInner inner) {
+        return  new ExpressRouteGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRouteGatewayImpl wrapModel(String name) {
+        return new ExpressRouteGatewayImpl(name, new ExpressRouteGatewayInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysInner.java
new file mode 100644
index 000000000000..95d5f4c7af60
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteGatewaysInner.java
@@ -0,0 +1,662 @@
+/**
+ * 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.network.v2020_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.CloudException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ExpressRouteGateways.
+ */
+public class ExpressRouteGatewaysInner implements InnerSupportsGet<ExpressRouteGatewayInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ExpressRouteGatewayInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGateways list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteGateways")
+        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.network.v2020_04_01.ExpressRouteGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways")
+        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.network.v2020_04_01.ExpressRouteGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteGatewayInner putExpressRouteGatewayParameters, @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.network.v2020_04_01.ExpressRouteGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("subscriptionId") String subscriptionId, @Body ExpressRouteGatewayInner putExpressRouteGatewayParameters, @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.network.v2020_04_01.ExpressRouteGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @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.network.v2020_04_01.ExpressRouteGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @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.network.v2020_04_01.ExpressRouteGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("expressRouteGatewayName") String expressRouteGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists ExpressRoute gateways under a given subscription.
+     *
+     * @return the PagedList<ExpressRouteGatewayInner> object if successful.
+     */
+    public PagedList<ExpressRouteGatewayInner> list() {
+        PageImpl1<ExpressRouteGatewayInner> page = new PageImpl1<>();
+        page.setItems(listWithServiceResponseAsync().toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<ExpressRouteGatewayInner>(page) {
+            @Override
+            public Page<ExpressRouteGatewayInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Lists ExpressRoute gateways under a given subscription.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ExpressRouteGatewayInner>> listAsync(final ServiceCallback<List<ExpressRouteGatewayInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Lists ExpressRoute gateways under a given subscription.
+     *
+     * @return the observable to the List&lt;ExpressRouteGatewayInner&gt; object
+     */
+    public Observable<Page<ExpressRouteGatewayInner>> listAsync() {
+        return listWithServiceResponseAsync().map(new Func1<ServiceResponse<List<ExpressRouteGatewayInner>>, Page<ExpressRouteGatewayInner>>() {
+            @Override
+            public Page<ExpressRouteGatewayInner> call(ServiceResponse<List<ExpressRouteGatewayInner>> response) {
+                PageImpl1<ExpressRouteGatewayInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Lists ExpressRoute gateways under a given subscription.
+     *
+     * @return the observable to the List&lt;ExpressRouteGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<List<ExpressRouteGatewayInner>>> listWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<ExpressRouteGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<ExpressRouteGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<ExpressRouteGatewayInner>> result = listDelegate(response);
+                        List<ExpressRouteGatewayInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<ExpressRouteGatewayInner>> clientResponse = new ServiceResponse<List<ExpressRouteGatewayInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<ExpressRouteGatewayInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<ExpressRouteGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<ExpressRouteGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists ExpressRoute gateways in a given resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the PagedList<ExpressRouteGatewayInner> object if successful.
+     */
+    public PagedList<ExpressRouteGatewayInner> listByResourceGroup(String resourceGroupName) {
+        PageImpl1<ExpressRouteGatewayInner> page = new PageImpl1<>();
+        page.setItems(listByResourceGroupWithServiceResponseAsync(resourceGroupName).toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<ExpressRouteGatewayInner>(page) {
+            @Override
+            public Page<ExpressRouteGatewayInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Lists ExpressRoute gateways in a given resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ExpressRouteGatewayInner>> listByResourceGroupAsync(String resourceGroupName, final ServiceCallback<List<ExpressRouteGatewayInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listByResourceGroupWithServiceResponseAsync(resourceGroupName), serviceCallback);
+    }
+
+    /**
+     * Lists ExpressRoute gateways in a given resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the observable to the List&lt;ExpressRouteGatewayInner&gt; object
+     */
+    public Observable<Page<ExpressRouteGatewayInner>> listByResourceGroupAsync(String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName).map(new Func1<ServiceResponse<List<ExpressRouteGatewayInner>>, Page<ExpressRouteGatewayInner>>() {
+            @Override
+            public Page<ExpressRouteGatewayInner> call(ServiceResponse<List<ExpressRouteGatewayInner>> response) {
+                PageImpl1<ExpressRouteGatewayInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Lists ExpressRoute gateways in a given resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the observable to the List&lt;ExpressRouteGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<List<ExpressRouteGatewayInner>>> listByResourceGroupWithServiceResponseAsync(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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<ExpressRouteGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<ExpressRouteGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<ExpressRouteGatewayInner>> result = listByResourceGroupDelegate(response);
+                        List<ExpressRouteGatewayInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<ExpressRouteGatewayInner>> clientResponse = new ServiceResponse<List<ExpressRouteGatewayInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<ExpressRouteGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<ExpressRouteGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<ExpressRouteGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT 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 ExpressRouteGatewayInner object if successful.
+     */
+    public ExpressRouteGatewayInner createOrUpdate(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @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<ExpressRouteGatewayInner> createOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters, final ServiceCallback<ExpressRouteGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRouteGatewayInner> createOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters).map(new Func1<ServiceResponse<ExpressRouteGatewayInner>, ExpressRouteGatewayInner>() {
+            @Override
+            public ExpressRouteGatewayInner call(ServiceResponse<ExpressRouteGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRouteGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName 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 (putExpressRouteGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter putExpressRouteGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(putExpressRouteGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), putExpressRouteGatewayParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRouteGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT 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 ExpressRouteGatewayInner object if successful.
+     */
+    public ExpressRouteGatewayInner beginCreateOrUpdate(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @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<ExpressRouteGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters, final ServiceCallback<ExpressRouteGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteGatewayInner object
+     */
+    public Observable<ExpressRouteGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName, putExpressRouteGatewayParameters).map(new Func1<ServiceResponse<ExpressRouteGatewayInner>, ExpressRouteGatewayInner>() {
+            @Override
+            public ExpressRouteGatewayInner call(ServiceResponse<ExpressRouteGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a ExpressRoute gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @param putExpressRouteGatewayParameters Parameters required in an ExpressRoute gateway PUT operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteGatewayInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName, ExpressRouteGatewayInner putExpressRouteGatewayParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName 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 (putExpressRouteGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter putExpressRouteGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(putExpressRouteGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), putExpressRouteGatewayParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteGatewayInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRouteGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Fetches the details of a ExpressRoute gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 ExpressRouteGatewayInner object if successful.
+     */
+    public ExpressRouteGatewayInner getByResourceGroup(String resourceGroupName, String expressRouteGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Fetches the details of a ExpressRoute gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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<ExpressRouteGatewayInner> getByResourceGroupAsync(String resourceGroupName, String expressRouteGatewayName, final ServiceCallback<ExpressRouteGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName), serviceCallback);
+    }
+
+    /**
+     * Fetches the details of a ExpressRoute gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteGatewayInner object
+     */
+    public Observable<ExpressRouteGatewayInner> getByResourceGroupAsync(String resourceGroupName, String expressRouteGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).map(new Func1<ServiceResponse<ExpressRouteGatewayInner>, ExpressRouteGatewayInner>() {
+            @Override
+            public ExpressRouteGatewayInner call(ServiceResponse<ExpressRouteGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Fetches the details of a ExpressRoute gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteGatewayInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 expressRouteGatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 expressRouteGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String expressRouteGatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 expressRouteGatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @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 expressRouteGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String expressRouteGatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, expressRouteGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ExpressRoute gateway in a resource group. An ExpressRoute gateway resource can only be deleted when there are no connection subresources.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRouteGatewayName The name of the ExpressRoute gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String expressRouteGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (expressRouteGatewayName == null) {
+            throw new IllegalArgumentException("Parameter expressRouteGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, expressRouteGatewayName, this.client.subscriptionId(), 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);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkImpl.java
new file mode 100644
index 000000000000..156727d53011
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkImpl.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLink;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkAdminState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkConnectorType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkMacSecConfig;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ExpressRouteLinkImpl extends IndexableRefreshableWrapperImpl<ExpressRouteLink, ExpressRouteLinkInner> implements ExpressRouteLink {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String expressRoutePortName;
+    private String linkName;
+
+    ExpressRouteLinkImpl(ExpressRouteLinkInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.expressRoutePortName = IdParsingUtils.getValueFromIdByName(inner.id(), "ExpressRoutePorts");
+        this.linkName = IdParsingUtils.getValueFromIdByName(inner.id(), "links");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<ExpressRouteLinkInner> getInnerAsync() {
+        ExpressRouteLinksInner client = this.manager().inner().expressRouteLinks();
+        return client.getAsync(this.resourceGroupName, this.expressRoutePortName, this.linkName);
+    }
+
+
+
+    @Override
+    public ExpressRouteLinkAdminState adminState() {
+        return this.inner().adminState();
+    }
+
+    @Override
+    public ExpressRouteLinkConnectorType connectorType() {
+        return this.inner().connectorType();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String interfaceName() {
+        return this.inner().interfaceName();
+    }
+
+    @Override
+    public ExpressRouteLinkMacSecConfig macSecConfig() {
+        return this.inner().macSecConfig();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String patchPanelId() {
+        return this.inner().patchPanelId();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String rackId() {
+        return this.inner().rackId();
+    }
+
+    @Override
+    public String routerName() {
+        return this.inner().routerName();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkInner.java
new file mode 100644
index 000000000000..18aae90d1999
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinkInner.java
@@ -0,0 +1,211 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkConnectorType;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkAdminState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinkMacSecConfig;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * ExpressRouteLink.
+ * ExpressRouteLink child resource definition.
+ */
+@JsonFlatten
+public class ExpressRouteLinkInner extends SubResource {
+    /**
+     * Name of Azure router associated with physical port.
+     */
+    @JsonProperty(value = "properties.routerName", access = JsonProperty.Access.WRITE_ONLY)
+    private String routerName;
+
+    /**
+     * Name of Azure router interface.
+     */
+    @JsonProperty(value = "properties.interfaceName", access = JsonProperty.Access.WRITE_ONLY)
+    private String interfaceName;
+
+    /**
+     * Mapping between physical port to patch panel port.
+     */
+    @JsonProperty(value = "properties.patchPanelId", access = JsonProperty.Access.WRITE_ONLY)
+    private String patchPanelId;
+
+    /**
+     * Mapping of physical patch panel to rack.
+     */
+    @JsonProperty(value = "properties.rackId", access = JsonProperty.Access.WRITE_ONLY)
+    private String rackId;
+
+    /**
+     * Physical fiber port type. Possible values include: 'LC', 'SC'.
+     */
+    @JsonProperty(value = "properties.connectorType", access = JsonProperty.Access.WRITE_ONLY)
+    private ExpressRouteLinkConnectorType connectorType;
+
+    /**
+     * Administrative state of the physical port. Possible values include:
+     * 'Enabled', 'Disabled'.
+     */
+    @JsonProperty(value = "properties.adminState")
+    private ExpressRouteLinkAdminState adminState;
+
+    /**
+     * The provisioning state of the express route link resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * MacSec configuration.
+     */
+    @JsonProperty(value = "properties.macSecConfig")
+    private ExpressRouteLinkMacSecConfig macSecConfig;
+
+    /**
+     * Name of child port resource that is unique among child port resources of
+     * the parent.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get name of Azure router associated with physical port.
+     *
+     * @return the routerName value
+     */
+    public String routerName() {
+        return this.routerName;
+    }
+
+    /**
+     * Get name of Azure router interface.
+     *
+     * @return the interfaceName value
+     */
+    public String interfaceName() {
+        return this.interfaceName;
+    }
+
+    /**
+     * Get mapping between physical port to patch panel port.
+     *
+     * @return the patchPanelId value
+     */
+    public String patchPanelId() {
+        return this.patchPanelId;
+    }
+
+    /**
+     * Get mapping of physical patch panel to rack.
+     *
+     * @return the rackId value
+     */
+    public String rackId() {
+        return this.rackId;
+    }
+
+    /**
+     * Get physical fiber port type. Possible values include: 'LC', 'SC'.
+     *
+     * @return the connectorType value
+     */
+    public ExpressRouteLinkConnectorType connectorType() {
+        return this.connectorType;
+    }
+
+    /**
+     * Get administrative state of the physical port. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @return the adminState value
+     */
+    public ExpressRouteLinkAdminState adminState() {
+        return this.adminState;
+    }
+
+    /**
+     * Set administrative state of the physical port. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @param adminState the adminState value to set
+     * @return the ExpressRouteLinkInner object itself.
+     */
+    public ExpressRouteLinkInner withAdminState(ExpressRouteLinkAdminState adminState) {
+        this.adminState = adminState;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route link resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get macSec configuration.
+     *
+     * @return the macSecConfig value
+     */
+    public ExpressRouteLinkMacSecConfig macSecConfig() {
+        return this.macSecConfig;
+    }
+
+    /**
+     * Set macSec configuration.
+     *
+     * @param macSecConfig the macSecConfig value to set
+     * @return the ExpressRouteLinkInner object itself.
+     */
+    public ExpressRouteLinkInner withMacSecConfig(ExpressRouteLinkMacSecConfig macSecConfig) {
+        this.macSecConfig = macSecConfig;
+        return this;
+    }
+
+    /**
+     * Get name of child port resource that is unique among child port resources of the parent.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of child port resource that is unique among child port resources of the parent.
+     *
+     * @param name the name value to set
+     * @return the ExpressRouteLinkInner object itself.
+     */
+    public ExpressRouteLinkInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksImpl.java
new file mode 100644
index 000000000000..e7b75c7878c3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinks;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLink;
+
+class ExpressRouteLinksImpl extends WrapperImpl<ExpressRouteLinksInner> implements ExpressRouteLinks {
+    private final NetworkManager manager;
+
+    ExpressRouteLinksImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteLinks());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private ExpressRouteLinkImpl wrapModel(ExpressRouteLinkInner inner) {
+        return  new ExpressRouteLinkImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<ExpressRouteLink> listAsync(final String resourceGroupName, final String expressRoutePortName) {
+        ExpressRouteLinksInner client = this.inner();
+        return client.listAsync(resourceGroupName, expressRoutePortName)
+        .flatMapIterable(new Func1<Page<ExpressRouteLinkInner>, Iterable<ExpressRouteLinkInner>>() {
+            @Override
+            public Iterable<ExpressRouteLinkInner> call(Page<ExpressRouteLinkInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteLinkInner, ExpressRouteLink>() {
+            @Override
+            public ExpressRouteLink call(ExpressRouteLinkInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRouteLink> getAsync(String resourceGroupName, String expressRoutePortName, String linkName) {
+        ExpressRouteLinksInner client = this.inner();
+        return client.getAsync(resourceGroupName, expressRoutePortName, linkName)
+        .flatMap(new Func1<ExpressRouteLinkInner, Observable<ExpressRouteLink>>() {
+            @Override
+            public Observable<ExpressRouteLink> call(ExpressRouteLinkInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ExpressRouteLink)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksInner.java
new file mode 100644
index 000000000000..5d0c71368320
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteLinksInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 ExpressRouteLinks.
+ */
+public class ExpressRouteLinksInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteLinksService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteLinksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteLinksInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteLinksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteLinks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteLinksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinks get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}/links/{linkName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @Path("linkName") String linkName, @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.network.v2020_04_01.ExpressRouteLinks list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}/links")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @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.network.v2020_04_01.ExpressRouteLinks listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the specified ExpressRouteLink resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param linkName The name of the ExpressRouteLink 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 ExpressRouteLinkInner object if successful.
+     */
+    public ExpressRouteLinkInner get(String resourceGroupName, String expressRoutePortName, String linkName) {
+        return getWithServiceResponseAsync(resourceGroupName, expressRoutePortName, linkName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified ExpressRouteLink resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param linkName The name of the ExpressRouteLink 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<ExpressRouteLinkInner> getAsync(String resourceGroupName, String expressRoutePortName, String linkName, final ServiceCallback<ExpressRouteLinkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, expressRoutePortName, linkName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified ExpressRouteLink resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param linkName The name of the ExpressRouteLink resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteLinkInner object
+     */
+    public Observable<ExpressRouteLinkInner> getAsync(String resourceGroupName, String expressRoutePortName, String linkName) {
+        return getWithServiceResponseAsync(resourceGroupName, expressRoutePortName, linkName).map(new Func1<ServiceResponse<ExpressRouteLinkInner>, ExpressRouteLinkInner>() {
+            @Override
+            public ExpressRouteLinkInner call(ServiceResponse<ExpressRouteLinkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified ExpressRouteLink resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param linkName The name of the ExpressRouteLink resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRouteLinkInner object
+     */
+    public Observable<ServiceResponse<ExpressRouteLinkInner>> getWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName, String linkName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        if (linkName == null) {
+            throw new IllegalArgumentException("Parameter linkName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, linkName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRouteLinkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRouteLinkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRouteLinkInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRouteLinkInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRouteLinkInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRouteLinkInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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 PagedList&lt;ExpressRouteLinkInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteLinkInner> list(final String resourceGroupName, final String expressRoutePortName) {
+        ServiceResponse<Page<ExpressRouteLinkInner>> response = listSinglePageAsync(resourceGroupName, expressRoutePortName).toBlocking().single();
+        return new PagedList<ExpressRouteLinkInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteLinkInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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<List<ExpressRouteLinkInner>> listAsync(final String resourceGroupName, final String expressRoutePortName, final ListOperationCallback<ExpressRouteLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, expressRoutePortName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteLinkInner&gt; object
+     */
+    public Observable<Page<ExpressRouteLinkInner>> listAsync(final String resourceGroupName, final String expressRoutePortName) {
+        return listWithServiceResponseAsync(resourceGroupName, expressRoutePortName)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteLinkInner>>, Page<ExpressRouteLinkInner>>() {
+                @Override
+                public Page<ExpressRouteLinkInner> call(ServiceResponse<Page<ExpressRouteLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String expressRoutePortName) {
+        return listSinglePageAsync(resourceGroupName, expressRoutePortName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteLinkInner>>, Observable<ServiceResponse<Page<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(ServiceResponse<Page<ExpressRouteLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+    ServiceResponse<PageImpl<ExpressRouteLinkInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ExpressRouteLinkInner>> * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> listSinglePageAsync(final String resourceGroupName, final String expressRoutePortName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteLinkInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteLinkInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteLinkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @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;ExpressRouteLinkInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteLinkInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteLinkInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteLinkInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteLinkInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @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<ExpressRouteLinkInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteLinkInner>> serviceFuture, final ListOperationCallback<ExpressRouteLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @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;ExpressRouteLinkInner&gt; object
+     */
+    public Observable<Page<ExpressRouteLinkInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteLinkInner>>, Page<ExpressRouteLinkInner>>() {
+                @Override
+                public Page<ExpressRouteLinkInner> call(ServiceResponse<Page<ExpressRouteLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+     * @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;ExpressRouteLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteLinkInner>>, Observable<ServiceResponse<Page<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(ServiceResponse<Page<ExpressRouteLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve the ExpressRouteLink sub-resources of the specified ExpressRoutePort resource.
+     *
+    ServiceResponse<PageImpl<ExpressRouteLinkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> 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<ExpressRouteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteLinkInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteLinkInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteLinkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortImpl.java
new file mode 100644
index 000000000000..20aba854464b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortImpl.java
@@ -0,0 +1,154 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePort;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsEncapsulation;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLink;
+
+class ExpressRoutePortImpl extends GroupableResourceCoreImpl<ExpressRoutePort, ExpressRoutePortInner, ExpressRoutePortImpl, NetworkManager> implements ExpressRoutePort, ExpressRoutePort.Definition, ExpressRoutePort.Update {
+    ExpressRoutePortImpl(String name, ExpressRoutePortInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRoutePort> createResourceAsync() {
+        ExpressRoutePortsInner client = this.manager().inner().expressRoutePorts();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ExpressRoutePort> updateResourceAsync() {
+        ExpressRoutePortsInner client = this.manager().inner().expressRoutePorts();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ExpressRoutePortInner> getInnerAsync() {
+        ExpressRoutePortsInner client = this.manager().inner().expressRoutePorts();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String allocationDate() {
+        return this.inner().allocationDate();
+    }
+
+    @Override
+    public Integer bandwidthInGbps() {
+        return this.inner().bandwidthInGbps();
+    }
+
+    @Override
+    public List<SubResource> circuits() {
+        return this.inner().circuits();
+    }
+
+    @Override
+    public ExpressRoutePortsEncapsulation encapsulation() {
+        return this.inner().encapsulation();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String etherType() {
+        return this.inner().etherType();
+    }
+
+    @Override
+    public ManagedServiceIdentity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public List<ExpressRouteLink> links() {
+        List<ExpressRouteLink> lst = new ArrayList<ExpressRouteLink>();
+        if (this.inner().links() != null) {
+            for (ExpressRouteLinkInner inner : this.inner().links()) {
+                lst.add( new ExpressRouteLinkImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String mtu() {
+        return this.inner().mtu();
+    }
+
+    @Override
+    public String peeringLocation() {
+        return this.inner().peeringLocation();
+    }
+
+    @Override
+    public Double provisionedBandwidthInGbps() {
+        return this.inner().provisionedBandwidthInGbps();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public ExpressRoutePortImpl withBandwidthInGbps(Integer bandwidthInGbps) {
+        this.inner().withBandwidthInGbps(bandwidthInGbps);
+        return this;
+    }
+
+    @Override
+    public ExpressRoutePortImpl withEncapsulation(ExpressRoutePortsEncapsulation encapsulation) {
+        this.inner().withEncapsulation(encapsulation);
+        return this;
+    }
+
+    @Override
+    public ExpressRoutePortImpl withIdentity(ManagedServiceIdentity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public ExpressRoutePortImpl withLinks(List<ExpressRouteLinkInner> links) {
+        this.inner().withLinks(links);
+        return this;
+    }
+
+    @Override
+    public ExpressRoutePortImpl withPeeringLocation(String peeringLocation) {
+        this.inner().withPeeringLocation(peeringLocation);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortInner.java
new file mode 100644
index 000000000000..3f8f685935c5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortInner.java
@@ -0,0 +1,310 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsEncapsulation;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * ExpressRoute Port.
+ * ExpressRoutePort resource definition.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRoutePortInner extends Resource {
+    /**
+     * The name of the peering location that the ExpressRoutePort is mapped to
+     * physically.
+     */
+    @JsonProperty(value = "properties.peeringLocation")
+    private String peeringLocation;
+
+    /**
+     * Bandwidth of procured ports in Gbps.
+     */
+    @JsonProperty(value = "properties.bandwidthInGbps")
+    private Integer bandwidthInGbps;
+
+    /**
+     * Aggregate Gbps of associated circuit bandwidths.
+     */
+    @JsonProperty(value = "properties.provisionedBandwidthInGbps", access = JsonProperty.Access.WRITE_ONLY)
+    private Double provisionedBandwidthInGbps;
+
+    /**
+     * Maximum transmission unit of the physical port pair(s).
+     */
+    @JsonProperty(value = "properties.mtu", access = JsonProperty.Access.WRITE_ONLY)
+    private String mtu;
+
+    /**
+     * Encapsulation method on physical ports. Possible values include:
+     * 'Dot1Q', 'QinQ'.
+     */
+    @JsonProperty(value = "properties.encapsulation")
+    private ExpressRoutePortsEncapsulation encapsulation;
+
+    /**
+     * Ether type of the physical port.
+     */
+    @JsonProperty(value = "properties.etherType", access = JsonProperty.Access.WRITE_ONLY)
+    private String etherType;
+
+    /**
+     * Date of the physical port allocation to be used in Letter of
+     * Authorization.
+     */
+    @JsonProperty(value = "properties.allocationDate", access = JsonProperty.Access.WRITE_ONLY)
+    private String allocationDate;
+
+    /**
+     * ExpressRouteLink Sub-Resources.
+     * The set of physical links of the ExpressRoutePort resource.
+     */
+    @JsonProperty(value = "properties.links")
+    private List<ExpressRouteLinkInner> links;
+
+    /**
+     * Reference the ExpressRoute circuit(s) that are provisioned on this
+     * ExpressRoutePort resource.
+     */
+    @JsonProperty(value = "properties.circuits", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> circuits;
+
+    /**
+     * The provisioning state of the express route port resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The resource GUID property of the express route port resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The identity of ExpressRoutePort, if configured.
+     */
+    @JsonProperty(value = "identity")
+    private ManagedServiceIdentity identity;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the name of the peering location that the ExpressRoutePort is mapped to physically.
+     *
+     * @return the peeringLocation value
+     */
+    public String peeringLocation() {
+        return this.peeringLocation;
+    }
+
+    /**
+     * Set the name of the peering location that the ExpressRoutePort is mapped to physically.
+     *
+     * @param peeringLocation the peeringLocation value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withPeeringLocation(String peeringLocation) {
+        this.peeringLocation = peeringLocation;
+        return this;
+    }
+
+    /**
+     * Get bandwidth of procured ports in Gbps.
+     *
+     * @return the bandwidthInGbps value
+     */
+    public Integer bandwidthInGbps() {
+        return this.bandwidthInGbps;
+    }
+
+    /**
+     * Set bandwidth of procured ports in Gbps.
+     *
+     * @param bandwidthInGbps the bandwidthInGbps value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withBandwidthInGbps(Integer bandwidthInGbps) {
+        this.bandwidthInGbps = bandwidthInGbps;
+        return this;
+    }
+
+    /**
+     * Get aggregate Gbps of associated circuit bandwidths.
+     *
+     * @return the provisionedBandwidthInGbps value
+     */
+    public Double provisionedBandwidthInGbps() {
+        return this.provisionedBandwidthInGbps;
+    }
+
+    /**
+     * Get maximum transmission unit of the physical port pair(s).
+     *
+     * @return the mtu value
+     */
+    public String mtu() {
+        return this.mtu;
+    }
+
+    /**
+     * Get encapsulation method on physical ports. Possible values include: 'Dot1Q', 'QinQ'.
+     *
+     * @return the encapsulation value
+     */
+    public ExpressRoutePortsEncapsulation encapsulation() {
+        return this.encapsulation;
+    }
+
+    /**
+     * Set encapsulation method on physical ports. Possible values include: 'Dot1Q', 'QinQ'.
+     *
+     * @param encapsulation the encapsulation value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withEncapsulation(ExpressRoutePortsEncapsulation encapsulation) {
+        this.encapsulation = encapsulation;
+        return this;
+    }
+
+    /**
+     * Get ether type of the physical port.
+     *
+     * @return the etherType value
+     */
+    public String etherType() {
+        return this.etherType;
+    }
+
+    /**
+     * Get date of the physical port allocation to be used in Letter of Authorization.
+     *
+     * @return the allocationDate value
+     */
+    public String allocationDate() {
+        return this.allocationDate;
+    }
+
+    /**
+     * Get the set of physical links of the ExpressRoutePort resource.
+     *
+     * @return the links value
+     */
+    public List<ExpressRouteLinkInner> links() {
+        return this.links;
+    }
+
+    /**
+     * Set the set of physical links of the ExpressRoutePort resource.
+     *
+     * @param links the links value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withLinks(List<ExpressRouteLinkInner> links) {
+        this.links = links;
+        return this;
+    }
+
+    /**
+     * Get reference the ExpressRoute circuit(s) that are provisioned on this ExpressRoutePort resource.
+     *
+     * @return the circuits value
+     */
+    public List<SubResource> circuits() {
+        return this.circuits;
+    }
+
+    /**
+     * Get the provisioning state of the express route port resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the resource GUID property of the express route port resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the identity of ExpressRoutePort, if configured.
+     *
+     * @return the identity value
+     */
+    public ManagedServiceIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the identity of ExpressRoutePort, if configured.
+     *
+     * @param identity the identity value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withIdentity(ManagedServiceIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRoutePortInner object itself.
+     */
+    public ExpressRoutePortInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsImpl.java
new file mode 100644
index 000000000000..fa2a9e708ae6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePorts;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePort;
+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;
+
+class ExpressRoutePortsImpl extends GroupableResourcesCoreImpl<ExpressRoutePort, ExpressRoutePortImpl, ExpressRoutePortInner, ExpressRoutePortsInner, NetworkManager>  implements ExpressRoutePorts {
+    protected ExpressRoutePortsImpl(NetworkManager manager) {
+        super(manager.inner().expressRoutePorts(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRoutePortInner> getInnerAsync(String resourceGroupName, String name) {
+        ExpressRoutePortsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRoutePortsInner 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<ExpressRoutePort> listByResourceGroup(String resourceGroupName) {
+        ExpressRoutePortsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ExpressRoutePort> listByResourceGroupAsync(String resourceGroupName) {
+        ExpressRoutePortsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ExpressRoutePortInner>, Iterable<ExpressRoutePortInner>>() {
+            @Override
+            public Iterable<ExpressRoutePortInner> call(Page<ExpressRoutePortInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRoutePortInner, ExpressRoutePort>() {
+            @Override
+            public ExpressRoutePort call(ExpressRoutePortInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ExpressRoutePort> list() {
+        ExpressRoutePortsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRoutePort> listAsync() {
+        ExpressRoutePortsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ExpressRoutePortInner>, Iterable<ExpressRoutePortInner>>() {
+            @Override
+            public Iterable<ExpressRoutePortInner> call(Page<ExpressRoutePortInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRoutePortInner, ExpressRoutePort>() {
+            @Override
+            public ExpressRoutePort call(ExpressRoutePortInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ExpressRoutePortImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ExpressRoutePortImpl wrapModel(ExpressRoutePortInner inner) {
+        return  new ExpressRoutePortImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRoutePortImpl wrapModel(String name) {
+        return new ExpressRoutePortImpl(name, new ExpressRoutePortInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsInner.java
new file mode 100644
index 000000000000..3c5b863e3460
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 ExpressRoutePorts.
+ */
+public class ExpressRoutePortsInner implements InnerSupportsGet<ExpressRoutePortInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ExpressRoutePortInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRoutePortsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRoutePortsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRoutePortsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRoutePortsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRoutePorts to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRoutePortsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePorts delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @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.network.v2020_04_01.ExpressRoutePorts beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @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.network.v2020_04_01.ExpressRoutePorts getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @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.network.v2020_04_01.ExpressRoutePorts createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @Query("api-version") String apiVersion, @Body ExpressRoutePortInner 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.network.v2020_04_01.ExpressRoutePorts beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @Query("api-version") String apiVersion, @Body ExpressRoutePortInner 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.network.v2020_04_01.ExpressRoutePorts updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("expressRoutePortName") String expressRoutePortName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePorts listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts")
+        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.network.v2020_04_01.ExpressRoutePorts list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePorts")
+        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.network.v2020_04_01.ExpressRoutePorts 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.network.v2020_04_01.ExpressRoutePorts listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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
+     */
+    public void delete(String resourceGroupName, String expressRoutePortName) {
+        deleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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<Void> deleteAsync(String resourceGroupName, String expressRoutePortName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String expressRoutePortName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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
+     */
+    public void beginDelete(String resourceGroupName, String expressRoutePortName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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<Void> beginDeleteAsync(String resourceGroupName, String expressRoutePortName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String expressRoutePortName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, expressRoutePortName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, 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);
+    }
+
+    /**
+     * Retrieves the requested ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of ExpressRoutePort.
+     * @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 ExpressRoutePortInner object if successful.
+     */
+    public ExpressRoutePortInner getByResourceGroup(String resourceGroupName, String expressRoutePortName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRoutePortName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the requested ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of ExpressRoutePort.
+     * @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<ExpressRoutePortInner> getByResourceGroupAsync(String resourceGroupName, String expressRoutePortName, final ServiceCallback<ExpressRoutePortInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRoutePortName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the requested ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of ExpressRoutePort.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ExpressRoutePortInner> getByResourceGroupAsync(String resourceGroupName, String expressRoutePortName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, expressRoutePortName).map(new Func1<ServiceResponse<ExpressRoutePortInner>, ExpressRoutePortInner>() {
+            @Override
+            public ExpressRoutePortInner call(ServiceResponse<ExpressRoutePortInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the requested ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of ExpressRoutePort.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ServiceResponse<ExpressRoutePortInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRoutePortInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRoutePortInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRoutePortInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRoutePortInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRoutePortInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRoutePortInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort 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 ExpressRoutePortInner object if successful.
+     */
+    public ExpressRoutePortInner createOrUpdate(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @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<ExpressRoutePortInner> createOrUpdateAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters, final ServiceCallback<ExpressRoutePortInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ExpressRoutePortInner> createOrUpdateAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters).map(new Func1<ServiceResponse<ExpressRoutePortInner>, ExpressRoutePortInner>() {
+            @Override
+            public ExpressRoutePortInner call(ServiceResponse<ExpressRoutePortInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ExpressRoutePortInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner 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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ExpressRoutePortInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort 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 ExpressRoutePortInner object if successful.
+     */
+    public ExpressRoutePortInner beginCreateOrUpdate(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @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<ExpressRoutePortInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters, final ServiceCallback<ExpressRoutePortInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ExpressRoutePortInner> beginCreateOrUpdateAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, expressRoutePortName, parameters).map(new Func1<ServiceResponse<ExpressRoutePortInner>, ExpressRoutePortInner>() {
+            @Override
+            public ExpressRoutePortInner call(ServiceResponse<ExpressRoutePortInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified ExpressRoutePort resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param parameters Parameters supplied to the create ExpressRoutePort operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ServiceResponse<ExpressRoutePortInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName, ExpressRoutePortInner 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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRoutePortInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRoutePortInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRoutePortInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRoutePortInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRoutePortInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRoutePortInner>() { }.getType())
+                .register(201, new TypeToken<ExpressRoutePortInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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 ExpressRoutePortInner object if successful.
+     */
+    public ExpressRoutePortInner updateTags(String resourceGroupName, String expressRoutePortName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName).toBlocking().single().body();
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort 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<ExpressRoutePortInner> updateTagsAsync(String resourceGroupName, String expressRoutePortName, final ServiceCallback<ExpressRoutePortInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName), serviceCallback);
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ExpressRoutePortInner> updateTagsAsync(String resourceGroupName, String expressRoutePortName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName).map(new Func1<ServiceResponse<ExpressRoutePortInner>, ExpressRoutePortInner>() {
+            @Override
+            public ExpressRoutePortInner call(ServiceResponse<ExpressRoutePortInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ServiceResponse<ExpressRoutePortInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRoutePortInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRoutePortInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRoutePortInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param tags Resource tags.
+     * @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 ExpressRoutePortInner object if successful.
+     */
+    public ExpressRoutePortInner updateTags(String resourceGroupName, String expressRoutePortName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param tags Resource tags.
+     * @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<ExpressRoutePortInner> updateTagsAsync(String resourceGroupName, String expressRoutePortName, Map<String, String> tags, final ServiceCallback<ExpressRoutePortInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName, tags), serviceCallback);
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ExpressRoutePortInner> updateTagsAsync(String resourceGroupName, String expressRoutePortName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, expressRoutePortName, tags).map(new Func1<ServiceResponse<ExpressRoutePortInner>, ExpressRoutePortInner>() {
+            @Override
+            public ExpressRoutePortInner call(ServiceResponse<ExpressRoutePortInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Update ExpressRoutePort tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param expressRoutePortName The name of the ExpressRoutePort resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortInner object
+     */
+    public Observable<ServiceResponse<ExpressRoutePortInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String expressRoutePortName, Map<String, String> tags) {
+        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 (expressRoutePortName == null) {
+            throw new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, expressRoutePortName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRoutePortInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRoutePortInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRoutePortInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRoutePortInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRoutePortInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRoutePortInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ExpressRoutePortInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ExpressRoutePortInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ExpressRoutePortInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ExpressRoutePortInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ExpressRoutePortInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Page<ExpressRoutePortInner>>() {
+                @Override
+                public Page<ExpressRoutePortInner> call(ServiceResponse<Page<ExpressRoutePortInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(ServiceResponse<Page<ExpressRoutePortInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRoutePortInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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;ExpressRoutePortInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortInner> list() {
+        ServiceResponse<Page<ExpressRoutePortInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ExpressRoutePortInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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<ExpressRoutePortInner>> listAsync(final ListOperationCallback<ExpressRoutePortInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Page<ExpressRoutePortInner>>() {
+                @Override
+                public Page<ExpressRoutePortInner> call(ServiceResponse<Page<ExpressRoutePortInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(ServiceResponse<Page<ExpressRoutePortInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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;ExpressRoutePortInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRoutePortInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRoutePortInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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<ExpressRoutePortInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRoutePortInner>> serviceFuture, final ListOperationCallback<ExpressRoutePortInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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;ExpressRoutePortInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Page<ExpressRoutePortInner>>() {
+                @Override
+                public Page<ExpressRoutePortInner> call(ServiceResponse<Page<ExpressRoutePortInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified 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;ExpressRoutePortInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(ServiceResponse<Page<ExpressRoutePortInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified resource group.
+     *
+    ServiceResponse<PageImpl<ExpressRoutePortInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> 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<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @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;ExpressRoutePortInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRoutePortInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRoutePortInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @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<ExpressRoutePortInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRoutePortInner>> serviceFuture, final ListOperationCallback<ExpressRoutePortInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @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;ExpressRoutePortInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Page<ExpressRoutePortInner>>() {
+                @Override
+                public Page<ExpressRoutePortInner> call(ServiceResponse<Page<ExpressRoutePortInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+     * @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;ExpressRoutePortInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortInner>>, Observable<ServiceResponse<Page<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(ServiceResponse<Page<ExpressRoutePortInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all the ExpressRoutePort resources in the specified subscription.
+     *
+    ServiceResponse<PageImpl<ExpressRoutePortInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> 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<ExpressRoutePortInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationImpl.java
new file mode 100644
index 000000000000..73b4b0fd65e1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationImpl.java
@@ -0,0 +1,63 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocation;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocationBandwidths;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ExpressRoutePortsLocationImpl extends GroupableResourceCoreImpl<ExpressRoutePortsLocation, ExpressRoutePortsLocationInner, ExpressRoutePortsLocationImpl, NetworkManager> implements ExpressRoutePortsLocation {
+    ExpressRoutePortsLocationImpl(String name, ExpressRoutePortsLocationInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRoutePortsLocation> createResourceAsync() {
+        ExpressRoutePortsLocationsInner client = this.manager().inner().expressRoutePortsLocations();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<ExpressRoutePortsLocation> updateResourceAsync() {
+        ExpressRoutePortsLocationsInner client = this.manager().inner().expressRoutePortsLocations();
+        return null; // NOP updateResourceAsync implementation as update is not supported
+    }
+
+    @Override
+    protected Observable<ExpressRoutePortsLocationInner> getInnerAsync() {
+        ExpressRoutePortsLocationsInner client = this.manager().inner().expressRoutePortsLocations();
+        return null; // NOP getInnerAsync implementation as get is not supported
+    }
+
+
+
+    @Override
+    public String address() {
+        return this.inner().address();
+    }
+
+    @Override
+    public List<ExpressRoutePortsLocationBandwidths> availableBandwidths() {
+        return this.inner().availableBandwidths();
+    }
+
+    @Override
+    public String contact() {
+        return this.inner().contact();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationInner.java
new file mode 100644
index 000000000000..6cbd3a7f7c5c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocationBandwidths;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * ExpressRoutePorts Peering Location.
+ * Definition of the ExpressRoutePorts peering location resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRoutePortsLocationInner extends Resource {
+    /**
+     * Address of peering location.
+     */
+    @JsonProperty(value = "properties.address", access = JsonProperty.Access.WRITE_ONLY)
+    private String address;
+
+    /**
+     * Contact details of peering locations.
+     */
+    @JsonProperty(value = "properties.contact", access = JsonProperty.Access.WRITE_ONLY)
+    private String contact;
+
+    /**
+     * The inventory of available ExpressRoutePort bandwidths.
+     */
+    @JsonProperty(value = "properties.availableBandwidths")
+    private List<ExpressRoutePortsLocationBandwidths> availableBandwidths;
+
+    /**
+     * The provisioning state of the express route port location resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get address of peering location.
+     *
+     * @return the address value
+     */
+    public String address() {
+        return this.address;
+    }
+
+    /**
+     * Get contact details of peering locations.
+     *
+     * @return the contact value
+     */
+    public String contact() {
+        return this.contact;
+    }
+
+    /**
+     * Get the inventory of available ExpressRoutePort bandwidths.
+     *
+     * @return the availableBandwidths value
+     */
+    public List<ExpressRoutePortsLocationBandwidths> availableBandwidths() {
+        return this.availableBandwidths;
+    }
+
+    /**
+     * Set the inventory of available ExpressRoutePort bandwidths.
+     *
+     * @param availableBandwidths the availableBandwidths value to set
+     * @return the ExpressRoutePortsLocationInner object itself.
+     */
+    public ExpressRoutePortsLocationInner withAvailableBandwidths(List<ExpressRoutePortsLocationBandwidths> availableBandwidths) {
+        this.availableBandwidths = availableBandwidths;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route port location resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRoutePortsLocationInner object itself.
+     */
+    public ExpressRoutePortsLocationInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsImpl.java
new file mode 100644
index 000000000000..d6ce4a2dbbef
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocations;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocation;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+
+class ExpressRoutePortsLocationsImpl extends GroupableResourcesCoreImpl<ExpressRoutePortsLocation, ExpressRoutePortsLocationImpl, ExpressRoutePortsLocationInner, ExpressRoutePortsLocationsInner, NetworkManager>  implements ExpressRoutePortsLocations {
+    protected ExpressRoutePortsLocationsImpl(NetworkManager manager) {
+        super(manager.inner().expressRoutePortsLocations(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRoutePortsLocationInner> getInnerAsync(String resourceGroupName, String name) {
+        return null; // NOP Retrieve by resource group not supported
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRoutePortsLocationsInner 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<ExpressRoutePortsLocation> list() {
+        ExpressRoutePortsLocationsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRoutePortsLocation> listAsync() {
+        ExpressRoutePortsLocationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ExpressRoutePortsLocationInner>, Iterable<ExpressRoutePortsLocationInner>>() {
+            @Override
+            public Iterable<ExpressRoutePortsLocationInner> call(Page<ExpressRoutePortsLocationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRoutePortsLocationInner, ExpressRoutePortsLocation>() {
+            @Override
+            public ExpressRoutePortsLocation call(ExpressRoutePortsLocationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ExpressRoutePortsLocation> getAsync(String locationName) {
+        ExpressRoutePortsLocationsInner client = this.inner();
+        return client.getAsync(locationName)
+        .map(new Func1<ExpressRoutePortsLocationInner, ExpressRoutePortsLocation>() {
+            @Override
+            public ExpressRoutePortsLocation call(ExpressRoutePortsLocationInner inner) {
+                return new ExpressRoutePortsLocationImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected ExpressRoutePortsLocationImpl wrapModel(ExpressRoutePortsLocationInner inner) {
+        return  new ExpressRoutePortsLocationImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRoutePortsLocationImpl wrapModel(String name) {
+        return null; // Model is not creatable
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsInner.java
new file mode 100644
index 000000000000..1779dbc66ca7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRoutePortsLocationsInner.java
@@ -0,0 +1,367 @@
+/**
+ * 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.network.v2020_04_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.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.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 ExpressRoutePortsLocations.
+ */
+public class ExpressRoutePortsLocationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRoutePortsLocationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRoutePortsLocationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRoutePortsLocationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRoutePortsLocationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRoutePortsLocations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRoutePortsLocationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocations list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePortsLocations")
+        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.network.v2020_04_01.ExpressRoutePortsLocations get" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePortsLocations/{locationName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("locationName") String locationName, @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.network.v2020_04_01.ExpressRoutePortsLocations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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;ExpressRoutePortsLocationInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortsLocationInner> list() {
+        ServiceResponse<Page<ExpressRoutePortsLocationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ExpressRoutePortsLocationInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortsLocationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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<ExpressRoutePortsLocationInner>> listAsync(final ListOperationCallback<ExpressRoutePortsLocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortsLocationInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortsLocationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortsLocationInner>>, Page<ExpressRoutePortsLocationInner>>() {
+                @Override
+                public Page<ExpressRoutePortsLocationInner> call(ServiceResponse<Page<ExpressRoutePortsLocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRoutePortsLocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortsLocationInner>>, Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(ServiceResponse<Page<ExpressRoutePortsLocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortsLocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortsLocationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortsLocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortsLocationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortsLocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortsLocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a single ExpressRoutePort peering location, including the list of available bandwidths available at said peering location.
+     *
+     * @param locationName Name of the requested ExpressRoutePort peering location.
+     * @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 ExpressRoutePortsLocationInner object if successful.
+     */
+    public ExpressRoutePortsLocationInner get(String locationName) {
+        return getWithServiceResponseAsync(locationName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a single ExpressRoutePort peering location, including the list of available bandwidths available at said peering location.
+     *
+     * @param locationName Name of the requested ExpressRoutePort peering location.
+     * @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<ExpressRoutePortsLocationInner> getAsync(String locationName, final ServiceCallback<ExpressRoutePortsLocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(locationName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a single ExpressRoutePort peering location, including the list of available bandwidths available at said peering location.
+     *
+     * @param locationName Name of the requested ExpressRoutePort peering location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortsLocationInner object
+     */
+    public Observable<ExpressRoutePortsLocationInner> getAsync(String locationName) {
+        return getWithServiceResponseAsync(locationName).map(new Func1<ServiceResponse<ExpressRoutePortsLocationInner>, ExpressRoutePortsLocationInner>() {
+            @Override
+            public ExpressRoutePortsLocationInner call(ServiceResponse<ExpressRoutePortsLocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a single ExpressRoutePort peering location, including the list of available bandwidths available at said peering location.
+     *
+     * @param locationName Name of the requested ExpressRoutePort peering location.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ExpressRoutePortsLocationInner object
+     */
+    public Observable<ServiceResponse<ExpressRoutePortsLocationInner>> getWithServiceResponseAsync(String locationName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), locationName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ExpressRoutePortsLocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ExpressRoutePortsLocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ExpressRoutePortsLocationInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ExpressRoutePortsLocationInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ExpressRoutePortsLocationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ExpressRoutePortsLocationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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;ExpressRoutePortsLocationInner&gt; object if successful.
+     */
+    public PagedList<ExpressRoutePortsLocationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRoutePortsLocationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRoutePortsLocationInner>(response.body()) {
+            @Override
+            public Page<ExpressRoutePortsLocationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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<ExpressRoutePortsLocationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRoutePortsLocationInner>> serviceFuture, final ListOperationCallback<ExpressRoutePortsLocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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;ExpressRoutePortsLocationInner&gt; object
+     */
+    public Observable<Page<ExpressRoutePortsLocationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRoutePortsLocationInner>>, Page<ExpressRoutePortsLocationInner>>() {
+                @Override
+                public Page<ExpressRoutePortsLocationInner> call(ServiceResponse<Page<ExpressRoutePortsLocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+     * @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;ExpressRoutePortsLocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRoutePortsLocationInner>>, Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(ServiceResponse<Page<ExpressRoutePortsLocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all ExpressRoutePort peering locations. Does not return available bandwidths for each location. Available bandwidths can only be obtained when retrieving a specific peering location.
+     *
+    ServiceResponse<PageImpl<ExpressRoutePortsLocationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRoutePortsLocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> 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<ExpressRoutePortsLocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRoutePortsLocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRoutePortsLocationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRoutePortsLocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRoutePortsLocationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRoutePortsLocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRoutePortsLocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderImpl.java
new file mode 100644
index 000000000000..0a897a2051e9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProvider;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProviderBandwidthsOffered;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ExpressRouteServiceProviderImpl extends GroupableResourceCoreImpl<ExpressRouteServiceProvider, ExpressRouteServiceProviderInner, ExpressRouteServiceProviderImpl, NetworkManager> implements ExpressRouteServiceProvider {
+    ExpressRouteServiceProviderImpl(String name, ExpressRouteServiceProviderInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ExpressRouteServiceProvider> createResourceAsync() {
+        ExpressRouteServiceProvidersInner client = this.manager().inner().expressRouteServiceProviders();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<ExpressRouteServiceProvider> updateResourceAsync() {
+        ExpressRouteServiceProvidersInner client = this.manager().inner().expressRouteServiceProviders();
+        return null; // NOP updateResourceAsync implementation as update is not supported
+    }
+
+    @Override
+    protected Observable<ExpressRouteServiceProviderInner> getInnerAsync() {
+        ExpressRouteServiceProvidersInner client = this.manager().inner().expressRouteServiceProviders();
+        return null; // NOP getInnerAsync implementation as get is not supported
+    }
+
+
+
+    @Override
+    public List<ExpressRouteServiceProviderBandwidthsOffered> bandwidthsOffered() {
+        return this.inner().bandwidthsOffered();
+    }
+
+    @Override
+    public List<String> peeringLocations() {
+        return this.inner().peeringLocations();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderInner.java
new file mode 100644
index 000000000000..72e427728db1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProviderInner.java
@@ -0,0 +1,119 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProviderBandwidthsOffered;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A ExpressRouteResourceProvider object.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ExpressRouteServiceProviderInner extends Resource {
+    /**
+     * A list of peering locations.
+     */
+    @JsonProperty(value = "properties.peeringLocations")
+    private List<String> peeringLocations;
+
+    /**
+     * A list of bandwidths offered.
+     */
+    @JsonProperty(value = "properties.bandwidthsOffered")
+    private List<ExpressRouteServiceProviderBandwidthsOffered> bandwidthsOffered;
+
+    /**
+     * The provisioning state of the express route service provider resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get a list of peering locations.
+     *
+     * @return the peeringLocations value
+     */
+    public List<String> peeringLocations() {
+        return this.peeringLocations;
+    }
+
+    /**
+     * Set a list of peering locations.
+     *
+     * @param peeringLocations the peeringLocations value to set
+     * @return the ExpressRouteServiceProviderInner object itself.
+     */
+    public ExpressRouteServiceProviderInner withPeeringLocations(List<String> peeringLocations) {
+        this.peeringLocations = peeringLocations;
+        return this;
+    }
+
+    /**
+     * Get a list of bandwidths offered.
+     *
+     * @return the bandwidthsOffered value
+     */
+    public List<ExpressRouteServiceProviderBandwidthsOffered> bandwidthsOffered() {
+        return this.bandwidthsOffered;
+    }
+
+    /**
+     * Set a list of bandwidths offered.
+     *
+     * @param bandwidthsOffered the bandwidthsOffered value to set
+     * @return the ExpressRouteServiceProviderInner object itself.
+     */
+    public ExpressRouteServiceProviderInner withBandwidthsOffered(List<ExpressRouteServiceProviderBandwidthsOffered> bandwidthsOffered) {
+        this.bandwidthsOffered = bandwidthsOffered;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the express route service provider resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ExpressRouteServiceProviderInner object itself.
+     */
+    public ExpressRouteServiceProviderInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersImpl.java
new file mode 100644
index 000000000000..888de324b817
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersImpl.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProviders;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProvider;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+
+class ExpressRouteServiceProvidersImpl extends GroupableResourcesCoreImpl<ExpressRouteServiceProvider, ExpressRouteServiceProviderImpl, ExpressRouteServiceProviderInner, ExpressRouteServiceProvidersInner, NetworkManager>  implements ExpressRouteServiceProviders {
+    protected ExpressRouteServiceProvidersImpl(NetworkManager manager) {
+        super(manager.inner().expressRouteServiceProviders(), manager);
+    }
+
+    @Override
+    protected Observable<ExpressRouteServiceProviderInner> getInnerAsync(String resourceGroupName, String name) {
+        return null; // NOP Retrieve by resource group not supported
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ExpressRouteServiceProvidersInner 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<ExpressRouteServiceProvider> list() {
+        ExpressRouteServiceProvidersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ExpressRouteServiceProvider> listAsync() {
+        ExpressRouteServiceProvidersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ExpressRouteServiceProviderInner>, Iterable<ExpressRouteServiceProviderInner>>() {
+            @Override
+            public Iterable<ExpressRouteServiceProviderInner> call(Page<ExpressRouteServiceProviderInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ExpressRouteServiceProviderInner, ExpressRouteServiceProvider>() {
+            @Override
+            public ExpressRouteServiceProvider call(ExpressRouteServiceProviderInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    protected ExpressRouteServiceProviderImpl wrapModel(ExpressRouteServiceProviderInner inner) {
+        return  new ExpressRouteServiceProviderImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ExpressRouteServiceProviderImpl wrapModel(String name) {
+        return null; // Model is not creatable
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersInner.java
new file mode 100644
index 000000000000..be788e344f88
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ExpressRouteServiceProvidersInner.java
@@ -0,0 +1,285 @@
+/**
+ * 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.network.v2020_04_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.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 ExpressRouteServiceProviders.
+ */
+public class ExpressRouteServiceProvidersInner {
+    /** The Retrofit service to perform REST calls. */
+    private ExpressRouteServiceProvidersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ExpressRouteServiceProvidersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ExpressRouteServiceProvidersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ExpressRouteServiceProvidersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ExpressRouteServiceProviders to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ExpressRouteServiceProvidersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProviders list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteServiceProviders")
+        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.network.v2020_04_01.ExpressRouteServiceProviders listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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;ExpressRouteServiceProviderInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteServiceProviderInner> list() {
+        ServiceResponse<Page<ExpressRouteServiceProviderInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ExpressRouteServiceProviderInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteServiceProviderInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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<ExpressRouteServiceProviderInner>> listAsync(final ListOperationCallback<ExpressRouteServiceProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteServiceProviderInner&gt; object
+     */
+    public Observable<Page<ExpressRouteServiceProviderInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ExpressRouteServiceProviderInner>>, Page<ExpressRouteServiceProviderInner>>() {
+                @Override
+                public Page<ExpressRouteServiceProviderInner> call(ServiceResponse<Page<ExpressRouteServiceProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ExpressRouteServiceProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteServiceProviderInner>>, Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(ServiceResponse<Page<ExpressRouteServiceProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteServiceProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteServiceProviderInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteServiceProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteServiceProviderInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteServiceProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteServiceProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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;ExpressRouteServiceProviderInner&gt; object if successful.
+     */
+    public PagedList<ExpressRouteServiceProviderInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ExpressRouteServiceProviderInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ExpressRouteServiceProviderInner>(response.body()) {
+            @Override
+            public Page<ExpressRouteServiceProviderInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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<ExpressRouteServiceProviderInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ExpressRouteServiceProviderInner>> serviceFuture, final ListOperationCallback<ExpressRouteServiceProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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;ExpressRouteServiceProviderInner&gt; object
+     */
+    public Observable<Page<ExpressRouteServiceProviderInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ExpressRouteServiceProviderInner>>, Page<ExpressRouteServiceProviderInner>>() {
+                @Override
+                public Page<ExpressRouteServiceProviderInner> call(ServiceResponse<Page<ExpressRouteServiceProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+     * @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;ExpressRouteServiceProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ExpressRouteServiceProviderInner>>, Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(ServiceResponse<Page<ExpressRouteServiceProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the available express route service providers.
+     *
+    ServiceResponse<PageImpl<ExpressRouteServiceProviderInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ExpressRouteServiceProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> 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<ExpressRouteServiceProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ExpressRouteServiceProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ExpressRouteServiceProviderInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ExpressRouteServiceProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ExpressRouteServiceProviderInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ExpressRouteServiceProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ExpressRouteServiceProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesImpl.java
new file mode 100644
index 000000000000..ca39bc35f9e9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicy;
+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;
+
+class FirewallPoliciesImpl extends GroupableResourcesCoreImpl<FirewallPolicy, FirewallPolicyImpl, FirewallPolicyInner, FirewallPoliciesInner, NetworkManager>  implements FirewallPolicies {
+    protected FirewallPoliciesImpl(NetworkManager manager) {
+        super(manager.inner().firewallPolicies(), manager);
+    }
+
+    @Override
+    protected Observable<FirewallPolicyInner> getInnerAsync(String resourceGroupName, String name) {
+        FirewallPoliciesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        FirewallPoliciesInner 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<FirewallPolicy> listByResourceGroup(String resourceGroupName) {
+        FirewallPoliciesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<FirewallPolicy> listByResourceGroupAsync(String resourceGroupName) {
+        FirewallPoliciesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<FirewallPolicyInner>, Iterable<FirewallPolicyInner>>() {
+            @Override
+            public Iterable<FirewallPolicyInner> call(Page<FirewallPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<FirewallPolicyInner, FirewallPolicy>() {
+            @Override
+            public FirewallPolicy call(FirewallPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<FirewallPolicy> list() {
+        FirewallPoliciesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<FirewallPolicy> listAsync() {
+        FirewallPoliciesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<FirewallPolicyInner>, Iterable<FirewallPolicyInner>>() {
+            @Override
+            public Iterable<FirewallPolicyInner> call(Page<FirewallPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<FirewallPolicyInner, FirewallPolicy>() {
+            @Override
+            public FirewallPolicy call(FirewallPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public FirewallPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected FirewallPolicyImpl wrapModel(FirewallPolicyInner inner) {
+        return  new FirewallPolicyImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected FirewallPolicyImpl wrapModel(String name) {
+        return new FirewallPolicyImpl(name, new FirewallPolicyInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesInner.java
new file mode 100644
index 000000000000..d8486baa1e08
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPoliciesInner.java
@@ -0,0 +1,1030 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+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 FirewallPolicies.
+ */
+public class FirewallPoliciesInner implements InnerSupportsGet<FirewallPolicyInner>, InnerSupportsDelete<Void>, InnerSupportsListing<FirewallPolicyInner> {
+    /** The Retrofit service to perform REST calls. */
+    private FirewallPoliciesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of FirewallPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public FirewallPoliciesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(FirewallPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for FirewallPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface FirewallPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.FirewallPolicies delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @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.network.v2020_04_01.FirewallPolicies beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @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.network.v2020_04_01.FirewallPolicies getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.FirewallPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("subscriptionId") String subscriptionId, @Body FirewallPolicyInner 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.network.v2020_04_01.FirewallPolicies beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("subscriptionId") String subscriptionId, @Body FirewallPolicyInner 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.network.v2020_04_01.FirewallPolicies listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies")
+        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.network.v2020_04_01.FirewallPolicies list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/firewallPolicies")
+        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.network.v2020_04_01.FirewallPolicies 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.network.v2020_04_01.FirewallPolicies listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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 firewallPolicyName) {
+        deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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 firewallPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String firewallPolicyName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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 firewallPolicyName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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 firewallPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String firewallPolicyName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), 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 specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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 FirewallPolicyInner object if successful.
+     */
+    public FirewallPolicyInner getByResourceGroup(String resourceGroupName, String firewallPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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<FirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String firewallPolicyName, final ServiceCallback<FirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<FirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String firewallPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName).map(new Func1<ServiceResponse<FirewallPolicyInner>, FirewallPolicyInner>() {
+            @Override
+            public FirewallPolicyInner call(ServiceResponse<FirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<ServiceResponse<FirewallPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FirewallPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FirewallPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FirewallPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param expand Expands referenced resources.
+     * @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 FirewallPolicyInner object if successful.
+     */
+    public FirewallPolicyInner getByResourceGroup(String resourceGroupName, String firewallPolicyName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param expand Expands referenced resources.
+     * @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<FirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String firewallPolicyName, String expand, final ServiceCallback<FirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<FirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String firewallPolicyName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, firewallPolicyName, expand).map(new Func1<ServiceResponse<FirewallPolicyInner>, FirewallPolicyInner>() {
+            @Override
+            public FirewallPolicyInner call(ServiceResponse<FirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<ServiceResponse<FirewallPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FirewallPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FirewallPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FirewallPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FirewallPolicyInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FirewallPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FirewallPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy 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 FirewallPolicyInner object if successful.
+     */
+    public FirewallPolicyInner createOrUpdate(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @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<FirewallPolicyInner> createOrUpdateAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters, final ServiceCallback<FirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<FirewallPolicyInner> createOrUpdateAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters).map(new Func1<ServiceResponse<FirewallPolicyInner>, FirewallPolicyInner>() {
+            @Override
+            public FirewallPolicyInner call(ServiceResponse<FirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<FirewallPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<FirewallPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy 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 FirewallPolicyInner object if successful.
+     */
+    public FirewallPolicyInner beginCreateOrUpdate(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @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<FirewallPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters, final ServiceCallback<FirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<FirewallPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, parameters).map(new Func1<ServiceResponse<FirewallPolicyInner>, FirewallPolicyInner>() {
+            @Override
+            public FirewallPolicyInner call(ServiceResponse<FirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Firewall Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param parameters Parameters supplied to the create or update Firewall Policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyInner object
+     */
+    public Observable<ServiceResponse<FirewallPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, FirewallPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FirewallPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FirewallPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FirewallPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FirewallPolicyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FirewallPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FirewallPolicyInner>() { }.getType())
+                .register(201, new TypeToken<FirewallPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;FirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<FirewallPolicyInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<FirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<FirewallPolicyInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<FirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Page<FirewallPolicyInner>>() {
+                @Override
+                public Page<FirewallPolicyInner> call(ServiceResponse<Page<FirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(ServiceResponse<Page<FirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+    ServiceResponse<PageImpl<FirewallPolicyInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Firewall Policies in a 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;FirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyInner> list() {
+        ServiceResponse<Page<FirewallPolicyInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<FirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Firewall Policies in a 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<FirewallPolicyInner>> listAsync(final ListOperationCallback<FirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Page<FirewallPolicyInner>>() {
+                @Override
+                public Page<FirewallPolicyInner> call(ServiceResponse<Page<FirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(ServiceResponse<Page<FirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Firewall Policies in 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;FirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<FirewallPolicyInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<FirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Firewall Policies in 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<FirewallPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<FirewallPolicyInner>> serviceFuture, final ListOperationCallback<FirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Firewall Policies in 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;FirewallPolicyInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Page<FirewallPolicyInner>>() {
+                @Override
+                public Page<FirewallPolicyInner> call(ServiceResponse<Page<FirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Firewall Policies in 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;FirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(ServiceResponse<Page<FirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Firewall Policies in a resource group.
+     *
+    ServiceResponse<PageImpl<FirewallPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> 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<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @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;FirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<FirewallPolicyInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<FirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @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<FirewallPolicyInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<FirewallPolicyInner>> serviceFuture, final ListOperationCallback<FirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @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;FirewallPolicyInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Page<FirewallPolicyInner>>() {
+                @Override
+                public Page<FirewallPolicyInner> call(ServiceResponse<Page<FirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+     * @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;FirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyInner>>, Observable<ServiceResponse<Page<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(ServiceResponse<Page<FirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Firewall Policies in a subscription.
+     *
+    ServiceResponse<PageImpl<FirewallPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyInner>>> 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<FirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
new file mode 100644
index 000000000000..8524dbb51667
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
@@ -0,0 +1,145 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicy;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyThreatIntelWhitelist;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyIntrusionSystemMode;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyTransportSecurity;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+
+class FirewallPolicyImpl extends GroupableResourceCoreImpl<FirewallPolicy, FirewallPolicyInner, FirewallPolicyImpl, NetworkManager> implements FirewallPolicy, FirewallPolicy.Definition, FirewallPolicy.Update {
+    FirewallPolicyImpl(String name, FirewallPolicyInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<FirewallPolicy> createResourceAsync() {
+        FirewallPoliciesInner client = this.manager().inner().firewallPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<FirewallPolicy> updateResourceAsync() {
+        FirewallPoliciesInner client = this.manager().inner().firewallPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<FirewallPolicyInner> getInnerAsync() {
+        FirewallPoliciesInner client = this.manager().inner().firewallPolicies();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public SubResource basePolicy() {
+        return this.inner().basePolicy();
+    }
+
+    @Override
+    public List<SubResource> childPolicies() {
+        return this.inner().childPolicies();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<SubResource> firewalls() {
+        return this.inner().firewalls();
+    }
+
+    @Override
+    public ManagedServiceIdentity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
+        return this.inner().intrusionSystemMode();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<SubResource> ruleGroups() {
+        return this.inner().ruleGroups();
+    }
+
+    @Override
+    public AzureFirewallThreatIntelMode threatIntelMode() {
+        return this.inner().threatIntelMode();
+    }
+
+    @Override
+    public FirewallPolicyThreatIntelWhitelist threatIntelWhitelist() {
+        return this.inner().threatIntelWhitelist();
+    }
+
+    @Override
+    public FirewallPolicyTransportSecurity transportSecurity() {
+        return this.inner().transportSecurity();
+    }
+
+    @Override
+    public FirewallPolicyImpl withBasePolicy(SubResource basePolicy) {
+        this.inner().withBasePolicy(basePolicy);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyImpl withIdentity(ManagedServiceIdentity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyImpl withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
+        this.inner().withIntrusionSystemMode(intrusionSystemMode);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyImpl withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
+        this.inner().withThreatIntelMode(threatIntelMode);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyImpl withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist) {
+        this.inner().withThreatIntelWhitelist(threatIntelWhitelist);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyImpl withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity) {
+        this.inner().withTransportSecurity(transportSecurity);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
new file mode 100644
index 000000000000..f28266bd9845
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
@@ -0,0 +1,291 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyThreatIntelWhitelist;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyIntrusionSystemMode;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyTransportSecurity;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * FirewallPolicy Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class FirewallPolicyInner extends Resource {
+    /**
+     * List of references to FirewallPolicyRuleGroups.
+     */
+    @JsonProperty(value = "properties.ruleGroups", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> ruleGroups;
+
+    /**
+     * The provisioning state of the firewall policy resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The parent firewall policy from which rules are inherited.
+     */
+    @JsonProperty(value = "properties.basePolicy")
+    private SubResource basePolicy;
+
+    /**
+     * List of references to Azure Firewalls that this Firewall Policy is
+     * associated with.
+     */
+    @JsonProperty(value = "properties.firewalls", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> firewalls;
+
+    /**
+     * List of references to Child Firewall Policies.
+     */
+    @JsonProperty(value = "properties.childPolicies", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> childPolicies;
+
+    /**
+     * The operation mode for Threat Intelligence. Possible values include:
+     * 'Alert', 'Deny', 'Off'.
+     */
+    @JsonProperty(value = "properties.threatIntelMode")
+    private AzureFirewallThreatIntelMode threatIntelMode;
+
+    /**
+     * ThreatIntel Whitelist for Firewall Policy.
+     */
+    @JsonProperty(value = "properties.threatIntelWhitelist")
+    private FirewallPolicyThreatIntelWhitelist threatIntelWhitelist;
+
+    /**
+     * The operation mode for Intrusion system. Possible values include:
+     * 'Enabled', 'Disabled'.
+     */
+    @JsonProperty(value = "properties.intrusionSystemMode")
+    private FirewallPolicyIntrusionSystemMode intrusionSystemMode;
+
+    /**
+     * TLS Configuration definition.
+     */
+    @JsonProperty(value = "properties.transportSecurity")
+    private FirewallPolicyTransportSecurity transportSecurity;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The identity of the firewall policy.
+     */
+    @JsonProperty(value = "identity")
+    private ManagedServiceIdentity identity;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get list of references to FirewallPolicyRuleGroups.
+     *
+     * @return the ruleGroups value
+     */
+    public List<SubResource> ruleGroups() {
+        return this.ruleGroups;
+    }
+
+    /**
+     * Get the provisioning state of the firewall policy resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the parent firewall policy from which rules are inherited.
+     *
+     * @return the basePolicy value
+     */
+    public SubResource basePolicy() {
+        return this.basePolicy;
+    }
+
+    /**
+     * Set the parent firewall policy from which rules are inherited.
+     *
+     * @param basePolicy the basePolicy value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withBasePolicy(SubResource basePolicy) {
+        this.basePolicy = basePolicy;
+        return this;
+    }
+
+    /**
+     * Get list of references to Azure Firewalls that this Firewall Policy is associated with.
+     *
+     * @return the firewalls value
+     */
+    public List<SubResource> firewalls() {
+        return this.firewalls;
+    }
+
+    /**
+     * Get list of references to Child Firewall Policies.
+     *
+     * @return the childPolicies value
+     */
+    public List<SubResource> childPolicies() {
+        return this.childPolicies;
+    }
+
+    /**
+     * Get the operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'.
+     *
+     * @return the threatIntelMode value
+     */
+    public AzureFirewallThreatIntelMode threatIntelMode() {
+        return this.threatIntelMode;
+    }
+
+    /**
+     * Set the operation mode for Threat Intelligence. Possible values include: 'Alert', 'Deny', 'Off'.
+     *
+     * @param threatIntelMode the threatIntelMode value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
+        this.threatIntelMode = threatIntelMode;
+        return this;
+    }
+
+    /**
+     * Get threatIntel Whitelist for Firewall Policy.
+     *
+     * @return the threatIntelWhitelist value
+     */
+    public FirewallPolicyThreatIntelWhitelist threatIntelWhitelist() {
+        return this.threatIntelWhitelist;
+    }
+
+    /**
+     * Set threatIntel Whitelist for Firewall Policy.
+     *
+     * @param threatIntelWhitelist the threatIntelWhitelist value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist) {
+        this.threatIntelWhitelist = threatIntelWhitelist;
+        return this;
+    }
+
+    /**
+     * Get the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @return the intrusionSystemMode value
+     */
+    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
+        return this.intrusionSystemMode;
+    }
+
+    /**
+     * Set the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
+     *
+     * @param intrusionSystemMode the intrusionSystemMode value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
+        this.intrusionSystemMode = intrusionSystemMode;
+        return this;
+    }
+
+    /**
+     * Get tLS Configuration definition.
+     *
+     * @return the transportSecurity value
+     */
+    public FirewallPolicyTransportSecurity transportSecurity() {
+        return this.transportSecurity;
+    }
+
+    /**
+     * Set tLS Configuration definition.
+     *
+     * @param transportSecurity the transportSecurity value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity) {
+        this.transportSecurity = transportSecurity;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the identity of the firewall policy.
+     *
+     * @return the identity value
+     */
+    public ManagedServiceIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the identity of the firewall policy.
+     *
+     * @param identity the identity value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withIdentity(ManagedServiceIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the FirewallPolicyInner object itself.
+     */
+    public FirewallPolicyInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupImpl.java
new file mode 100644
index 000000000000..e2a62c952278
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupImpl.java
@@ -0,0 +1,141 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRuleGroup;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRule;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class FirewallPolicyRuleGroupImpl extends CreatableUpdatableImpl<FirewallPolicyRuleGroup, FirewallPolicyRuleGroupInner, FirewallPolicyRuleGroupImpl> implements FirewallPolicyRuleGroup, FirewallPolicyRuleGroup.Definition, FirewallPolicyRuleGroup.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String firewallPolicyName;
+    private String ruleGroupName;
+
+    FirewallPolicyRuleGroupImpl(String name, NetworkManager manager) {
+        super(name, new FirewallPolicyRuleGroupInner());
+        this.manager = manager;
+        // Set resource name
+        this.ruleGroupName = name;
+        //
+    }
+
+    FirewallPolicyRuleGroupImpl(FirewallPolicyRuleGroupInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.ruleGroupName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.firewallPolicyName = IdParsingUtils.getValueFromIdByName(inner.id(), "firewallPolicies");
+        this.ruleGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "ruleGroups");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<FirewallPolicyRuleGroup> createResourceAsync() {
+        FirewallPolicyRuleGroupsInner client = this.manager().inner().firewallPolicyRuleGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.firewallPolicyName, this.ruleGroupName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<FirewallPolicyRuleGroup> updateResourceAsync() {
+        FirewallPolicyRuleGroupsInner client = this.manager().inner().firewallPolicyRuleGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.firewallPolicyName, this.ruleGroupName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<FirewallPolicyRuleGroupInner> getInnerAsync() {
+        FirewallPolicyRuleGroupsInner client = this.manager().inner().firewallPolicyRuleGroups();
+        return client.getAsync(this.resourceGroupName, this.firewallPolicyName, this.ruleGroupName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer priority() {
+        return this.inner().priority();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<FirewallPolicyRule> rules() {
+        return this.inner().rules();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl withExistingFirewallPolicy(String resourceGroupName, String firewallPolicyName) {
+        this.resourceGroupName = resourceGroupName;
+        this.firewallPolicyName = firewallPolicyName;
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl withPriority(Integer priority) {
+        this.inner().withPriority(priority);
+        return this;
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl withRules(List<FirewallPolicyRule> rules) {
+        this.inner().withRules(rules);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupInner.java
new file mode 100644
index 000000000000..3b4d606891cc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupInner.java
@@ -0,0 +1,148 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRule;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Rule Group resource.
+ */
+@JsonFlatten
+public class FirewallPolicyRuleGroupInner extends SubResource {
+    /**
+     * Priority of the Firewall Policy Rule Group resource.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * Group of Firewall Policy rules.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<FirewallPolicyRule> rules;
+
+    /**
+     * The provisioning state of the firewall policy rule group resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Rule Group type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get priority of the Firewall Policy Rule Group resource.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of the Firewall Policy Rule Group resource.
+     *
+     * @param priority the priority value to set
+     * @return the FirewallPolicyRuleGroupInner object itself.
+     */
+    public FirewallPolicyRuleGroupInner withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get group of Firewall Policy rules.
+     *
+     * @return the rules value
+     */
+    public List<FirewallPolicyRule> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set group of Firewall Policy rules.
+     *
+     * @param rules the rules value to set
+     * @return the FirewallPolicyRuleGroupInner object itself.
+     */
+    public FirewallPolicyRuleGroupInner withRules(List<FirewallPolicyRule> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the firewall policy rule group resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the FirewallPolicyRuleGroupInner object itself.
+     */
+    public FirewallPolicyRuleGroupInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get rule Group type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsImpl.java
new file mode 100644
index 000000000000..5a0c301916bb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRuleGroups;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRuleGroup;
+
+class FirewallPolicyRuleGroupsImpl extends WrapperImpl<FirewallPolicyRuleGroupsInner> implements FirewallPolicyRuleGroups {
+    private final NetworkManager manager;
+
+    FirewallPolicyRuleGroupsImpl(NetworkManager manager) {
+        super(manager.inner().firewallPolicyRuleGroups());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public FirewallPolicyRuleGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private FirewallPolicyRuleGroupImpl wrapModel(FirewallPolicyRuleGroupInner inner) {
+        return  new FirewallPolicyRuleGroupImpl(inner, manager());
+    }
+
+    private FirewallPolicyRuleGroupImpl wrapModel(String name) {
+        return new FirewallPolicyRuleGroupImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<FirewallPolicyRuleGroup> listAsync(final String resourceGroupName, final String firewallPolicyName) {
+        FirewallPolicyRuleGroupsInner client = this.inner();
+        return client.listAsync(resourceGroupName, firewallPolicyName)
+        .flatMapIterable(new Func1<Page<FirewallPolicyRuleGroupInner>, Iterable<FirewallPolicyRuleGroupInner>>() {
+            @Override
+            public Iterable<FirewallPolicyRuleGroupInner> call(Page<FirewallPolicyRuleGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<FirewallPolicyRuleGroupInner, FirewallPolicyRuleGroup>() {
+            @Override
+            public FirewallPolicyRuleGroup call(FirewallPolicyRuleGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<FirewallPolicyRuleGroup> getAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        FirewallPolicyRuleGroupsInner client = this.inner();
+        return client.getAsync(resourceGroupName, firewallPolicyName, ruleGroupName)
+        .flatMap(new Func1<FirewallPolicyRuleGroupInner, Observable<FirewallPolicyRuleGroup>>() {
+            @Override
+            public Observable<FirewallPolicyRuleGroup> call(FirewallPolicyRuleGroupInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FirewallPolicyRuleGroup)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        FirewallPolicyRuleGroupsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, firewallPolicyName, ruleGroupName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsInner.java
new file mode 100644
index 000000000000..21c81f321cd7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyRuleGroupsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 FirewallPolicyRuleGroups.
+ */
+public class FirewallPolicyRuleGroupsInner {
+    /** The Retrofit service to perform REST calls. */
+    private FirewallPolicyRuleGroupsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of FirewallPolicyRuleGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public FirewallPolicyRuleGroupsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(FirewallPolicyRuleGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for FirewallPolicyRuleGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface FirewallPolicyRuleGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRuleGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("ruleGroupName") String ruleGroupName, @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.network.v2020_04_01.FirewallPolicyRuleGroups beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("ruleGroupName") String ruleGroupName, @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.network.v2020_04_01.FirewallPolicyRuleGroups get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("ruleGroupName") String ruleGroupName, @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.network.v2020_04_01.FirewallPolicyRuleGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("ruleGroupName") String ruleGroupName, @Path("subscriptionId") String subscriptionId, @Body FirewallPolicyRuleGroupInner 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.network.v2020_04_01.FirewallPolicyRuleGroups beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @Path("ruleGroupName") String ruleGroupName, @Path("subscriptionId") String subscriptionId, @Body FirewallPolicyRuleGroupInner 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.network.v2020_04_01.FirewallPolicyRuleGroups list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("firewallPolicyName") String firewallPolicyName, @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.network.v2020_04_01.FirewallPolicyRuleGroups listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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 firewallPolicyName, String ruleGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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 firewallPolicyName, String ruleGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (ruleGroupName == null) {
+            throw new IllegalArgumentException("Parameter ruleGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, firewallPolicyName, ruleGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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 firewallPolicyName, String ruleGroupName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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 firewallPolicyName, String ruleGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (ruleGroupName == null) {
+            throw new IllegalArgumentException("Parameter ruleGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, firewallPolicyName, ruleGroupName, this.client.subscriptionId(), 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 specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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 FirewallPolicyRuleGroupInner object if successful.
+     */
+    public FirewallPolicyRuleGroupInner get(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @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<FirewallPolicyRuleGroupInner> getAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, final ServiceCallback<FirewallPolicyRuleGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyRuleGroupInner object
+     */
+    public Observable<FirewallPolicyRuleGroupInner> getAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName).map(new Func1<ServiceResponse<FirewallPolicyRuleGroupInner>, FirewallPolicyRuleGroupInner>() {
+            @Override
+            public FirewallPolicyRuleGroupInner call(ServiceResponse<FirewallPolicyRuleGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyRuleGroupInner object
+     */
+    public Observable<ServiceResponse<FirewallPolicyRuleGroupInner>> getWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (ruleGroupName == null) {
+            throw new IllegalArgumentException("Parameter ruleGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, firewallPolicyName, ruleGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FirewallPolicyRuleGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FirewallPolicyRuleGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FirewallPolicyRuleGroupInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FirewallPolicyRuleGroupInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FirewallPolicyRuleGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FirewallPolicyRuleGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup 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 FirewallPolicyRuleGroupInner object if successful.
+     */
+    public FirewallPolicyRuleGroupInner createOrUpdate(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @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<FirewallPolicyRuleGroupInner> createOrUpdateAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters, final ServiceCallback<FirewallPolicyRuleGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<FirewallPolicyRuleGroupInner> createOrUpdateAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters).map(new Func1<ServiceResponse<FirewallPolicyRuleGroupInner>, FirewallPolicyRuleGroupInner>() {
+            @Override
+            public FirewallPolicyRuleGroupInner call(ServiceResponse<FirewallPolicyRuleGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<FirewallPolicyRuleGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (ruleGroupName == null) {
+            throw new IllegalArgumentException("Parameter ruleGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, firewallPolicyName, ruleGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<FirewallPolicyRuleGroupInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup 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 FirewallPolicyRuleGroupInner object if successful.
+     */
+    public FirewallPolicyRuleGroupInner beginCreateOrUpdate(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @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<FirewallPolicyRuleGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters, final ServiceCallback<FirewallPolicyRuleGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyRuleGroupInner object
+     */
+    public Observable<FirewallPolicyRuleGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, firewallPolicyName, ruleGroupName, parameters).map(new Func1<ServiceResponse<FirewallPolicyRuleGroupInner>, FirewallPolicyRuleGroupInner>() {
+            @Override
+            public FirewallPolicyRuleGroupInner call(ServiceResponse<FirewallPolicyRuleGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified FirewallPolicyRuleGroup.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @param ruleGroupName The name of the FirewallPolicyRuleGroup.
+     * @param parameters Parameters supplied to the create or update FirewallPolicyRuleGroup operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FirewallPolicyRuleGroupInner object
+     */
+    public Observable<ServiceResponse<FirewallPolicyRuleGroupInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String firewallPolicyName, String ruleGroupName, FirewallPolicyRuleGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (ruleGroupName == null) {
+            throw new IllegalArgumentException("Parameter ruleGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, firewallPolicyName, ruleGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FirewallPolicyRuleGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FirewallPolicyRuleGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FirewallPolicyRuleGroupInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FirewallPolicyRuleGroupInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FirewallPolicyRuleGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FirewallPolicyRuleGroupInner>() { }.getType())
+                .register(201, new TypeToken<FirewallPolicyRuleGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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;FirewallPolicyRuleGroupInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyRuleGroupInner> list(final String resourceGroupName, final String firewallPolicyName) {
+        ServiceResponse<Page<FirewallPolicyRuleGroupInner>> response = listSinglePageAsync(resourceGroupName, firewallPolicyName).toBlocking().single();
+        return new PagedList<FirewallPolicyRuleGroupInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyRuleGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @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<FirewallPolicyRuleGroupInner>> listAsync(final String resourceGroupName, final String firewallPolicyName, final ListOperationCallback<FirewallPolicyRuleGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, firewallPolicyName),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyRuleGroupInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyRuleGroupInner>> listAsync(final String resourceGroupName, final String firewallPolicyName) {
+        return listWithServiceResponseAsync(resourceGroupName, firewallPolicyName)
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>, Page<FirewallPolicyRuleGroupInner>>() {
+                @Override
+                public Page<FirewallPolicyRuleGroupInner> call(ServiceResponse<Page<FirewallPolicyRuleGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FirewallPolicyRuleGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String firewallPolicyName) {
+        return listSinglePageAsync(resourceGroupName, firewallPolicyName)
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>, Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(ServiceResponse<Page<FirewallPolicyRuleGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+    ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> * @param firewallPolicyName The name of the Firewall Policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyRuleGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> listSinglePageAsync(final String resourceGroupName, final String firewallPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (firewallPolicyName == null) {
+            throw new IllegalArgumentException("Parameter firewallPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, firewallPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyRuleGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyRuleGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyRuleGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @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;FirewallPolicyRuleGroupInner&gt; object if successful.
+     */
+    public PagedList<FirewallPolicyRuleGroupInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<FirewallPolicyRuleGroupInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<FirewallPolicyRuleGroupInner>(response.body()) {
+            @Override
+            public Page<FirewallPolicyRuleGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @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<FirewallPolicyRuleGroupInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<FirewallPolicyRuleGroupInner>> serviceFuture, final ListOperationCallback<FirewallPolicyRuleGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @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;FirewallPolicyRuleGroupInner&gt; object
+     */
+    public Observable<Page<FirewallPolicyRuleGroupInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>, Page<FirewallPolicyRuleGroupInner>>() {
+                @Override
+                public Page<FirewallPolicyRuleGroupInner> call(ServiceResponse<Page<FirewallPolicyRuleGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+     * @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;FirewallPolicyRuleGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>, Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(ServiceResponse<Page<FirewallPolicyRuleGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.
+     *
+    ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FirewallPolicyRuleGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> 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<FirewallPolicyRuleGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FirewallPolicyRuleGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FirewallPolicyRuleGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FirewallPolicyRuleGroupInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FirewallPolicyRuleGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FirewallPolicyRuleGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogImpl.java
new file mode 100644
index 000000000000..fdaff93dd3c4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogImpl.java
@@ -0,0 +1,208 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.FlowLog;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.RetentionPolicyParameters;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogFormatParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficAnalyticsProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class FlowLogImpl extends CreatableUpdatableImpl<FlowLog, FlowLogInner, FlowLogImpl> implements FlowLog, FlowLog.Definition, FlowLog.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkWatcherName;
+    private String flowLogName;
+
+    FlowLogImpl(String name, NetworkManager manager) {
+        super(name, new FlowLogInner());
+        this.manager = manager;
+        // Set resource name
+        this.flowLogName = name;
+        //
+    }
+
+    FlowLogImpl(FlowLogInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.flowLogName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkWatcherName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkWatchers");
+        this.flowLogName = IdParsingUtils.getValueFromIdByName(inner.id(), "flowLogs");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<FlowLog> createResourceAsync() {
+        FlowLogsInner client = this.manager().inner().flowLogs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkWatcherName, this.flowLogName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<FlowLog> updateResourceAsync() {
+        FlowLogsInner client = this.manager().inner().flowLogs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkWatcherName, this.flowLogName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<FlowLogInner> getInnerAsync() {
+        FlowLogsInner client = this.manager().inner().flowLogs();
+        return client.getAsync(this.resourceGroupName, this.networkWatcherName, this.flowLogName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean enabled() {
+        return this.inner().enabled();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public TrafficAnalyticsProperties flowAnalyticsConfiguration() {
+        return this.inner().flowAnalyticsConfiguration();
+    }
+
+    @Override
+    public FlowLogFormatParameters format() {
+        return this.inner().format();
+    }
+
+    @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 ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public RetentionPolicyParameters retentionPolicy() {
+        return this.inner().retentionPolicy();
+    }
+
+    @Override
+    public String storageId() {
+        return this.inner().storageId();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String targetResourceGuid() {
+        return this.inner().targetResourceGuid();
+    }
+
+    @Override
+    public String targetResourceId() {
+        return this.inner().targetResourceId();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public FlowLogImpl withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName) {
+        this.resourceGroupName = resourceGroupName;
+        this.networkWatcherName = networkWatcherName;
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withStorageId(String storageId) {
+        this.inner().withStorageId(storageId);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withTargetResourceId(String targetResourceId) {
+        this.inner().withTargetResourceId(targetResourceId);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withEnabled(Boolean enabled) {
+        this.inner().withEnabled(enabled);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withFlowAnalyticsConfiguration(TrafficAnalyticsProperties flowAnalyticsConfiguration) {
+        this.inner().withFlowAnalyticsConfiguration(flowAnalyticsConfiguration);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withFormat(FlowLogFormatParameters format) {
+        this.inner().withFormat(format);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withLocation(String location) {
+        this.inner().withLocation(location);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withRetentionPolicy(RetentionPolicyParameters retentionPolicy) {
+        this.inner().withRetentionPolicy(retentionPolicy);
+        return this;
+    }
+
+    @Override
+    public FlowLogImpl withTags(Map<String, String> tags) {
+        this.inner().withTags(tags);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationImpl.java
new file mode 100644
index 000000000000..9467373fc699
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogInformation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficAnalyticsProperties;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogFormatParameters;
+import com.microsoft.azure.management.network.v2020_04_01.RetentionPolicyParameters;
+
+class FlowLogInformationImpl extends WrapperImpl<FlowLogInformationInner> implements FlowLogInformation {
+    private final NetworkManager manager;
+    FlowLogInformationImpl(FlowLogInformationInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public boolean enabled() {
+        return this.inner().enabled();
+    }
+
+    @Override
+    public TrafficAnalyticsProperties flowAnalyticsConfiguration() {
+        return this.inner().flowAnalyticsConfiguration();
+    }
+
+    @Override
+    public FlowLogFormatParameters format() {
+        return this.inner().format();
+    }
+
+    @Override
+    public RetentionPolicyParameters retentionPolicy() {
+        return this.inner().retentionPolicy();
+    }
+
+    @Override
+    public String storageId() {
+        return this.inner().storageId();
+    }
+
+    @Override
+    public String targetResourceId() {
+        return this.inner().targetResourceId();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationInner.java
new file mode 100644
index 000000000000..954740ce6a0e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInformationInner.java
@@ -0,0 +1,180 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.RetentionPolicyParameters;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogFormatParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficAnalyticsProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Information on the configuration of flow log and traffic analytics
+ * (optional) .
+ */
+@JsonFlatten
+public class FlowLogInformationInner {
+    /**
+     * The ID of the resource to configure for flow log and traffic analytics
+     * (optional) .
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * ID of the storage account which is used to store the flow log.
+     */
+    @JsonProperty(value = "properties.storageId", required = true)
+    private String storageId;
+
+    /**
+     * Flag to enable/disable flow logging.
+     */
+    @JsonProperty(value = "properties.enabled", required = true)
+    private boolean enabled;
+
+    /**
+     * Parameters that define the retention policy for flow log.
+     */
+    @JsonProperty(value = "properties.retentionPolicy")
+    private RetentionPolicyParameters retentionPolicy;
+
+    /**
+     * Parameters that define the flow log format.
+     */
+    @JsonProperty(value = "properties.format")
+    private FlowLogFormatParameters format;
+
+    /**
+     * Parameters that define the configuration of traffic analytics.
+     */
+    @JsonProperty(value = "flowAnalyticsConfiguration")
+    private TrafficAnalyticsProperties flowAnalyticsConfiguration;
+
+    /**
+     * Get the ID of the resource to configure for flow log and traffic analytics (optional) .
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the ID of the resource to configure for flow log and traffic analytics (optional) .
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get iD of the storage account which is used to store the flow log.
+     *
+     * @return the storageId value
+     */
+    public String storageId() {
+        return this.storageId;
+    }
+
+    /**
+     * Set iD of the storage account which is used to store the flow log.
+     *
+     * @param storageId the storageId value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withStorageId(String storageId) {
+        this.storageId = storageId;
+        return this;
+    }
+
+    /**
+     * Get flag to enable/disable flow logging.
+     *
+     * @return the enabled value
+     */
+    public boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set flag to enable/disable flow logging.
+     *
+     * @param enabled the enabled value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the retention policy for flow log.
+     *
+     * @return the retentionPolicy value
+     */
+    public RetentionPolicyParameters retentionPolicy() {
+        return this.retentionPolicy;
+    }
+
+    /**
+     * Set parameters that define the retention policy for flow log.
+     *
+     * @param retentionPolicy the retentionPolicy value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withRetentionPolicy(RetentionPolicyParameters retentionPolicy) {
+        this.retentionPolicy = retentionPolicy;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the flow log format.
+     *
+     * @return the format value
+     */
+    public FlowLogFormatParameters format() {
+        return this.format;
+    }
+
+    /**
+     * Set parameters that define the flow log format.
+     *
+     * @param format the format value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withFormat(FlowLogFormatParameters format) {
+        this.format = format;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the configuration of traffic analytics.
+     *
+     * @return the flowAnalyticsConfiguration value
+     */
+    public TrafficAnalyticsProperties flowAnalyticsConfiguration() {
+        return this.flowAnalyticsConfiguration;
+    }
+
+    /**
+     * Set parameters that define the configuration of traffic analytics.
+     *
+     * @param flowAnalyticsConfiguration the flowAnalyticsConfiguration value to set
+     * @return the FlowLogInformationInner object itself.
+     */
+    public FlowLogInformationInner withFlowAnalyticsConfiguration(TrafficAnalyticsProperties flowAnalyticsConfiguration) {
+        this.flowAnalyticsConfiguration = flowAnalyticsConfiguration;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInner.java
new file mode 100644
index 000000000000..24e014cfb696
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogInner.java
@@ -0,0 +1,254 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.RetentionPolicyParameters;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogFormatParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficAnalyticsProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A flow log resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class FlowLogInner extends Resource {
+    /**
+     * ID of network security group to which flow log will be applied.
+     */
+    @JsonProperty(value = "properties.targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * Guid of network security group to which flow log will be applied.
+     */
+    @JsonProperty(value = "properties.targetResourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetResourceGuid;
+
+    /**
+     * ID of the storage account which is used to store the flow log.
+     */
+    @JsonProperty(value = "properties.storageId", required = true)
+    private String storageId;
+
+    /**
+     * Flag to enable/disable flow logging.
+     */
+    @JsonProperty(value = "properties.enabled")
+    private Boolean enabled;
+
+    /**
+     * Parameters that define the retention policy for flow log.
+     */
+    @JsonProperty(value = "properties.retentionPolicy")
+    private RetentionPolicyParameters retentionPolicy;
+
+    /**
+     * Parameters that define the flow log format.
+     */
+    @JsonProperty(value = "properties.format")
+    private FlowLogFormatParameters format;
+
+    /**
+     * Parameters that define the configuration of traffic analytics.
+     */
+    @JsonProperty(value = "properties.flowAnalyticsConfiguration")
+    private TrafficAnalyticsProperties flowAnalyticsConfiguration;
+
+    /**
+     * The provisioning state of the flow log. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get iD of network security group to which flow log will be applied.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set iD of network security group to which flow log will be applied.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get guid of network security group to which flow log will be applied.
+     *
+     * @return the targetResourceGuid value
+     */
+    public String targetResourceGuid() {
+        return this.targetResourceGuid;
+    }
+
+    /**
+     * Get iD of the storage account which is used to store the flow log.
+     *
+     * @return the storageId value
+     */
+    public String storageId() {
+        return this.storageId;
+    }
+
+    /**
+     * Set iD of the storage account which is used to store the flow log.
+     *
+     * @param storageId the storageId value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withStorageId(String storageId) {
+        this.storageId = storageId;
+        return this;
+    }
+
+    /**
+     * Get flag to enable/disable flow logging.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set flag to enable/disable flow logging.
+     *
+     * @param enabled the enabled value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the retention policy for flow log.
+     *
+     * @return the retentionPolicy value
+     */
+    public RetentionPolicyParameters retentionPolicy() {
+        return this.retentionPolicy;
+    }
+
+    /**
+     * Set parameters that define the retention policy for flow log.
+     *
+     * @param retentionPolicy the retentionPolicy value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withRetentionPolicy(RetentionPolicyParameters retentionPolicy) {
+        this.retentionPolicy = retentionPolicy;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the flow log format.
+     *
+     * @return the format value
+     */
+    public FlowLogFormatParameters format() {
+        return this.format;
+    }
+
+    /**
+     * Set parameters that define the flow log format.
+     *
+     * @param format the format value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withFormat(FlowLogFormatParameters format) {
+        this.format = format;
+        return this;
+    }
+
+    /**
+     * Get parameters that define the configuration of traffic analytics.
+     *
+     * @return the flowAnalyticsConfiguration value
+     */
+    public TrafficAnalyticsProperties flowAnalyticsConfiguration() {
+        return this.flowAnalyticsConfiguration;
+    }
+
+    /**
+     * Set parameters that define the configuration of traffic analytics.
+     *
+     * @param flowAnalyticsConfiguration the flowAnalyticsConfiguration value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withFlowAnalyticsConfiguration(TrafficAnalyticsProperties flowAnalyticsConfiguration) {
+        this.flowAnalyticsConfiguration = flowAnalyticsConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the flow log. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the FlowLogInner object itself.
+     */
+    public FlowLogInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsImpl.java
new file mode 100644
index 000000000000..0776d963c43f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogs;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLog;
+
+class FlowLogsImpl extends WrapperImpl<FlowLogsInner> implements FlowLogs {
+    private final NetworkManager manager;
+
+    FlowLogsImpl(NetworkManager manager) {
+        super(manager.inner().flowLogs());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public FlowLogImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private FlowLogImpl wrapModel(FlowLogInner inner) {
+        return  new FlowLogImpl(inner, manager());
+    }
+
+    private FlowLogImpl wrapModel(String name) {
+        return new FlowLogImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<FlowLog> listAsync(final String resourceGroupName, final String networkWatcherName) {
+        FlowLogsInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkWatcherName)
+        .flatMapIterable(new Func1<Page<FlowLogInner>, Iterable<FlowLogInner>>() {
+            @Override
+            public Iterable<FlowLogInner> call(Page<FlowLogInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<FlowLogInner, FlowLog>() {
+            @Override
+            public FlowLog call(FlowLogInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<FlowLog> getAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        FlowLogsInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkWatcherName, flowLogName)
+        .flatMap(new Func1<FlowLogInner, Observable<FlowLog>>() {
+            @Override
+            public Observable<FlowLog> call(FlowLogInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FlowLog)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        FlowLogsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, networkWatcherName, flowLogName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsInner.java
new file mode 100644
index 000000000000..232dc70a1e44
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FlowLogsInner.java
@@ -0,0 +1,763 @@
+/**
+ * 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.network.v2020_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.network.v2020_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.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 FlowLogs.
+ */
+public class FlowLogsInner {
+    /** The Retrofit service to perform REST calls. */
+    private FlowLogsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of FlowLogsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public FlowLogsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(FlowLogsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for FlowLogs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface FlowLogsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.FlowLogs createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("flowLogName") String flowLogName, @Path("subscriptionId") String subscriptionId, @Body FlowLogInner 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.network.v2020_04_01.FlowLogs beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("flowLogName") String flowLogName, @Path("subscriptionId") String subscriptionId, @Body FlowLogInner 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.network.v2020_04_01.FlowLogs get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("flowLogName") String flowLogName, @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.network.v2020_04_01.FlowLogs delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("flowLogName") String flowLogName, @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.network.v2020_04_01.FlowLogs beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("flowLogName") String flowLogName, @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.network.v2020_04_01.FlowLogs list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @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.network.v2020_04_01.FlowLogs listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log 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 FlowLogInner object if successful.
+     */
+    public FlowLogInner createOrUpdate(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log 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<FlowLogInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters, final ServiceCallback<FlowLogInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<FlowLogInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters).map(new Func1<ServiceResponse<FlowLogInner>, FlowLogInner>() {
+            @Override
+            public FlowLogInner call(ServiceResponse<FlowLogInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<FlowLogInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (flowLogName == null) {
+            throw new IllegalArgumentException("Parameter flowLogName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkWatcherName, flowLogName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<FlowLogInner>() { }.getType());
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log 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 FlowLogInner object if successful.
+     */
+    public FlowLogInner beginCreateOrUpdate(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log 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<FlowLogInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters, final ServiceCallback<FlowLogInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInner object
+     */
+    public Observable<FlowLogInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName, parameters).map(new Func1<ServiceResponse<FlowLogInner>, FlowLogInner>() {
+            @Override
+            public FlowLogInner call(ServiceResponse<FlowLogInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update a flow log for the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log.
+     * @param parameters Parameters that define the create or update flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInner object
+     */
+    public Observable<ServiceResponse<FlowLogInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String flowLogName, FlowLogInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (flowLogName == null) {
+            throw new IllegalArgumentException("Parameter flowLogName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkWatcherName, flowLogName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FlowLogInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FlowLogInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FlowLogInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FlowLogInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FlowLogInner>() { }.getType())
+                .register(201, new TypeToken<FlowLogInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a flow log resource by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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 FlowLogInner object if successful.
+     */
+    public FlowLogInner get(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a flow log resource by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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<FlowLogInner> getAsync(String resourceGroupName, String networkWatcherName, String flowLogName, final ServiceCallback<FlowLogInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName), serviceCallback);
+    }
+
+    /**
+     * Gets a flow log resource by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInner object
+     */
+    public Observable<FlowLogInner> getAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).map(new Func1<ServiceResponse<FlowLogInner>, FlowLogInner>() {
+            @Override
+            public FlowLogInner call(ServiceResponse<FlowLogInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a flow log resource by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInner object
+     */
+    public Observable<ServiceResponse<FlowLogInner>> getWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (flowLogName == null) {
+            throw new IllegalArgumentException("Parameter flowLogName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkWatcherName, flowLogName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FlowLogInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FlowLogInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FlowLogInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FlowLogInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FlowLogInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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
+     */
+    public void delete(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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<Void> deleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (flowLogName == null) {
+            throw new IllegalArgumentException("Parameter flowLogName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkWatcherName, flowLogName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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
+     */
+    public void beginDelete(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log 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<Void> beginDeleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, flowLogName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified flow log resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param flowLogName The name of the flow log resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String flowLogName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (flowLogName == null) {
+            throw new IllegalArgumentException("Parameter flowLogName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkWatcherName, flowLogName, this.client.subscriptionId(), 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher 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 PagedList&lt;FlowLogInner&gt; object if successful.
+     */
+    public PagedList<FlowLogInner> list(final String resourceGroupName, final String networkWatcherName) {
+        ServiceResponse<Page<FlowLogInner>> response = listSinglePageAsync(resourceGroupName, networkWatcherName).toBlocking().single();
+        return new PagedList<FlowLogInner>(response.body()) {
+            @Override
+            public Page<FlowLogInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher 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<List<FlowLogInner>> listAsync(final String resourceGroupName, final String networkWatcherName, final ListOperationCallback<FlowLogInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkWatcherName),
+            new Func1<String, Observable<ServiceResponse<Page<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FlowLogInner&gt; object
+     */
+    public Observable<Page<FlowLogInner>> listAsync(final String resourceGroupName, final String networkWatcherName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkWatcherName)
+            .map(new Func1<ServiceResponse<Page<FlowLogInner>>, Page<FlowLogInner>>() {
+                @Override
+                public Page<FlowLogInner> call(ServiceResponse<Page<FlowLogInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @param resourceGroupName The name of the resource group containing Network Watcher.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FlowLogInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FlowLogInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkWatcherName) {
+        return listSinglePageAsync(resourceGroupName, networkWatcherName)
+            .concatMap(new Func1<ServiceResponse<Page<FlowLogInner>>, Observable<ServiceResponse<Page<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(ServiceResponse<Page<FlowLogInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+    ServiceResponse<PageImpl<FlowLogInner>> * @param resourceGroupName The name of the resource group containing Network Watcher.
+    ServiceResponse<PageImpl<FlowLogInner>> * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FlowLogInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FlowLogInner>>> listSinglePageAsync(final String resourceGroupName, final String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FlowLogInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FlowLogInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FlowLogInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FlowLogInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FlowLogInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @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;FlowLogInner&gt; object if successful.
+     */
+    public PagedList<FlowLogInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<FlowLogInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<FlowLogInner>(response.body()) {
+            @Override
+            public Page<FlowLogInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @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<FlowLogInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<FlowLogInner>> serviceFuture, final ListOperationCallback<FlowLogInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @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;FlowLogInner&gt; object
+     */
+    public Observable<Page<FlowLogInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<FlowLogInner>>, Page<FlowLogInner>>() {
+                @Override
+                public Page<FlowLogInner> call(ServiceResponse<Page<FlowLogInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+     * @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;FlowLogInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FlowLogInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<FlowLogInner>>, Observable<ServiceResponse<Page<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(ServiceResponse<Page<FlowLogInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all flow log resources for the specified Network Watcher.
+     *
+    ServiceResponse<PageImpl<FlowLogInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FlowLogInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FlowLogInner>>> 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<FlowLogInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FlowLogInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FlowLogInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FlowLogInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FlowLogInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FlowLogInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FlowLogInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationImpl.java
new file mode 100644
index 000000000000..ddc2d0dac47e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationImpl.java
@@ -0,0 +1,140 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddress;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class FrontendIPConfigurationImpl extends IndexableRefreshableWrapperImpl<FrontendIPConfiguration, FrontendIPConfigurationInner> implements FrontendIPConfiguration {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String frontendIPConfigurationName;
+
+    FrontendIPConfigurationImpl(FrontendIPConfigurationInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.frontendIPConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "frontendIPConfigurations");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<FrontendIPConfigurationInner> getInnerAsync() {
+        LoadBalancerFrontendIPConfigurationsInner client = this.manager().inner().loadBalancerFrontendIPConfigurations();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.frontendIPConfigurationName);
+    }
+
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<SubResource> inboundNatPools() {
+        return this.inner().inboundNatPools();
+    }
+
+    @Override
+    public List<SubResource> inboundNatRules() {
+        return this.inner().inboundNatRules();
+    }
+
+    @Override
+    public List<SubResource> loadBalancingRules() {
+        return this.inner().loadBalancingRules();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<SubResource> outboundRules() {
+        return this.inner().outboundRules();
+    }
+
+    @Override
+    public String privateIPAddress() {
+        return this.inner().privateIPAddress();
+    }
+
+    @Override
+    public IPVersion privateIPAddressVersion() {
+        return this.inner().privateIPAddressVersion();
+    }
+
+    @Override
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.inner().privateIPAllocationMethod();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PublicIPAddress publicIPAddress() {
+        PublicIPAddressInner inner = this.inner().publicIPAddress();
+        if (inner != null) {
+            return  new PublicIPAddressImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public SubResource publicIPPrefix() {
+        return this.inner().publicIPPrefix();
+    }
+
+    @Override
+    public Subnet subnet() {
+        SubnetInner inner = this.inner().subnet();
+        if (inner != null) {
+            return  new SubnetImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationInner.java
new file mode 100644
index 000000000000..bdfc43b2265a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FrontendIPConfigurationInner.java
@@ -0,0 +1,344 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Frontend IP address of the load balancer.
+ */
+@JsonFlatten
+public class FrontendIPConfigurationInner extends SubResource {
+    /**
+     * An array of references to inbound rules that use this frontend IP.
+     */
+    @JsonProperty(value = "properties.inboundNatRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> inboundNatRules;
+
+    /**
+     * An array of references to inbound pools that use this frontend IP.
+     */
+    @JsonProperty(value = "properties.inboundNatPools", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> inboundNatPools;
+
+    /**
+     * An array of references to outbound rules that use this frontend IP.
+     */
+    @JsonProperty(value = "properties.outboundRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> outboundRules;
+
+    /**
+     * An array of references to load balancing rules that use this frontend
+     * IP.
+     */
+    @JsonProperty(value = "properties.loadBalancingRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> loadBalancingRules;
+
+    /**
+     * The private IP address of the IP configuration.
+     */
+    @JsonProperty(value = "properties.privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * The Private IP allocation method. Possible values include: 'Static',
+     * 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * Whether the specific ipconfiguration is IPv4 or IPv6. Default is taken
+     * as IPv4. Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.privateIPAddressVersion")
+    private IPVersion privateIPAddressVersion;
+
+    /**
+     * The reference to the subnet resource.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * The reference to the Public IP resource.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private PublicIPAddressInner publicIPAddress;
+
+    /**
+     * The reference to the Public IP Prefix resource.
+     */
+    @JsonProperty(value = "properties.publicIPPrefix")
+    private SubResource publicIPPrefix;
+
+    /**
+     * The provisioning state of the frontend IP configuration resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of frontend IP
+     * configurations used by the load balancer. This name can be used to
+     * access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A list of availability zones denoting the IP allocated for the resource
+     * needs to come from.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * Get an array of references to inbound rules that use this frontend IP.
+     *
+     * @return the inboundNatRules value
+     */
+    public List<SubResource> inboundNatRules() {
+        return this.inboundNatRules;
+    }
+
+    /**
+     * Get an array of references to inbound pools that use this frontend IP.
+     *
+     * @return the inboundNatPools value
+     */
+    public List<SubResource> inboundNatPools() {
+        return this.inboundNatPools;
+    }
+
+    /**
+     * Get an array of references to outbound rules that use this frontend IP.
+     *
+     * @return the outboundRules value
+     */
+    public List<SubResource> outboundRules() {
+        return this.outboundRules;
+    }
+
+    /**
+     * Get an array of references to load balancing rules that use this frontend IP.
+     *
+     * @return the loadBalancingRules value
+     */
+    public List<SubResource> loadBalancingRules() {
+        return this.loadBalancingRules;
+    }
+
+    /**
+     * Get the private IP address of the IP configuration.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set the private IP address of the IP configuration.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the Private IP allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the Private IP allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the privateIPAddressVersion value
+     */
+    public IPVersion privateIPAddressVersion() {
+        return this.privateIPAddressVersion;
+    }
+
+    /**
+     * Set whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param privateIPAddressVersion the privateIPAddressVersion value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withPrivateIPAddressVersion(IPVersion privateIPAddressVersion) {
+        this.privateIPAddressVersion = privateIPAddressVersion;
+        return this;
+    }
+
+    /**
+     * Get the reference to the subnet resource.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the reference to the subnet resource.
+     *
+     * @param subnet the subnet value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the reference to the Public IP resource.
+     *
+     * @return the publicIPAddress value
+     */
+    public PublicIPAddressInner publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set the reference to the Public IP resource.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withPublicIPAddress(PublicIPAddressInner publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the reference to the Public IP Prefix resource.
+     *
+     * @return the publicIPPrefix value
+     */
+    public SubResource publicIPPrefix() {
+        return this.publicIPPrefix;
+    }
+
+    /**
+     * Set the reference to the Public IP Prefix resource.
+     *
+     * @param publicIPPrefix the publicIPPrefix value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withPublicIPPrefix(SubResource publicIPPrefix) {
+        this.publicIPPrefix = publicIPPrefix;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the frontend IP configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of frontend IP configurations used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of frontend IP configurations used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @param zones the zones value to set
+     * @return the FrontendIPConfigurationInner object itself.
+     */
+    public FrontendIPConfigurationInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultImpl.java
new file mode 100644
index 000000000000..a55914a53e5a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.GatewayRouteListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.GatewayRoute;
+
+class GatewayRouteListResultImpl extends WrapperImpl<GatewayRouteListResultInner> implements GatewayRouteListResult {
+    private final NetworkManager manager;
+    GatewayRouteListResultImpl(GatewayRouteListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<GatewayRoute> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultInner.java
new file mode 100644
index 000000000000..e238a62f44b0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/GatewayRouteListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.GatewayRoute;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of virtual network gateway routes.
+ */
+public class GatewayRouteListResultInner {
+    /**
+     * List of gateway routes.
+     */
+    @JsonProperty(value = "value")
+    private List<GatewayRoute> value;
+
+    /**
+     * Get list of gateway routes.
+     *
+     * @return the value value
+     */
+    public List<GatewayRoute> value() {
+        return this.value;
+    }
+
+    /**
+     * Set list of gateway routes.
+     *
+     * @param value the value value to set
+     * @return the GatewayRouteListResultInner object itself.
+     */
+    public GatewayRouteListResultInner withValue(List<GatewayRoute> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
new file mode 100644
index 000000000000..8f5b23be7922
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
@@ -0,0 +1,152 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.HubRouteTable;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class HubRouteTableImpl extends CreatableUpdatableImpl<HubRouteTable, HubRouteTableInner, HubRouteTableImpl> implements HubRouteTable, HubRouteTable.Definition, HubRouteTable.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualHubName;
+    private String routeTableName;
+
+    HubRouteTableImpl(String name, NetworkManager manager) {
+        super(name, new HubRouteTableInner());
+        this.manager = manager;
+        // Set resource name
+        this.routeTableName = name;
+        //
+    }
+
+    HubRouteTableImpl(HubRouteTableInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.routeTableName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualHubs");
+        this.routeTableName = IdParsingUtils.getValueFromIdByName(inner.id(), "hubRouteTables");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<HubRouteTable> createResourceAsync() {
+        HubRouteTablesInner client = this.manager().inner().hubRouteTables();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<HubRouteTable> updateResourceAsync() {
+        HubRouteTablesInner client = this.manager().inner().hubRouteTables();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<HubRouteTableInner> getInnerAsync() {
+        HubRouteTablesInner client = this.manager().inner().hubRouteTables();
+        return client.getAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<SubResource> associatedConnections() {
+        return this.inner().associatedConnections();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<String> labels() {
+        return this.inner().labels();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<SubResource> propagatingConnections() {
+        return this.inner().propagatingConnections();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<HubRoute> routes() {
+        return this.inner().routes();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public HubRouteTableImpl withExistingVirtualHub(String resourceGroupName, String virtualHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.virtualHubName = virtualHubName;
+        return this;
+    }
+
+    @Override
+    public HubRouteTableImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public HubRouteTableImpl withLabels(List<String> labels) {
+        this.inner().withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public HubRouteTableImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public HubRouteTableImpl withRoutes(List<HubRoute> routes) {
+        this.inner().withRoutes(routes);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
new file mode 100644
index 000000000000..1917dbc0e8b0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * RouteTable resource in a virtual hub.
+ */
+@JsonFlatten
+public class HubRouteTableInner extends SubResource {
+    /**
+     * List of all routes.
+     */
+    @JsonProperty(value = "properties.routes")
+    private List<HubRoute> routes;
+
+    /**
+     * List of labels associated with this route table.
+     */
+    @JsonProperty(value = "properties.labels")
+    private List<String> labels;
+
+    /**
+     * List of all connections associated with this route table.
+     */
+    @JsonProperty(value = "properties.associatedConnections", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> associatedConnections;
+
+    /**
+     * List of all connections that advertise to this route table.
+     */
+    @JsonProperty(value = "properties.propagatingConnections", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> propagatingConnections;
+
+    /**
+     * The provisioning state of the RouteTable resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get list of all routes.
+     *
+     * @return the routes value
+     */
+    public List<HubRoute> routes() {
+        return this.routes;
+    }
+
+    /**
+     * Set list of all routes.
+     *
+     * @param routes the routes value to set
+     * @return the HubRouteTableInner object itself.
+     */
+    public HubRouteTableInner withRoutes(List<HubRoute> routes) {
+        this.routes = routes;
+        return this;
+    }
+
+    /**
+     * Get list of labels associated with this route table.
+     *
+     * @return the labels value
+     */
+    public List<String> labels() {
+        return this.labels;
+    }
+
+    /**
+     * Set list of labels associated with this route table.
+     *
+     * @param labels the labels value to set
+     * @return the HubRouteTableInner object itself.
+     */
+    public HubRouteTableInner withLabels(List<String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * Get list of all connections associated with this route table.
+     *
+     * @return the associatedConnections value
+     */
+    public List<SubResource> associatedConnections() {
+        return this.associatedConnections;
+    }
+
+    /**
+     * Get list of all connections that advertise to this route table.
+     *
+     * @return the propagatingConnections value
+     */
+    public List<SubResource> propagatingConnections() {
+        return this.propagatingConnections;
+    }
+
+    /**
+     * Get the provisioning state of the RouteTable resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the HubRouteTableInner object itself.
+     */
+    public HubRouteTableInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesImpl.java
new file mode 100644
index 000000000000..ba01b2c3287c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.HubRouteTables;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.HubRouteTable;
+
+class HubRouteTablesImpl extends WrapperImpl<HubRouteTablesInner> implements HubRouteTables {
+    private final NetworkManager manager;
+
+    HubRouteTablesImpl(NetworkManager manager) {
+        super(manager.inner().hubRouteTables());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public HubRouteTableImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private HubRouteTableImpl wrapModel(HubRouteTableInner inner) {
+        return  new HubRouteTableImpl(inner, manager());
+    }
+
+    private HubRouteTableImpl wrapModel(String name) {
+        return new HubRouteTableImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<HubRouteTable> listAsync(final String resourceGroupName, final String virtualHubName) {
+        HubRouteTablesInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualHubName)
+        .flatMapIterable(new Func1<Page<HubRouteTableInner>, Iterable<HubRouteTableInner>>() {
+            @Override
+            public Iterable<HubRouteTableInner> call(Page<HubRouteTableInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<HubRouteTableInner, HubRouteTable>() {
+            @Override
+            public HubRouteTable call(HubRouteTableInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<HubRouteTable> getAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        HubRouteTablesInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualHubName, routeTableName)
+        .flatMap(new Func1<HubRouteTableInner, Observable<HubRouteTable>>() {
+            @Override
+            public Observable<HubRouteTable> call(HubRouteTableInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((HubRouteTable)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        HubRouteTablesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, virtualHubName, routeTableName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesInner.java
new file mode 100644
index 000000000000..25045a72dfe1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTablesInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 HubRouteTables.
+ */
+public class HubRouteTablesInner {
+    /** The Retrofit service to perform REST calls. */
+    private HubRouteTablesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of HubRouteTablesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public HubRouteTablesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(HubRouteTablesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for HubRouteTables to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface HubRouteTablesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.HubRouteTables createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @Query("api-version") String apiVersion, @Body HubRouteTableInner routeTableParameters, @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.network.v2020_04_01.HubRouteTables beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @Query("api-version") String apiVersion, @Body HubRouteTableInner routeTableParameters, @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.network.v2020_04_01.HubRouteTables get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.HubRouteTables delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.HubRouteTables beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.HubRouteTables list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.HubRouteTables listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @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 HubRouteTableInner object if successful.
+     */
+    public HubRouteTableInner createOrUpdate(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @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<HubRouteTableInner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters, final ServiceCallback<HubRouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<HubRouteTableInner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters).map(new Func1<ServiceResponse<HubRouteTableInner>, HubRouteTableInner>() {
+            @Override
+            public HubRouteTableInner call(ServiceResponse<HubRouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<HubRouteTableInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeTableParameters == null) {
+            throw new IllegalArgumentException("Parameter routeTableParameters is required and cannot be null.");
+        }
+        Validator.validate(routeTableParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, routeTableParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<HubRouteTableInner>() { }.getType());
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @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 HubRouteTableInner object if successful.
+     */
+    public HubRouteTableInner beginCreateOrUpdate(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @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<HubRouteTableInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters, final ServiceCallback<HubRouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubRouteTableInner object
+     */
+    public Observable<HubRouteTableInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, routeTableParameters).map(new Func1<ServiceResponse<HubRouteTableInner>, HubRouteTableInner>() {
+            @Override
+            public HubRouteTableInner call(ServiceResponse<HubRouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @param routeTableParameters Parameters supplied to create or update RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubRouteTableInner object
+     */
+    public Observable<ServiceResponse<HubRouteTableInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName, HubRouteTableInner routeTableParameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeTableParameters == null) {
+            throw new IllegalArgumentException("Parameter routeTableParameters is required and cannot be null.");
+        }
+        Validator.validate(routeTableParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, routeTableParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<HubRouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<HubRouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<HubRouteTableInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<HubRouteTableInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<HubRouteTableInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<HubRouteTableInner>() { }.getType())
+                .register(201, new TypeToken<HubRouteTableInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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 HubRouteTableInner object if successful.
+     */
+    public HubRouteTableInner get(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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<HubRouteTableInner> getAsync(String resourceGroupName, String virtualHubName, String routeTableName, final ServiceCallback<HubRouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubRouteTableInner object
+     */
+    public Observable<HubRouteTableInner> getAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<HubRouteTableInner>, HubRouteTableInner>() {
+            @Override
+            public HubRouteTableInner call(ServiceResponse<HubRouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubRouteTableInner object
+     */
+    public Observable<ServiceResponse<HubRouteTableInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<HubRouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<HubRouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<HubRouteTableInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<HubRouteTableInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<HubRouteTableInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<HubRouteTableInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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 virtualHubName, String routeTableName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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 virtualHubName, String routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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 virtualHubName, String routeTableName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @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 virtualHubName, String routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a RouteTable.
+     *
+     * @param resourceGroupName The resource group name of the RouteTable.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the RouteTable.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, 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);
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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;HubRouteTableInner&gt; object if successful.
+     */
+    public PagedList<HubRouteTableInner> list(final String resourceGroupName, final String virtualHubName) {
+        ServiceResponse<Page<HubRouteTableInner>> response = listSinglePageAsync(resourceGroupName, virtualHubName).toBlocking().single();
+        return new PagedList<HubRouteTableInner>(response.body()) {
+            @Override
+            public Page<HubRouteTableInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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<HubRouteTableInner>> listAsync(final String resourceGroupName, final String virtualHubName, final ListOperationCallback<HubRouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualHubName),
+            new Func1<String, Observable<ServiceResponse<Page<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;HubRouteTableInner&gt; object
+     */
+    public Observable<Page<HubRouteTableInner>> listAsync(final String resourceGroupName, final String virtualHubName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualHubName)
+            .map(new Func1<ServiceResponse<Page<HubRouteTableInner>>, Page<HubRouteTableInner>>() {
+                @Override
+                public Page<HubRouteTableInner> call(ServiceResponse<Page<HubRouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;HubRouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<HubRouteTableInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualHubName) {
+        return listSinglePageAsync(resourceGroupName, virtualHubName)
+            .concatMap(new Func1<ServiceResponse<Page<HubRouteTableInner>>, Observable<ServiceResponse<Page<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(ServiceResponse<Page<HubRouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+    ServiceResponse<PageImpl<HubRouteTableInner>> * @param resourceGroupName The resource group name of the VirtualHub.
+    ServiceResponse<PageImpl<HubRouteTableInner>> * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;HubRouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<HubRouteTableInner>>> listSinglePageAsync(final String resourceGroupName, final String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<HubRouteTableInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<HubRouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<HubRouteTableInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<HubRouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<HubRouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @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;HubRouteTableInner&gt; object if successful.
+     */
+    public PagedList<HubRouteTableInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<HubRouteTableInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<HubRouteTableInner>(response.body()) {
+            @Override
+            public Page<HubRouteTableInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @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<HubRouteTableInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<HubRouteTableInner>> serviceFuture, final ListOperationCallback<HubRouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @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;HubRouteTableInner&gt; object
+     */
+    public Observable<Page<HubRouteTableInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<HubRouteTableInner>>, Page<HubRouteTableInner>>() {
+                @Override
+                public Page<HubRouteTableInner> call(ServiceResponse<Page<HubRouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+     * @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;HubRouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<HubRouteTableInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<HubRouteTableInner>>, Observable<ServiceResponse<Page<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(ServiceResponse<Page<HubRouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all RouteTables.
+     *
+    ServiceResponse<PageImpl<HubRouteTableInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;HubRouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<HubRouteTableInner>>> 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<HubRouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubRouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<HubRouteTableInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<HubRouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<HubRouteTableInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<HubRouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<HubRouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionImpl.java
new file mode 100644
index 000000000000..6edfe27d8804
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionImpl.java
@@ -0,0 +1,91 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnection;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+
+class HubVirtualNetworkConnectionImpl extends IndexableRefreshableWrapperImpl<HubVirtualNetworkConnection, HubVirtualNetworkConnectionInner> implements HubVirtualNetworkConnection {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualHubName;
+    private String connectionName;
+
+    HubVirtualNetworkConnectionImpl(HubVirtualNetworkConnectionInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualHubs");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "hubVirtualNetworkConnections");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<HubVirtualNetworkConnectionInner> getInnerAsync() {
+        HubVirtualNetworkConnectionsInner client = this.manager().inner().hubVirtualNetworkConnections();
+        return client.getAsync(this.resourceGroupName, this.virtualHubName, this.connectionName);
+    }
+
+
+
+    @Override
+    public Boolean allowHubToRemoteVnetTransit() {
+        return this.inner().allowHubToRemoteVnetTransit();
+    }
+
+    @Override
+    public Boolean allowRemoteVnetToUseHubVnetGateways() {
+        return this.inner().allowRemoteVnetToUseHubVnetGateways();
+    }
+
+    @Override
+    public Boolean enableInternetSecurity() {
+        return this.inner().enableInternetSecurity();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SubResource remoteVirtualNetwork() {
+        return this.inner().remoteVirtualNetwork();
+    }
+
+    @Override
+    public RoutingConfiguration routingConfiguration() {
+        return this.inner().routingConfiguration();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionInner.java
new file mode 100644
index 000000000000..ca2278111131
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionInner.java
@@ -0,0 +1,211 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * HubVirtualNetworkConnection Resource.
+ */
+@JsonFlatten
+public class HubVirtualNetworkConnectionInner extends SubResource {
+    /**
+     * Reference to the remote virtual network.
+     */
+    @JsonProperty(value = "properties.remoteVirtualNetwork")
+    private SubResource remoteVirtualNetwork;
+
+    /**
+     * VirtualHub to RemoteVnet transit to enabled or not.
+     */
+    @JsonProperty(value = "properties.allowHubToRemoteVnetTransit")
+    private Boolean allowHubToRemoteVnetTransit;
+
+    /**
+     * Allow RemoteVnet to use Virtual Hub's gateways.
+     */
+    @JsonProperty(value = "properties.allowRemoteVnetToUseHubVnetGateways")
+    private Boolean allowRemoteVnetToUseHubVnetGateways;
+
+    /**
+     * Enable internet security.
+     */
+    @JsonProperty(value = "properties.enableInternetSecurity")
+    private Boolean enableInternetSecurity;
+
+    /**
+     * The Routing Configuration indicating the associated and propagated route
+     * tables on this connection.
+     */
+    @JsonProperty(value = "properties.routingConfiguration")
+    private RoutingConfiguration routingConfiguration;
+
+    /**
+     * The provisioning state of the hub virtual network connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get reference to the remote virtual network.
+     *
+     * @return the remoteVirtualNetwork value
+     */
+    public SubResource remoteVirtualNetwork() {
+        return this.remoteVirtualNetwork;
+    }
+
+    /**
+     * Set reference to the remote virtual network.
+     *
+     * @param remoteVirtualNetwork the remoteVirtualNetwork value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withRemoteVirtualNetwork(SubResource remoteVirtualNetwork) {
+        this.remoteVirtualNetwork = remoteVirtualNetwork;
+        return this;
+    }
+
+    /**
+     * Get virtualHub to RemoteVnet transit to enabled or not.
+     *
+     * @return the allowHubToRemoteVnetTransit value
+     */
+    public Boolean allowHubToRemoteVnetTransit() {
+        return this.allowHubToRemoteVnetTransit;
+    }
+
+    /**
+     * Set virtualHub to RemoteVnet transit to enabled or not.
+     *
+     * @param allowHubToRemoteVnetTransit the allowHubToRemoteVnetTransit value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withAllowHubToRemoteVnetTransit(Boolean allowHubToRemoteVnetTransit) {
+        this.allowHubToRemoteVnetTransit = allowHubToRemoteVnetTransit;
+        return this;
+    }
+
+    /**
+     * Get allow RemoteVnet to use Virtual Hub's gateways.
+     *
+     * @return the allowRemoteVnetToUseHubVnetGateways value
+     */
+    public Boolean allowRemoteVnetToUseHubVnetGateways() {
+        return this.allowRemoteVnetToUseHubVnetGateways;
+    }
+
+    /**
+     * Set allow RemoteVnet to use Virtual Hub's gateways.
+     *
+     * @param allowRemoteVnetToUseHubVnetGateways the allowRemoteVnetToUseHubVnetGateways value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withAllowRemoteVnetToUseHubVnetGateways(Boolean allowRemoteVnetToUseHubVnetGateways) {
+        this.allowRemoteVnetToUseHubVnetGateways = allowRemoteVnetToUseHubVnetGateways;
+        return this;
+    }
+
+    /**
+     * Get enable internet security.
+     *
+     * @return the enableInternetSecurity value
+     */
+    public Boolean enableInternetSecurity() {
+        return this.enableInternetSecurity;
+    }
+
+    /**
+     * Set enable internet security.
+     *
+     * @param enableInternetSecurity the enableInternetSecurity value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withEnableInternetSecurity(Boolean enableInternetSecurity) {
+        this.enableInternetSecurity = enableInternetSecurity;
+        return this;
+    }
+
+    /**
+     * Get the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @return the routingConfiguration value
+     */
+    public RoutingConfiguration routingConfiguration() {
+        return this.routingConfiguration;
+    }
+
+    /**
+     * Set the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @param routingConfiguration the routingConfiguration value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.routingConfiguration = routingConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the hub virtual network connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the HubVirtualNetworkConnectionInner object itself.
+     */
+    public HubVirtualNetworkConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsImpl.java
new file mode 100644
index 000000000000..bc8d8f2c16b7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnections;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnection;
+
+class HubVirtualNetworkConnectionsImpl extends WrapperImpl<HubVirtualNetworkConnectionsInner> implements HubVirtualNetworkConnections {
+    private final NetworkManager manager;
+
+    HubVirtualNetworkConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().hubVirtualNetworkConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private HubVirtualNetworkConnectionImpl wrapModel(HubVirtualNetworkConnectionInner inner) {
+        return  new HubVirtualNetworkConnectionImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<HubVirtualNetworkConnection> listAsync(final String resourceGroupName, final String virtualHubName) {
+        HubVirtualNetworkConnectionsInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualHubName)
+        .flatMapIterable(new Func1<Page<HubVirtualNetworkConnectionInner>, Iterable<HubVirtualNetworkConnectionInner>>() {
+            @Override
+            public Iterable<HubVirtualNetworkConnectionInner> call(Page<HubVirtualNetworkConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<HubVirtualNetworkConnectionInner, HubVirtualNetworkConnection>() {
+            @Override
+            public HubVirtualNetworkConnection call(HubVirtualNetworkConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<HubVirtualNetworkConnection> getAsync(String resourceGroupName, String virtualHubName, String connectionName) {
+        HubVirtualNetworkConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualHubName, connectionName)
+        .flatMap(new Func1<HubVirtualNetworkConnectionInner, Observable<HubVirtualNetworkConnection>>() {
+            @Override
+            public Observable<HubVirtualNetworkConnection> call(HubVirtualNetworkConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((HubVirtualNetworkConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsInner.java
new file mode 100644
index 000000000000..4880e5899697
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubVirtualNetworkConnectionsInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 HubVirtualNetworkConnections.
+ */
+public class HubVirtualNetworkConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private HubVirtualNetworkConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of HubVirtualNetworkConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public HubVirtualNetworkConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(HubVirtualNetworkConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for HubVirtualNetworkConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface HubVirtualNetworkConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubVirtualNetworkConnections/{connectionName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.HubVirtualNetworkConnections list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubVirtualNetworkConnections")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.HubVirtualNetworkConnections listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a HubVirtualNetworkConnection.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param connectionName The name of the vpn connection.
+     * @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 HubVirtualNetworkConnectionInner object if successful.
+     */
+    public HubVirtualNetworkConnectionInner get(String resourceGroupName, String virtualHubName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a HubVirtualNetworkConnection.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param connectionName The name of the vpn connection.
+     * @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<HubVirtualNetworkConnectionInner> getAsync(String resourceGroupName, String virtualHubName, String connectionName, final ServiceCallback<HubVirtualNetworkConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualHubName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a HubVirtualNetworkConnection.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubVirtualNetworkConnectionInner object
+     */
+    public Observable<HubVirtualNetworkConnectionInner> getAsync(String resourceGroupName, String virtualHubName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, connectionName).map(new Func1<ServiceResponse<HubVirtualNetworkConnectionInner>, HubVirtualNetworkConnectionInner>() {
+            @Override
+            public HubVirtualNetworkConnectionInner call(ServiceResponse<HubVirtualNetworkConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a HubVirtualNetworkConnection.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the HubVirtualNetworkConnectionInner object
+     */
+    public Observable<ServiceResponse<HubVirtualNetworkConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String connectionName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, virtualHubName, connectionName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<HubVirtualNetworkConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<HubVirtualNetworkConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<HubVirtualNetworkConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<HubVirtualNetworkConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<HubVirtualNetworkConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<HubVirtualNetworkConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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;HubVirtualNetworkConnectionInner&gt; object if successful.
+     */
+    public PagedList<HubVirtualNetworkConnectionInner> list(final String resourceGroupName, final String virtualHubName) {
+        ServiceResponse<Page<HubVirtualNetworkConnectionInner>> response = listSinglePageAsync(resourceGroupName, virtualHubName).toBlocking().single();
+        return new PagedList<HubVirtualNetworkConnectionInner>(response.body()) {
+            @Override
+            public Page<HubVirtualNetworkConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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<HubVirtualNetworkConnectionInner>> listAsync(final String resourceGroupName, final String virtualHubName, final ListOperationCallback<HubVirtualNetworkConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualHubName),
+            new Func1<String, Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;HubVirtualNetworkConnectionInner&gt; object
+     */
+    public Observable<Page<HubVirtualNetworkConnectionInner>> listAsync(final String resourceGroupName, final String virtualHubName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualHubName)
+            .map(new Func1<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>, Page<HubVirtualNetworkConnectionInner>>() {
+                @Override
+                public Page<HubVirtualNetworkConnectionInner> call(ServiceResponse<Page<HubVirtualNetworkConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;HubVirtualNetworkConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualHubName) {
+        return listSinglePageAsync(resourceGroupName, virtualHubName)
+            .concatMap(new Func1<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>, Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(ServiceResponse<Page<HubVirtualNetworkConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+    ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> * @param resourceGroupName The resource group name of the VirtualHub.
+    ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;HubVirtualNetworkConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> listSinglePageAsync(final String resourceGroupName, final String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<HubVirtualNetworkConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<HubVirtualNetworkConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<HubVirtualNetworkConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @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;HubVirtualNetworkConnectionInner&gt; object if successful.
+     */
+    public PagedList<HubVirtualNetworkConnectionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<HubVirtualNetworkConnectionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<HubVirtualNetworkConnectionInner>(response.body()) {
+            @Override
+            public Page<HubVirtualNetworkConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @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<HubVirtualNetworkConnectionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<HubVirtualNetworkConnectionInner>> serviceFuture, final ListOperationCallback<HubVirtualNetworkConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @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;HubVirtualNetworkConnectionInner&gt; object
+     */
+    public Observable<Page<HubVirtualNetworkConnectionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>, Page<HubVirtualNetworkConnectionInner>>() {
+                @Override
+                public Page<HubVirtualNetworkConnectionInner> call(ServiceResponse<Page<HubVirtualNetworkConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+     * @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;HubVirtualNetworkConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>, Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(ServiceResponse<Page<HubVirtualNetworkConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all HubVirtualNetworkConnections.
+     *
+    ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;HubVirtualNetworkConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> 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<HubVirtualNetworkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<HubVirtualNetworkConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<HubVirtualNetworkConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<HubVirtualNetworkConnectionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<HubVirtualNetworkConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<HubVirtualNetworkConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultImpl.java
new file mode 100644
index 000000000000..0eb11615a2f4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.IPAddressAvailabilityResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class IPAddressAvailabilityResultImpl extends WrapperImpl<IPAddressAvailabilityResultInner> implements IPAddressAvailabilityResult {
+    private final NetworkManager manager;
+    IPAddressAvailabilityResultImpl(IPAddressAvailabilityResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Boolean available() {
+        return this.inner().available();
+    }
+
+    @Override
+    public List<String> availableIPAddresses() {
+        return this.inner().availableIPAddresses();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultInner.java
new file mode 100644
index 000000000000..64d3e267b266
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IPAddressAvailabilityResultInner.java
@@ -0,0 +1,71 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for CheckIPAddressAvailability API service call.
+ */
+public class IPAddressAvailabilityResultInner {
+    /**
+     * Private IP address availability.
+     */
+    @JsonProperty(value = "available")
+    private Boolean available;
+
+    /**
+     * Contains other available private IP addresses if the asked for address
+     * is taken.
+     */
+    @JsonProperty(value = "availableIPAddresses")
+    private List<String> availableIPAddresses;
+
+    /**
+     * Get private IP address availability.
+     *
+     * @return the available value
+     */
+    public Boolean available() {
+        return this.available;
+    }
+
+    /**
+     * Set private IP address availability.
+     *
+     * @param available the available value to set
+     * @return the IPAddressAvailabilityResultInner object itself.
+     */
+    public IPAddressAvailabilityResultInner withAvailable(Boolean available) {
+        this.available = available;
+        return this;
+    }
+
+    /**
+     * Get contains other available private IP addresses if the asked for address is taken.
+     *
+     * @return the availableIPAddresses value
+     */
+    public List<String> availableIPAddresses() {
+        return this.availableIPAddresses;
+    }
+
+    /**
+     * Set contains other available private IP addresses if the asked for address is taken.
+     *
+     * @param availableIPAddresses the availableIPAddresses value to set
+     * @return the IPAddressAvailabilityResultInner object itself.
+     */
+    public IPAddressAvailabilityResultInner withAvailableIPAddresses(List<String> availableIPAddresses) {
+        this.availableIPAddresses = availableIPAddresses;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IdParsingUtils.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..c185acafe724
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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.network.v2020_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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleImpl.java
new file mode 100644
index 000000000000..195f067eac88
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleImpl.java
@@ -0,0 +1,207 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.TransportProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+
+class InboundNatRuleImpl extends CreatableUpdatableImpl<InboundNatRule, InboundNatRuleInner, InboundNatRuleImpl> implements InboundNatRule, InboundNatRule.Definition, InboundNatRule.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String inboundNatRuleName;
+
+    InboundNatRuleImpl(String name, NetworkManager manager) {
+        super(name, new InboundNatRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.inboundNatRuleName = name;
+        //
+    }
+
+    InboundNatRuleImpl(InboundNatRuleInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.inboundNatRuleName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.inboundNatRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "inboundNatRules");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<InboundNatRule> createResourceAsync() {
+        InboundNatRulesInner client = this.manager().inner().inboundNatRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.loadBalancerName, this.inboundNatRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<InboundNatRule> updateResourceAsync() {
+        InboundNatRulesInner client = this.manager().inner().inboundNatRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.loadBalancerName, this.inboundNatRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<InboundNatRuleInner> getInnerAsync() {
+        InboundNatRulesInner client = this.manager().inner().inboundNatRules();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.inboundNatRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public VirtualMachineScaleSetNetworkInterfaceIPConfiguration backendIPConfiguration() {
+        NetworkInterfaceIPConfigurationInner inner = this.inner().backendIPConfiguration();
+        if (inner != null) {
+            return  new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Integer backendPort() {
+        return this.inner().backendPort();
+    }
+
+    @Override
+    public Boolean enableFloatingIP() {
+        return this.inner().enableFloatingIP();
+    }
+
+    @Override
+    public Boolean enableTcpReset() {
+        return this.inner().enableTcpReset();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource frontendIPConfiguration() {
+        return this.inner().frontendIPConfiguration();
+    }
+
+    @Override
+    public Integer frontendPort() {
+        return this.inner().frontendPort();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Integer idleTimeoutInMinutes() {
+        return this.inner().idleTimeoutInMinutes();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public TransportProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public InboundNatRuleImpl withExistingLoadBalancer(String resourceGroupName, String loadBalancerName) {
+        this.resourceGroupName = resourceGroupName;
+        this.loadBalancerName = loadBalancerName;
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withBackendPort(Integer backendPort) {
+        this.inner().withBackendPort(backendPort);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withEnableFloatingIP(Boolean enableFloatingIP) {
+        this.inner().withEnableFloatingIP(enableFloatingIP);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withEnableTcpReset(Boolean enableTcpReset) {
+        this.inner().withEnableTcpReset(enableTcpReset);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withFrontendIPConfiguration(SubResource frontendIPConfiguration) {
+        this.inner().withFrontendIPConfiguration(frontendIPConfiguration);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withFrontendPort(Integer frontendPort) {
+        this.inner().withFrontendPort(frontendPort);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.inner().withIdleTimeoutInMinutes(idleTimeoutInMinutes);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public InboundNatRuleImpl withProtocol(TransportProtocol protocol) {
+        this.inner().withProtocol(protocol);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleInner.java
new file mode 100644
index 000000000000..08013015a2fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRuleInner.java
@@ -0,0 +1,306 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.TransportProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Inbound NAT rule of the load balancer.
+ */
+@JsonFlatten
+public class InboundNatRuleInner extends SubResource {
+    /**
+     * A reference to frontend IP addresses.
+     */
+    @JsonProperty(value = "properties.frontendIPConfiguration")
+    private SubResource frontendIPConfiguration;
+
+    /**
+     * A reference to a private IP address defined on a network interface of a
+     * VM. Traffic sent to the frontend port of each of the frontend IP
+     * configurations is forwarded to the backend IP.
+     */
+    @JsonProperty(value = "properties.backendIPConfiguration", access = JsonProperty.Access.WRITE_ONLY)
+    private NetworkInterfaceIPConfigurationInner backendIPConfiguration;
+
+    /**
+     * The reference to the transport protocol used by the load balancing rule.
+     * Possible values include: 'Udp', 'Tcp', 'All'.
+     */
+    @JsonProperty(value = "properties.protocol")
+    private TransportProtocol protocol;
+
+    /**
+     * The port for the external endpoint. Port numbers for each rule must be
+     * unique within the Load Balancer. Acceptable values range from 1 to
+     * 65534.
+     */
+    @JsonProperty(value = "properties.frontendPort")
+    private Integer frontendPort;
+
+    /**
+     * The port used for the internal endpoint. Acceptable values range from 1
+     * to 65535.
+     */
+    @JsonProperty(value = "properties.backendPort")
+    private Integer backendPort;
+
+    /**
+     * The timeout for the TCP idle connection. The value can be set between 4
+     * and 30 minutes. The default value is 4 minutes. This element is only
+     * used when the protocol is set to TCP.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * Configures a virtual machine's endpoint for the floating IP capability
+     * required to configure a SQL AlwaysOn Availability Group. This setting is
+     * required when using the SQL AlwaysOn Availability Groups in SQL server.
+     * This setting can't be changed after you create the endpoint.
+     */
+    @JsonProperty(value = "properties.enableFloatingIP")
+    private Boolean enableFloatingIP;
+
+    /**
+     * Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected
+     * connection termination. This element is only used when the protocol is
+     * set to TCP.
+     */
+    @JsonProperty(value = "properties.enableTcpReset")
+    private Boolean enableTcpReset;
+
+    /**
+     * The provisioning state of the inbound NAT rule resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of inbound NAT
+     * rules used by the load balancer. This name can be used to access the
+     * resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get a reference to frontend IP addresses.
+     *
+     * @return the frontendIPConfiguration value
+     */
+    public SubResource frontendIPConfiguration() {
+        return this.frontendIPConfiguration;
+    }
+
+    /**
+     * Set a reference to frontend IP addresses.
+     *
+     * @param frontendIPConfiguration the frontendIPConfiguration value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) {
+        this.frontendIPConfiguration = frontendIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get a reference to a private IP address defined on a network interface of a VM. Traffic sent to the frontend port of each of the frontend IP configurations is forwarded to the backend IP.
+     *
+     * @return the backendIPConfiguration value
+     */
+    public NetworkInterfaceIPConfigurationInner backendIPConfiguration() {
+        return this.backendIPConfiguration;
+    }
+
+    /**
+     * Get the reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @return the protocol value
+     */
+    public TransportProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @param protocol the protocol value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withProtocol(TransportProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534.
+     *
+     * @return the frontendPort value
+     */
+    public Integer frontendPort() {
+        return this.frontendPort;
+    }
+
+    /**
+     * Set the port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534.
+     *
+     * @param frontendPort the frontendPort value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withFrontendPort(Integer frontendPort) {
+        this.frontendPort = frontendPort;
+        return this;
+    }
+
+    /**
+     * Get the port used for the internal endpoint. Acceptable values range from 1 to 65535.
+     *
+     * @return the backendPort value
+     */
+    public Integer backendPort() {
+        return this.backendPort;
+    }
+
+    /**
+     * Set the port used for the internal endpoint. Acceptable values range from 1 to 65535.
+     *
+     * @param backendPort the backendPort value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withBackendPort(Integer backendPort) {
+        this.backendPort = backendPort;
+        return this;
+    }
+
+    /**
+     * Get the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @return the enableFloatingIP value
+     */
+    public Boolean enableFloatingIP() {
+        return this.enableFloatingIP;
+    }
+
+    /**
+     * Set configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @param enableFloatingIP the enableFloatingIP value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withEnableFloatingIP(Boolean enableFloatingIP) {
+        this.enableFloatingIP = enableFloatingIP;
+        return this;
+    }
+
+    /**
+     * Get receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @return the enableTcpReset value
+     */
+    public Boolean enableTcpReset() {
+        return this.enableTcpReset;
+    }
+
+    /**
+     * Set receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @param enableTcpReset the enableTcpReset value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withEnableTcpReset(Boolean enableTcpReset) {
+        this.enableTcpReset = enableTcpReset;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the inbound NAT rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of inbound NAT rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of inbound NAT rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the InboundNatRuleInner object itself.
+     */
+    public InboundNatRuleInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesImpl.java
new file mode 100644
index 000000000000..5aee2b324f80
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRules;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+
+class InboundNatRulesImpl extends WrapperImpl<InboundNatRulesInner> implements InboundNatRules {
+    private final NetworkManager manager;
+
+    InboundNatRulesImpl(NetworkManager manager) {
+        super(manager.inner().inboundNatRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public InboundNatRuleImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private InboundNatRuleImpl wrapModel(InboundNatRuleInner inner) {
+        return  new InboundNatRuleImpl(inner, manager());
+    }
+
+    private InboundNatRuleImpl wrapModel(String name) {
+        return new InboundNatRuleImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<InboundNatRule> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        InboundNatRulesInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<InboundNatRuleInner>, Iterable<InboundNatRuleInner>>() {
+            @Override
+            public Iterable<InboundNatRuleInner> call(Page<InboundNatRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<InboundNatRuleInner, InboundNatRule>() {
+            @Override
+            public InboundNatRule call(InboundNatRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<InboundNatRule> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        InboundNatRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, inboundNatRuleName)
+        .flatMap(new Func1<InboundNatRuleInner, Observable<InboundNatRule>>() {
+            @Override
+            public Observable<InboundNatRule> call(InboundNatRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((InboundNatRule)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        InboundNatRulesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesInner.java
new file mode 100644
index 000000000000..bd14352caffb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/InboundNatRulesInner.java
@@ -0,0 +1,853 @@
+/**
+ * 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.network.v2020_04_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.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 InboundNatRules.
+ */
+public class InboundNatRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private InboundNatRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of InboundNatRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public InboundNatRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(InboundNatRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for InboundNatRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface InboundNatRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.InboundNatRules list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.InboundNatRules delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules/{inboundNatRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("inboundNatRuleName") String inboundNatRuleName, @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.network.v2020_04_01.InboundNatRules beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules/{inboundNatRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("inboundNatRuleName") String inboundNatRuleName, @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.network.v2020_04_01.InboundNatRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules/{inboundNatRuleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("inboundNatRuleName") String inboundNatRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.InboundNatRules createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules/{inboundNatRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("inboundNatRuleName") String inboundNatRuleName, @Path("subscriptionId") String subscriptionId, @Body InboundNatRuleInner inboundNatRuleParameters, @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.network.v2020_04_01.InboundNatRules beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules/{inboundNatRuleName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("inboundNatRuleName") String inboundNatRuleName, @Path("subscriptionId") String subscriptionId, @Body InboundNatRuleInner inboundNatRuleParameters, @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.network.v2020_04_01.InboundNatRules listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;InboundNatRuleInner&gt; object if successful.
+     */
+    public PagedList<InboundNatRuleInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<InboundNatRuleInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<InboundNatRuleInner>(response.body()) {
+            @Override
+            public Page<InboundNatRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<InboundNatRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<InboundNatRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;InboundNatRuleInner&gt; object
+     */
+    public Observable<Page<InboundNatRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<InboundNatRuleInner>>, Page<InboundNatRuleInner>>() {
+                @Override
+                public Page<InboundNatRuleInner> call(ServiceResponse<Page<InboundNatRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;InboundNatRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<InboundNatRuleInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<InboundNatRuleInner>>, Observable<ServiceResponse<Page<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(ServiceResponse<Page<InboundNatRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<InboundNatRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<InboundNatRuleInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;InboundNatRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<InboundNatRuleInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<InboundNatRuleInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<InboundNatRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<InboundNatRuleInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<InboundNatRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<InboundNatRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @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 loadBalancerName, String inboundNatRuleName) {
+        deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat 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<Void> deleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @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 loadBalancerName, String inboundNatRuleName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat 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<Void> beginDeleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), 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 specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @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 InboundNatRuleInner object if successful.
+     */
+    public InboundNatRuleInner get(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat 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<InboundNatRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, final ServiceCallback<InboundNatRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<InboundNatRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName).map(new Func1<ServiceResponse<InboundNatRuleInner>, InboundNatRuleInner>() {
+            @Override
+            public InboundNatRuleInner call(ServiceResponse<InboundNatRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<ServiceResponse<InboundNatRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.get(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InboundNatRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<InboundNatRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<InboundNatRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param expand Expands referenced resources.
+     * @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 InboundNatRuleInner object if successful.
+     */
+    public InboundNatRuleInner get(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, String expand) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param expand Expands referenced resources.
+     * @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<InboundNatRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, String expand, final ServiceCallback<InboundNatRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<InboundNatRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, String expand) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, expand).map(new Func1<ServiceResponse<InboundNatRuleInner>, InboundNatRuleInner>() {
+            @Override
+            public InboundNatRuleInner call(ServiceResponse<InboundNatRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<ServiceResponse<InboundNatRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InboundNatRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<InboundNatRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<InboundNatRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<InboundNatRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<InboundNatRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<InboundNatRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule 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 InboundNatRuleInner object if successful.
+     */
+    public InboundNatRuleInner createOrUpdate(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @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<InboundNatRuleInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters, final ServiceCallback<InboundNatRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<InboundNatRuleInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters).map(new Func1<ServiceResponse<InboundNatRuleInner>, InboundNatRuleInner>() {
+            @Override
+            public InboundNatRuleInner call(ServiceResponse<InboundNatRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<InboundNatRuleInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName 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 (inboundNatRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(inboundNatRuleParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), inboundNatRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<InboundNatRuleInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule 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 InboundNatRuleInner object if successful.
+     */
+    public InboundNatRuleInner beginCreateOrUpdate(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @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<InboundNatRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters, final ServiceCallback<InboundNatRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<InboundNatRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters).map(new Func1<ServiceResponse<InboundNatRuleInner>, InboundNatRuleInner>() {
+            @Override
+            public InboundNatRuleInner call(ServiceResponse<InboundNatRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer inbound nat rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param inboundNatRuleName The name of the inbound nat rule.
+     * @param inboundNatRuleParameters Parameters supplied to the create or update inbound nat rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the InboundNatRuleInner object
+     */
+    public Observable<ServiceResponse<InboundNatRuleInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String inboundNatRuleName, InboundNatRuleInner inboundNatRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (inboundNatRuleName == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleName 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 (inboundNatRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter inboundNatRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(inboundNatRuleParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, loadBalancerName, inboundNatRuleName, this.client.subscriptionId(), inboundNatRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InboundNatRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<InboundNatRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<InboundNatRuleInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<InboundNatRuleInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<InboundNatRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<InboundNatRuleInner>() { }.getType())
+                .register(201, new TypeToken<InboundNatRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @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;InboundNatRuleInner&gt; object if successful.
+     */
+    public PagedList<InboundNatRuleInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<InboundNatRuleInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<InboundNatRuleInner>(response.body()) {
+            @Override
+            public Page<InboundNatRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @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<InboundNatRuleInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<InboundNatRuleInner>> serviceFuture, final ListOperationCallback<InboundNatRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @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;InboundNatRuleInner&gt; object
+     */
+    public Observable<Page<InboundNatRuleInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<InboundNatRuleInner>>, Page<InboundNatRuleInner>>() {
+                @Override
+                public Page<InboundNatRuleInner> call(ServiceResponse<Page<InboundNatRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+     * @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;InboundNatRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<InboundNatRuleInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<InboundNatRuleInner>>, Observable<ServiceResponse<Page<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(ServiceResponse<Page<InboundNatRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the inbound nat rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<InboundNatRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;InboundNatRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<InboundNatRuleInner>>> 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<InboundNatRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<InboundNatRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<InboundNatRuleInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<InboundNatRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<InboundNatRuleInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<InboundNatRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<InboundNatRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationImpl.java
new file mode 100644
index 000000000000..544599d643e6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationImpl.java
@@ -0,0 +1,131 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocation;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocationType;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import java.util.Map;
+
+class IpAllocationImpl extends GroupableResourceCoreImpl<IpAllocation, IpAllocationInner, IpAllocationImpl, NetworkManager> implements IpAllocation, IpAllocation.Definition, IpAllocation.Update {
+    IpAllocationImpl(String name, IpAllocationInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<IpAllocation> createResourceAsync() {
+        IpAllocationsInner client = this.manager().inner().ipAllocations();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<IpAllocation> updateResourceAsync() {
+        IpAllocationsInner client = this.manager().inner().ipAllocations();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<IpAllocationInner> getInnerAsync() {
+        IpAllocationsInner client = this.manager().inner().ipAllocations();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Map<String, String> allocationTags() {
+        return this.inner().allocationTags();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public IpAllocationType ipAllocationType() {
+        return this.inner().ipAllocationType();
+    }
+
+    @Override
+    public String ipamAllocationId() {
+        return this.inner().ipamAllocationId();
+    }
+
+    @Override
+    public String prefix() {
+        return this.inner().prefix();
+    }
+
+    @Override
+    public Integer prefixLength() {
+        return this.inner().prefixLength();
+    }
+
+    @Override
+    public IPVersion prefixType() {
+        return this.inner().prefixType();
+    }
+
+    @Override
+    public SubResource subnet() {
+        return this.inner().subnet();
+    }
+
+    @Override
+    public SubResource virtualNetwork() {
+        return this.inner().virtualNetwork();
+    }
+
+    @Override
+    public IpAllocationImpl withAllocationTags(Map<String, String> allocationTags) {
+        this.inner().withAllocationTags(allocationTags);
+        return this;
+    }
+
+    @Override
+    public IpAllocationImpl withIpAllocationType(IpAllocationType ipAllocationType) {
+        this.inner().withIpAllocationType(ipAllocationType);
+        return this;
+    }
+
+    @Override
+    public IpAllocationImpl withIpamAllocationId(String ipamAllocationId) {
+        this.inner().withIpamAllocationId(ipamAllocationId);
+        return this;
+    }
+
+    @Override
+    public IpAllocationImpl withPrefix(String prefix) {
+        this.inner().withPrefix(prefix);
+        return this;
+    }
+
+    @Override
+    public IpAllocationImpl withPrefixLength(Integer prefixLength) {
+        this.inner().withPrefixLength(prefixLength);
+        return this;
+    }
+
+    @Override
+    public IpAllocationImpl withPrefixType(IPVersion prefixType) {
+        this.inner().withPrefixType(prefixType);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationInner.java
new file mode 100644
index 000000000000..1274ac22b831
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationInner.java
@@ -0,0 +1,255 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocationType;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * IpAllocation resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class IpAllocationInner extends Resource {
+    /**
+     * The Subnet that using the prefix of this IpAllocation resource.
+     */
+    @JsonProperty(value = "properties.subnet", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource subnet;
+
+    /**
+     * The VirtualNetwork that using the prefix of this IpAllocation resource.
+     */
+    @JsonProperty(value = "properties.virtualNetwork", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource virtualNetwork;
+
+    /**
+     * The type for the IpAllocation. Possible values include: 'Undefined',
+     * 'Hypernet'.
+     */
+    @JsonProperty(value = "properties.type")
+    private IpAllocationType ipAllocationType;
+
+    /**
+     * The address prefix for the IpAllocation.
+     */
+    @JsonProperty(value = "properties.prefix")
+    private String prefix;
+
+    /**
+     * The address prefix length for the IpAllocation.
+     */
+    @JsonProperty(value = "properties.prefixLength")
+    private Integer prefixLength;
+
+    /**
+     * The address prefix Type for the IpAllocation. Possible values include:
+     * 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.prefixType")
+    private IPVersion prefixType;
+
+    /**
+     * The IPAM allocation ID.
+     */
+    @JsonProperty(value = "properties.ipamAllocationId")
+    private String ipamAllocationId;
+
+    /**
+     * IpAllocation tags.
+     */
+    @JsonProperty(value = "properties.allocationTags")
+    private Map<String, String> allocationTags;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the Subnet that using the prefix of this IpAllocation resource.
+     *
+     * @return the subnet value
+     */
+    public SubResource subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Get the VirtualNetwork that using the prefix of this IpAllocation resource.
+     *
+     * @return the virtualNetwork value
+     */
+    public SubResource virtualNetwork() {
+        return this.virtualNetwork;
+    }
+
+    /**
+     * Get the type for the IpAllocation. Possible values include: 'Undefined', 'Hypernet'.
+     *
+     * @return the ipAllocationType value
+     */
+    public IpAllocationType ipAllocationType() {
+        return this.ipAllocationType;
+    }
+
+    /**
+     * Set the type for the IpAllocation. Possible values include: 'Undefined', 'Hypernet'.
+     *
+     * @param ipAllocationType the ipAllocationType value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withIpAllocationType(IpAllocationType ipAllocationType) {
+        this.ipAllocationType = ipAllocationType;
+        return this;
+    }
+
+    /**
+     * Get the address prefix for the IpAllocation.
+     *
+     * @return the prefix value
+     */
+    public String prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * Set the address prefix for the IpAllocation.
+     *
+     * @param prefix the prefix value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withPrefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    /**
+     * Get the address prefix length for the IpAllocation.
+     *
+     * @return the prefixLength value
+     */
+    public Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Set the address prefix length for the IpAllocation.
+     *
+     * @param prefixLength the prefixLength value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withPrefixLength(Integer prefixLength) {
+        this.prefixLength = prefixLength;
+        return this;
+    }
+
+    /**
+     * Get the address prefix Type for the IpAllocation. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the prefixType value
+     */
+    public IPVersion prefixType() {
+        return this.prefixType;
+    }
+
+    /**
+     * Set the address prefix Type for the IpAllocation. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param prefixType the prefixType value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withPrefixType(IPVersion prefixType) {
+        this.prefixType = prefixType;
+        return this;
+    }
+
+    /**
+     * Get the IPAM allocation ID.
+     *
+     * @return the ipamAllocationId value
+     */
+    public String ipamAllocationId() {
+        return this.ipamAllocationId;
+    }
+
+    /**
+     * Set the IPAM allocation ID.
+     *
+     * @param ipamAllocationId the ipamAllocationId value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withIpamAllocationId(String ipamAllocationId) {
+        this.ipamAllocationId = ipamAllocationId;
+        return this;
+    }
+
+    /**
+     * Get ipAllocation tags.
+     *
+     * @return the allocationTags value
+     */
+    public Map<String, String> allocationTags() {
+        return this.allocationTags;
+    }
+
+    /**
+     * Set ipAllocation tags.
+     *
+     * @param allocationTags the allocationTags value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withAllocationTags(Map<String, String> allocationTags) {
+        this.allocationTags = allocationTags;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the IpAllocationInner object itself.
+     */
+    public IpAllocationInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsImpl.java
new file mode 100644
index 000000000000..b23b1546af0b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocations;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocation;
+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;
+
+class IpAllocationsImpl extends GroupableResourcesCoreImpl<IpAllocation, IpAllocationImpl, IpAllocationInner, IpAllocationsInner, NetworkManager>  implements IpAllocations {
+    protected IpAllocationsImpl(NetworkManager manager) {
+        super(manager.inner().ipAllocations(), manager);
+    }
+
+    @Override
+    protected Observable<IpAllocationInner> getInnerAsync(String resourceGroupName, String name) {
+        IpAllocationsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        IpAllocationsInner 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<IpAllocation> listByResourceGroup(String resourceGroupName) {
+        IpAllocationsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<IpAllocation> listByResourceGroupAsync(String resourceGroupName) {
+        IpAllocationsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<IpAllocationInner>, Iterable<IpAllocationInner>>() {
+            @Override
+            public Iterable<IpAllocationInner> call(Page<IpAllocationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<IpAllocationInner, IpAllocation>() {
+            @Override
+            public IpAllocation call(IpAllocationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<IpAllocation> list() {
+        IpAllocationsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<IpAllocation> listAsync() {
+        IpAllocationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<IpAllocationInner>, Iterable<IpAllocationInner>>() {
+            @Override
+            public Iterable<IpAllocationInner> call(Page<IpAllocationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<IpAllocationInner, IpAllocation>() {
+            @Override
+            public IpAllocation call(IpAllocationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public IpAllocationImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected IpAllocationImpl wrapModel(IpAllocationInner inner) {
+        return  new IpAllocationImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected IpAllocationImpl wrapModel(String name) {
+        return new IpAllocationImpl(name, new IpAllocationInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsInner.java
new file mode 100644
index 000000000000..9ec0fa0504e0
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpAllocationsInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 IpAllocations.
+ */
+public class IpAllocationsInner implements InnerSupportsGet<IpAllocationInner>, InnerSupportsDelete<Void>, InnerSupportsListing<IpAllocationInner> {
+    /** The Retrofit service to perform REST calls. */
+    private IpAllocationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of IpAllocationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public IpAllocationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(IpAllocationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for IpAllocations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface IpAllocationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.IpAllocations delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @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.network.v2020_04_01.IpAllocations beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @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.network.v2020_04_01.IpAllocations getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.IpAllocations createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @Path("subscriptionId") String subscriptionId, @Body IpAllocationInner 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.network.v2020_04_01.IpAllocations beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @Path("subscriptionId") String subscriptionId, @Body IpAllocationInner 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.network.v2020_04_01.IpAllocations updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("ipAllocationName") String ipAllocationName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.IpAllocations list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/IpAllocations")
+        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.network.v2020_04_01.IpAllocations listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations")
+        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.network.v2020_04_01.IpAllocations 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.network.v2020_04_01.IpAllocations listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 ipAllocationName) {
+        deleteWithServiceResponseAsync(resourceGroupName, ipAllocationName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 ipAllocationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, ipAllocationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String ipAllocationName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, ipAllocationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String ipAllocationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, ipAllocationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 ipAllocationName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, ipAllocationName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 ipAllocationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, ipAllocationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String ipAllocationName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, ipAllocationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified IpAllocation.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String ipAllocationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, ipAllocationName, this.client.subscriptionId(), 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 specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner getByResourceGroup(String resourceGroupName, String ipAllocationName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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<IpAllocationInner> getByResourceGroupAsync(String resourceGroupName, String ipAllocationName, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<IpAllocationInner> getByResourceGroupAsync(String resourceGroupName, String ipAllocationName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ipAllocationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, ipAllocationName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpAllocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpAllocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpAllocationInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param expand Expands referenced resources.
+     * @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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner getByResourceGroup(String resourceGroupName, String ipAllocationName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param expand Expands referenced resources.
+     * @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<IpAllocationInner> getByResourceGroupAsync(String resourceGroupName, String ipAllocationName, String expand, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<IpAllocationInner> getByResourceGroupAsync(String resourceGroupName, String ipAllocationName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipAllocationName, expand).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified IpAllocation by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ipAllocationName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, ipAllocationName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpAllocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpAllocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpAllocationInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpAllocationInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpAllocationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpAllocationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network 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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner createOrUpdate(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @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<IpAllocationInner> createOrUpdateAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<IpAllocationInner> createOrUpdateAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, ipAllocationName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<IpAllocationInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network 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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner beginCreateOrUpdate(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @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<IpAllocationInner> beginCreateOrUpdateAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<IpAllocationInner> beginCreateOrUpdateAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipAllocationName, parameters).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an IpAllocation in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String ipAllocationName, IpAllocationInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, ipAllocationName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpAllocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpAllocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpAllocationInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpAllocationInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpAllocationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpAllocationInner>() { }.getType())
+                .register(201, new TypeToken<IpAllocationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner updateTags(String resourceGroupName, String ipAllocationName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @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<IpAllocationInner> updateTagsAsync(String resourceGroupName, String ipAllocationName, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName), serviceCallback);
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<IpAllocationInner> updateTagsAsync(String resourceGroupName, String ipAllocationName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ipAllocationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, ipAllocationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpAllocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpAllocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpAllocationInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param tags Resource tags.
+     * @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 IpAllocationInner object if successful.
+     */
+    public IpAllocationInner updateTags(String resourceGroupName, String ipAllocationName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param tags Resource tags.
+     * @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<IpAllocationInner> updateTagsAsync(String resourceGroupName, String ipAllocationName, Map<String, String> tags, final ServiceCallback<IpAllocationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<IpAllocationInner> updateTagsAsync(String resourceGroupName, String ipAllocationName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, ipAllocationName, tags).map(new Func1<ServiceResponse<IpAllocationInner>, IpAllocationInner>() {
+            @Override
+            public IpAllocationInner call(ServiceResponse<IpAllocationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a IpAllocation tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipAllocationName The name of the IpAllocation.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpAllocationInner object
+     */
+    public Observable<ServiceResponse<IpAllocationInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String ipAllocationName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipAllocationName == null) {
+            throw new IllegalArgumentException("Parameter ipAllocationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, ipAllocationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpAllocationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpAllocationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpAllocationInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpAllocationInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpAllocationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpAllocationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpAllocations in a 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;IpAllocationInner&gt; object if successful.
+     */
+    public PagedList<IpAllocationInner> list() {
+        ServiceResponse<Page<IpAllocationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<IpAllocationInner>(response.body()) {
+            @Override
+            public Page<IpAllocationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpAllocations in a 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<IpAllocationInner>> listAsync(final ListOperationCallback<IpAllocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpAllocationInner&gt; object
+     */
+    public Observable<Page<IpAllocationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<IpAllocationInner>>, Page<IpAllocationInner>>() {
+                @Override
+                public Page<IpAllocationInner> call(ServiceResponse<Page<IpAllocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpAllocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<IpAllocationInner>>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(ServiceResponse<Page<IpAllocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpAllocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpAllocationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpAllocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpAllocationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpAllocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpAllocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;IpAllocationInner&gt; object if successful.
+     */
+    public PagedList<IpAllocationInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<IpAllocationInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<IpAllocationInner>(response.body()) {
+            @Override
+            public Page<IpAllocationInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<IpAllocationInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<IpAllocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpAllocationInner&gt; object
+     */
+    public Observable<Page<IpAllocationInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<IpAllocationInner>>, Page<IpAllocationInner>>() {
+                @Override
+                public Page<IpAllocationInner> call(ServiceResponse<Page<IpAllocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpAllocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<IpAllocationInner>>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(ServiceResponse<Page<IpAllocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+    ServiceResponse<PageImpl<IpAllocationInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpAllocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpAllocationInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpAllocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpAllocationInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpAllocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpAllocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @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;IpAllocationInner&gt; object if successful.
+     */
+    public PagedList<IpAllocationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<IpAllocationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<IpAllocationInner>(response.body()) {
+            @Override
+            public Page<IpAllocationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @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<IpAllocationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<IpAllocationInner>> serviceFuture, final ListOperationCallback<IpAllocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @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;IpAllocationInner&gt; object
+     */
+    public Observable<Page<IpAllocationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<IpAllocationInner>>, Page<IpAllocationInner>>() {
+                @Override
+                public Page<IpAllocationInner> call(ServiceResponse<Page<IpAllocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+     * @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;IpAllocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<IpAllocationInner>>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(ServiceResponse<Page<IpAllocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a subscription.
+     *
+    ServiceResponse<PageImpl<IpAllocationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpAllocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> 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<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpAllocationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpAllocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpAllocationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpAllocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpAllocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpAllocations in 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;IpAllocationInner&gt; object if successful.
+     */
+    public PagedList<IpAllocationInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<IpAllocationInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<IpAllocationInner>(response.body()) {
+            @Override
+            public Page<IpAllocationInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpAllocations in 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<IpAllocationInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<IpAllocationInner>> serviceFuture, final ListOperationCallback<IpAllocationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpAllocations in 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;IpAllocationInner&gt; object
+     */
+    public Observable<Page<IpAllocationInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<IpAllocationInner>>, Page<IpAllocationInner>>() {
+                @Override
+                public Page<IpAllocationInner> call(ServiceResponse<Page<IpAllocationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in 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;IpAllocationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<IpAllocationInner>>, Observable<ServiceResponse<Page<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(ServiceResponse<Page<IpAllocationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpAllocations in a resource group.
+     *
+    ServiceResponse<PageImpl<IpAllocationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpAllocationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpAllocationInner>>> 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<IpAllocationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpAllocationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpAllocationInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpAllocationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpAllocationInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpAllocationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpAllocationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupImpl.java
new file mode 100644
index 000000000000..dea3d399281e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.IpGroup;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+
+class IpGroupImpl extends GroupableResourceCoreImpl<IpGroup, IpGroupInner, IpGroupImpl, NetworkManager> implements IpGroup, IpGroup.Definition, IpGroup.Update {
+    IpGroupImpl(String name, IpGroupInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<IpGroup> createResourceAsync() {
+        IpGroupsInner client = this.manager().inner().ipGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<IpGroup> updateResourceAsync() {
+        IpGroupsInner client = this.manager().inner().ipGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<IpGroupInner> getInnerAsync() {
+        IpGroupsInner client = this.manager().inner().ipGroups();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<SubResource> firewalls() {
+        return this.inner().firewalls();
+    }
+
+    @Override
+    public List<String> ipAddresses() {
+        return this.inner().ipAddresses();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public IpGroupImpl withIpAddresses(List<String> ipAddresses) {
+        this.inner().withIpAddresses(ipAddresses);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupInner.java
new file mode 100644
index 000000000000..15d630929f96
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * The IpGroups resource information.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class IpGroupInner extends Resource {
+    /**
+     * The provisioning state of the IpGroups resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * IpAddresses/IpAddressPrefixes in the IpGroups resource.
+     */
+    @JsonProperty(value = "properties.ipAddresses")
+    private List<String> ipAddresses;
+
+    /**
+     * List of references to Azure resources that this IpGroups is associated
+     * with.
+     */
+    @JsonProperty(value = "properties.firewalls", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> firewalls;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the provisioning state of the IpGroups resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get ipAddresses/IpAddressPrefixes in the IpGroups resource.
+     *
+     * @return the ipAddresses value
+     */
+    public List<String> ipAddresses() {
+        return this.ipAddresses;
+    }
+
+    /**
+     * Set ipAddresses/IpAddressPrefixes in the IpGroups resource.
+     *
+     * @param ipAddresses the ipAddresses value to set
+     * @return the IpGroupInner object itself.
+     */
+    public IpGroupInner withIpAddresses(List<String> ipAddresses) {
+        this.ipAddresses = ipAddresses;
+        return this;
+    }
+
+    /**
+     * Get list of references to Azure resources that this IpGroups is associated with.
+     *
+     * @return the firewalls value
+     */
+    public List<SubResource> firewalls() {
+        return this.firewalls;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the IpGroupInner object itself.
+     */
+    public IpGroupInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsImpl.java
new file mode 100644
index 000000000000..f0c3bf3ceed6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.IpGroups;
+import com.microsoft.azure.management.network.v2020_04_01.IpGroup;
+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;
+
+class IpGroupsImpl extends GroupableResourcesCoreImpl<IpGroup, IpGroupImpl, IpGroupInner, IpGroupsInner, NetworkManager>  implements IpGroups {
+    protected IpGroupsImpl(NetworkManager manager) {
+        super(manager.inner().ipGroups(), manager);
+    }
+
+    @Override
+    protected Observable<IpGroupInner> getInnerAsync(String resourceGroupName, String name) {
+        IpGroupsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        IpGroupsInner 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<IpGroup> listByResourceGroup(String resourceGroupName) {
+        IpGroupsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<IpGroup> listByResourceGroupAsync(String resourceGroupName) {
+        IpGroupsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<IpGroupInner>, Iterable<IpGroupInner>>() {
+            @Override
+            public Iterable<IpGroupInner> call(Page<IpGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<IpGroupInner, IpGroup>() {
+            @Override
+            public IpGroup call(IpGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<IpGroup> list() {
+        IpGroupsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<IpGroup> listAsync() {
+        IpGroupsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<IpGroupInner>, Iterable<IpGroupInner>>() {
+            @Override
+            public Iterable<IpGroupInner> call(Page<IpGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<IpGroupInner, IpGroup>() {
+            @Override
+            public IpGroup call(IpGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public IpGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected IpGroupImpl wrapModel(IpGroupInner inner) {
+        return  new IpGroupImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected IpGroupImpl wrapModel(String name) {
+        return new IpGroupImpl(name, new IpGroupInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsInner.java
new file mode 100644
index 000000000000..d27507329134
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/IpGroupsInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.ErrorException;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 IpGroups.
+ */
+public class IpGroupsInner implements InnerSupportsGet<IpGroupInner>, InnerSupportsDelete<Void>, InnerSupportsListing<IpGroupInner> {
+    /** The Retrofit service to perform REST calls. */
+    private IpGroupsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of IpGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public IpGroupsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(IpGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for IpGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface IpGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.IpGroups getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.IpGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @Path("subscriptionId") String subscriptionId, @Body IpGroupInner 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.network.v2020_04_01.IpGroups beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @Path("subscriptionId") String subscriptionId, @Body IpGroupInner 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.network.v2020_04_01.IpGroups updateGroups" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}")
+        Observable<Response<ResponseBody>> updateGroups(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.IpGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @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.network.v2020_04_01.IpGroups beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("ipGroupsName") String ipGroupsName, @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.network.v2020_04_01.IpGroups listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups")
+        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.network.v2020_04_01.IpGroups list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ipGroups")
+        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.network.v2020_04_01.IpGroups 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.network.v2020_04_01.IpGroups listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner getByResourceGroup(String resourceGroupName, String ipGroupsName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @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<IpGroupInner> getByResourceGroupAsync(String resourceGroupName, String ipGroupsName, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<IpGroupInner> getByResourceGroupAsync(String resourceGroupName, String ipGroupsName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<ServiceResponse<IpGroupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ipGroupsName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, ipGroupsName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpGroupInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param expand Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner getByResourceGroup(String resourceGroupName, String ipGroupsName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param expand Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups 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<IpGroupInner> getByResourceGroupAsync(String resourceGroupName, String ipGroupsName, String expand, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param expand Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<IpGroupInner> getByResourceGroupAsync(String resourceGroupName, String ipGroupsName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, ipGroupsName, expand).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param expand Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<ServiceResponse<IpGroupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String ipGroupsName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, ipGroupsName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpGroupInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpGroupInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpGroupInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpGroupInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner createOrUpdate(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @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<IpGroupInner> createOrUpdateAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<IpGroupInner> createOrUpdateAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<IpGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, ipGroupsName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<IpGroupInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner beginCreateOrUpdate(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @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<IpGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<IpGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, ipGroupsName, parameters).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an ipGroups in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param parameters Parameters supplied to the create or update IpGroups operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<ServiceResponse<IpGroupInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String ipGroupsName, IpGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, ipGroupsName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpGroupInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpGroupInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpGroupInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpGroupInner>() { }.getType())
+                .register(201, new TypeToken<IpGroupInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner updateGroups(String resourceGroupName, String ipGroupsName) {
+        return updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @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<IpGroupInner> updateGroupsAsync(String resourceGroupName, String ipGroupsName, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<IpGroupInner> updateGroupsAsync(String resourceGroupName, String ipGroupsName) {
+        return updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<ServiceResponse<IpGroupInner>> updateGroupsWithServiceResponseAsync(String resourceGroupName, String ipGroupsName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateGroups(resourceGroupName, ipGroupsName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpGroupInner> clientResponse = updateGroupsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the IpGroupInner object if successful.
+     */
+    public IpGroupInner updateGroups(String resourceGroupName, String ipGroupsName, Map<String, String> tags) {
+        return updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param tags Resource tags.
+     * @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<IpGroupInner> updateGroupsAsync(String resourceGroupName, String ipGroupsName, Map<String, String> tags, final ServiceCallback<IpGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<IpGroupInner> updateGroupsAsync(String resourceGroupName, String ipGroupsName, Map<String, String> tags) {
+        return updateGroupsWithServiceResponseAsync(resourceGroupName, ipGroupsName, tags).map(new Func1<ServiceResponse<IpGroupInner>, IpGroupInner>() {
+            @Override
+            public IpGroupInner call(ServiceResponse<IpGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of an IpGroups resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpGroupInner object
+     */
+    public Observable<ServiceResponse<IpGroupInner>> updateGroupsWithServiceResponseAsync(String resourceGroupName, String ipGroupsName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateGroups(resourceGroupName, ipGroupsName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpGroupInner> clientResponse = updateGroupsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpGroupInner> updateGroupsDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpGroupInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpGroupInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 ipGroupsName) {
+        deleteWithServiceResponseAsync(resourceGroupName, ipGroupsName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @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 ipGroupsName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, ipGroupsName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String ipGroupsName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, ipGroupsName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String ipGroupsName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, ipGroupsName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 ipGroupsName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, ipGroupsName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @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 ipGroupsName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, ipGroupsName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String ipGroupsName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, ipGroupsName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ipGroups.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param ipGroupsName The name of the ipGroups.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String ipGroupsName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (ipGroupsName == null) {
+            throw new IllegalArgumentException("Parameter ipGroupsName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, ipGroupsName, this.client.subscriptionId(), 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;IpGroupInner&gt; object if successful.
+     */
+    public PagedList<IpGroupInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<IpGroupInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<IpGroupInner>(response.body()) {
+            @Override
+            public Page<IpGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<IpGroupInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<IpGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpGroupInner&gt; object
+     */
+    public Observable<Page<IpGroupInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<IpGroupInner>>, Page<IpGroupInner>>() {
+                @Override
+                public Page<IpGroupInner> call(ServiceResponse<Page<IpGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<IpGroupInner>>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(ServiceResponse<Page<IpGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+    ServiceResponse<PageImpl<IpGroupInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpGroupInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpGroupInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;IpGroupInner&gt; object if successful.
+     */
+    public PagedList<IpGroupInner> list() {
+        ServiceResponse<Page<IpGroupInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<IpGroupInner>(response.body()) {
+            @Override
+            public Page<IpGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpGroups in a 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<IpGroupInner>> listAsync(final ListOperationCallback<IpGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpGroupInner&gt; object
+     */
+    public Observable<Page<IpGroupInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<IpGroupInner>>, Page<IpGroupInner>>() {
+                @Override
+                public Page<IpGroupInner> call(ServiceResponse<Page<IpGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;IpGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<IpGroupInner>>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(ServiceResponse<Page<IpGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpGroupInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpGroupInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;IpGroupInner&gt; object if successful.
+     */
+    public PagedList<IpGroupInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<IpGroupInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<IpGroupInner>(response.body()) {
+            @Override
+            public Page<IpGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpGroups in 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<IpGroupInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<IpGroupInner>> serviceFuture, final ListOperationCallback<IpGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpGroups in 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;IpGroupInner&gt; object
+     */
+    public Observable<Page<IpGroupInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<IpGroupInner>>, Page<IpGroupInner>>() {
+                @Override
+                public Page<IpGroupInner> call(ServiceResponse<Page<IpGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in 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;IpGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<IpGroupInner>>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(ServiceResponse<Page<IpGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a resource group.
+     *
+    ServiceResponse<PageImpl<IpGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> 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<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpGroupInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpGroupInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;IpGroupInner&gt; object if successful.
+     */
+    public PagedList<IpGroupInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<IpGroupInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<IpGroupInner>(response.body()) {
+            @Override
+            public Page<IpGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @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<IpGroupInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<IpGroupInner>> serviceFuture, final ListOperationCallback<IpGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @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;IpGroupInner&gt; object
+     */
+    public Observable<Page<IpGroupInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<IpGroupInner>>, Page<IpGroupInner>>() {
+                @Override
+                public Page<IpGroupInner> call(ServiceResponse<Page<IpGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+     * @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;IpGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<IpGroupInner>>, Observable<ServiceResponse<Page<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(ServiceResponse<Page<IpGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all IpGroups in a subscription.
+     *
+    ServiceResponse<PageImpl<IpGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpGroupInner>>> 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<IpGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpGroupInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpGroupInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsImpl.java
new file mode 100644
index 000000000000..12f5a0f35599
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerBackendAddressPools;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+
+class LoadBalancerBackendAddressPoolsImpl extends WrapperImpl<LoadBalancerBackendAddressPoolsInner> implements LoadBalancerBackendAddressPools {
+    private final NetworkManager manager;
+
+    LoadBalancerBackendAddressPoolsImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerBackendAddressPools());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public BackendAddressPoolImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private BackendAddressPoolImpl wrapModel(BackendAddressPoolInner inner) {
+        return  new BackendAddressPoolImpl(inner, manager());
+    }
+
+    private BackendAddressPoolImpl wrapModel(String name) {
+        return new BackendAddressPoolImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<BackendAddressPool> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerBackendAddressPoolsInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<BackendAddressPoolInner>, Iterable<BackendAddressPoolInner>>() {
+            @Override
+            public Iterable<BackendAddressPoolInner> call(Page<BackendAddressPoolInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<BackendAddressPoolInner, BackendAddressPool>() {
+            @Override
+            public BackendAddressPool call(BackendAddressPoolInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<BackendAddressPool> getAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        LoadBalancerBackendAddressPoolsInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, backendAddressPoolName)
+        .flatMap(new Func1<BackendAddressPoolInner, Observable<BackendAddressPool>>() {
+            @Override
+            public Observable<BackendAddressPool> call(BackendAddressPoolInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((BackendAddressPool)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        LoadBalancerBackendAddressPoolsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsInner.java
new file mode 100644
index 000000000000..21ce6cbb8237
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerBackendAddressPoolsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 LoadBalancerBackendAddressPools.
+ */
+public class LoadBalancerBackendAddressPoolsInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerBackendAddressPoolsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerBackendAddressPoolsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerBackendAddressPoolsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerBackendAddressPoolsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerBackendAddressPools to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerBackendAddressPoolsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerBackendAddressPools list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerBackendAddressPools get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("backendAddressPoolName") String backendAddressPoolName, @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.network.v2020_04_01.LoadBalancerBackendAddressPools createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("backendAddressPoolName") String backendAddressPoolName, @Path("subscriptionId") String subscriptionId, @Body BackendAddressPoolInner 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.network.v2020_04_01.LoadBalancerBackendAddressPools beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("backendAddressPoolName") String backendAddressPoolName, @Path("subscriptionId") String subscriptionId, @Body BackendAddressPoolInner 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.network.v2020_04_01.LoadBalancerBackendAddressPools delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("backendAddressPoolName") String backendAddressPoolName, @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.network.v2020_04_01.LoadBalancerBackendAddressPools beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("backendAddressPoolName") String backendAddressPoolName, @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.network.v2020_04_01.LoadBalancerBackendAddressPools listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;BackendAddressPoolInner&gt; object if successful.
+     */
+    public PagedList<BackendAddressPoolInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<BackendAddressPoolInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<BackendAddressPoolInner>(response.body()) {
+            @Override
+            public Page<BackendAddressPoolInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<BackendAddressPoolInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<BackendAddressPoolInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BackendAddressPoolInner&gt; object
+     */
+    public Observable<Page<BackendAddressPoolInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<BackendAddressPoolInner>>, Page<BackendAddressPoolInner>>() {
+                @Override
+                public Page<BackendAddressPoolInner> call(ServiceResponse<Page<BackendAddressPoolInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BackendAddressPoolInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<BackendAddressPoolInner>>, Observable<ServiceResponse<Page<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(ServiceResponse<Page<BackendAddressPoolInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+    ServiceResponse<PageImpl<BackendAddressPoolInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BackendAddressPoolInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BackendAddressPoolInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BackendAddressPoolInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BackendAddressPoolInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BackendAddressPoolInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BackendAddressPoolInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BackendAddressPoolInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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 BackendAddressPoolInner object if successful.
+     */
+    public BackendAddressPoolInner get(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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<BackendAddressPoolInner> getAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, final ServiceCallback<BackendAddressPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName), serviceCallback);
+    }
+
+    /**
+     * Gets load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BackendAddressPoolInner object
+     */
+    public Observable<BackendAddressPoolInner> getAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).map(new Func1<ServiceResponse<BackendAddressPoolInner>, BackendAddressPoolInner>() {
+            @Override
+            public BackendAddressPoolInner call(ServiceResponse<BackendAddressPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BackendAddressPoolInner object
+     */
+    public Observable<ServiceResponse<BackendAddressPoolInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (backendAddressPoolName == null) {
+            throw new IllegalArgumentException("Parameter backendAddressPoolName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, backendAddressPoolName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BackendAddressPoolInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BackendAddressPoolInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BackendAddressPoolInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<BackendAddressPoolInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<BackendAddressPoolInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<BackendAddressPoolInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool 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 BackendAddressPoolInner object if successful.
+     */
+    public BackendAddressPoolInner createOrUpdate(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @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<BackendAddressPoolInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters, final ServiceCallback<BackendAddressPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<BackendAddressPoolInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters).map(new Func1<ServiceResponse<BackendAddressPoolInner>, BackendAddressPoolInner>() {
+            @Override
+            public BackendAddressPoolInner call(ServiceResponse<BackendAddressPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<BackendAddressPoolInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (backendAddressPoolName == null) {
+            throw new IllegalArgumentException("Parameter backendAddressPoolName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, loadBalancerName, backendAddressPoolName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<BackendAddressPoolInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool 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 BackendAddressPoolInner object if successful.
+     */
+    public BackendAddressPoolInner beginCreateOrUpdate(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @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<BackendAddressPoolInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters, final ServiceCallback<BackendAddressPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BackendAddressPoolInner object
+     */
+    public Observable<BackendAddressPoolInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName, parameters).map(new Func1<ServiceResponse<BackendAddressPoolInner>, BackendAddressPoolInner>() {
+            @Override
+            public BackendAddressPoolInner call(ServiceResponse<BackendAddressPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @param parameters Parameters supplied to the create or update load balancer backend address pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BackendAddressPoolInner object
+     */
+    public Observable<ServiceResponse<BackendAddressPoolInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName, BackendAddressPoolInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (backendAddressPoolName == null) {
+            throw new IllegalArgumentException("Parameter backendAddressPoolName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, loadBalancerName, backendAddressPoolName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BackendAddressPoolInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BackendAddressPoolInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BackendAddressPoolInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<BackendAddressPoolInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<BackendAddressPoolInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<BackendAddressPoolInner>() { }.getType())
+                .register(201, new TypeToken<BackendAddressPoolInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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 loadBalancerName, String backendAddressPoolName) {
+        deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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 loadBalancerName, String backendAddressPoolName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (backendAddressPoolName == null) {
+            throw new IllegalArgumentException("Parameter backendAddressPoolName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, loadBalancerName, backendAddressPoolName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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 loadBalancerName, String backendAddressPoolName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @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 loadBalancerName, String backendAddressPoolName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName, backendAddressPoolName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer backend address pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param backendAddressPoolName The name of the backend address pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String backendAddressPoolName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (backendAddressPoolName == null) {
+            throw new IllegalArgumentException("Parameter backendAddressPoolName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, loadBalancerName, backendAddressPoolName, this.client.subscriptionId(), 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 all the load balancer backed address pools.
+     *
+     * @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;BackendAddressPoolInner&gt; object if successful.
+     */
+    public PagedList<BackendAddressPoolInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<BackendAddressPoolInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BackendAddressPoolInner>(response.body()) {
+            @Override
+            public Page<BackendAddressPoolInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @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<BackendAddressPoolInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<BackendAddressPoolInner>> serviceFuture, final ListOperationCallback<BackendAddressPoolInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @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;BackendAddressPoolInner&gt; object
+     */
+    public Observable<Page<BackendAddressPoolInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BackendAddressPoolInner>>, Page<BackendAddressPoolInner>>() {
+                @Override
+                public Page<BackendAddressPoolInner> call(ServiceResponse<Page<BackendAddressPoolInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+     * @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;BackendAddressPoolInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BackendAddressPoolInner>>, Observable<ServiceResponse<Page<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(ServiceResponse<Page<BackendAddressPoolInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer backed address pools.
+     *
+    ServiceResponse<PageImpl<BackendAddressPoolInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BackendAddressPoolInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> 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<BackendAddressPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BackendAddressPoolInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BackendAddressPoolInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BackendAddressPoolInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BackendAddressPoolInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<BackendAddressPoolInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BackendAddressPoolInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsImpl.java
new file mode 100644
index 000000000000..9125499a0e2a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerFrontendIPConfigurations;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+
+class LoadBalancerFrontendIPConfigurationsImpl extends WrapperImpl<LoadBalancerFrontendIPConfigurationsInner> implements LoadBalancerFrontendIPConfigurations {
+    private final NetworkManager manager;
+
+    LoadBalancerFrontendIPConfigurationsImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerFrontendIPConfigurations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private FrontendIPConfigurationImpl wrapModel(FrontendIPConfigurationInner inner) {
+        return  new FrontendIPConfigurationImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<FrontendIPConfiguration> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerFrontendIPConfigurationsInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<FrontendIPConfigurationInner>, Iterable<FrontendIPConfigurationInner>>() {
+            @Override
+            public Iterable<FrontendIPConfigurationInner> call(Page<FrontendIPConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<FrontendIPConfigurationInner, FrontendIPConfiguration>() {
+            @Override
+            public FrontendIPConfiguration call(FrontendIPConfigurationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<FrontendIPConfiguration> getAsync(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName) {
+        LoadBalancerFrontendIPConfigurationsInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, frontendIPConfigurationName)
+        .flatMap(new Func1<FrontendIPConfigurationInner, Observable<FrontendIPConfiguration>>() {
+            @Override
+            public Observable<FrontendIPConfiguration> call(FrontendIPConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FrontendIPConfiguration)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsInner.java
new file mode 100644
index 000000000000..fe95e28fa248
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerFrontendIPConfigurationsInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 LoadBalancerFrontendIPConfigurations.
+ */
+public class LoadBalancerFrontendIPConfigurationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerFrontendIPConfigurationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerFrontendIPConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerFrontendIPConfigurationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerFrontendIPConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerFrontendIPConfigurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerFrontendIPConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerFrontendIPConfigurations list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/frontendIPConfigurations")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerFrontendIPConfigurations get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/frontendIPConfigurations/{frontendIPConfigurationName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("frontendIPConfigurationName") String frontendIPConfigurationName, @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.network.v2020_04_01.LoadBalancerFrontendIPConfigurations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;FrontendIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<FrontendIPConfigurationInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<FrontendIPConfigurationInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<FrontendIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<FrontendIPConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<FrontendIPConfigurationInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<FrontendIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FrontendIPConfigurationInner&gt; object
+     */
+    public Observable<Page<FrontendIPConfigurationInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<FrontendIPConfigurationInner>>, Page<FrontendIPConfigurationInner>>() {
+                @Override
+                public Page<FrontendIPConfigurationInner> call(ServiceResponse<Page<FrontendIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;FrontendIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<FrontendIPConfigurationInner>>, Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(ServiceResponse<Page<FrontendIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+    ServiceResponse<PageImpl<FrontendIPConfigurationInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<FrontendIPConfigurationInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FrontendIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FrontendIPConfigurationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FrontendIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FrontendIPConfigurationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FrontendIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FrontendIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets load balancer frontend IP configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param frontendIPConfigurationName The name of the frontend IP configuration.
+     * @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 FrontendIPConfigurationInner object if successful.
+     */
+    public FrontendIPConfigurationInner get(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, frontendIPConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets load balancer frontend IP configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param frontendIPConfigurationName The name of the frontend IP 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<FrontendIPConfigurationInner> getAsync(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName, final ServiceCallback<FrontendIPConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, frontendIPConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Gets load balancer frontend IP configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param frontendIPConfigurationName The name of the frontend IP configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FrontendIPConfigurationInner object
+     */
+    public Observable<FrontendIPConfigurationInner> getAsync(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, frontendIPConfigurationName).map(new Func1<ServiceResponse<FrontendIPConfigurationInner>, FrontendIPConfigurationInner>() {
+            @Override
+            public FrontendIPConfigurationInner call(ServiceResponse<FrontendIPConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets load balancer frontend IP configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param frontendIPConfigurationName The name of the frontend IP configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FrontendIPConfigurationInner object
+     */
+    public Observable<ServiceResponse<FrontendIPConfigurationInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String frontendIPConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (frontendIPConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter frontendIPConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, frontendIPConfigurationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FrontendIPConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FrontendIPConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FrontendIPConfigurationInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FrontendIPConfigurationInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FrontendIPConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FrontendIPConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+     * @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;FrontendIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<FrontendIPConfigurationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<FrontendIPConfigurationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<FrontendIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<FrontendIPConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer frontend IP 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<FrontendIPConfigurationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<FrontendIPConfigurationInner>> serviceFuture, final ListOperationCallback<FrontendIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer frontend IP 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;FrontendIPConfigurationInner&gt; object
+     */
+    public Observable<Page<FrontendIPConfigurationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<FrontendIPConfigurationInner>>, Page<FrontendIPConfigurationInner>>() {
+                @Override
+                public Page<FrontendIPConfigurationInner> call(ServiceResponse<Page<FrontendIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer frontend IP 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;FrontendIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<FrontendIPConfigurationInner>>, Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(ServiceResponse<Page<FrontendIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer frontend IP configurations.
+     *
+    ServiceResponse<PageImpl<FrontendIPConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;FrontendIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> 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<FrontendIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<FrontendIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<FrontendIPConfigurationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<FrontendIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<FrontendIPConfigurationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<FrontendIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<FrontendIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerImpl.java
new file mode 100644
index 000000000000..70d0a6b48b4c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerImpl.java
@@ -0,0 +1,196 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancer;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerSku;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatPool;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancingRule;
+import com.microsoft.azure.management.network.v2020_04_01.OutboundRule;
+import com.microsoft.azure.management.network.v2020_04_01.Probe;
+
+class LoadBalancerImpl extends GroupableResourceCoreImpl<LoadBalancer, LoadBalancerInner, LoadBalancerImpl, NetworkManager> implements LoadBalancer, LoadBalancer.Definition, LoadBalancer.Update {
+    LoadBalancerImpl(String name, LoadBalancerInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<LoadBalancer> createResourceAsync() {
+        LoadBalancersInner client = this.manager().inner().loadBalancers();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<LoadBalancer> updateResourceAsync() {
+        LoadBalancersInner client = this.manager().inner().loadBalancers();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<LoadBalancerInner> getInnerAsync() {
+        LoadBalancersInner client = this.manager().inner().loadBalancers();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<BackendAddressPool> backendAddressPools() {
+        List<BackendAddressPool> lst = new ArrayList<BackendAddressPool>();
+        if (this.inner().backendAddressPools() != null) {
+            for (BackendAddressPoolInner inner : this.inner().backendAddressPools()) {
+                lst.add( new BackendAddressPoolImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<FrontendIPConfiguration> frontendIPConfigurations() {
+        List<FrontendIPConfiguration> lst = new ArrayList<FrontendIPConfiguration>();
+        if (this.inner().frontendIPConfigurations() != null) {
+            for (FrontendIPConfigurationInner inner : this.inner().frontendIPConfigurations()) {
+                lst.add( new FrontendIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<InboundNatPool> inboundNatPools() {
+        return this.inner().inboundNatPools();
+    }
+
+    @Override
+    public List<InboundNatRule> inboundNatRules() {
+        List<InboundNatRule> lst = new ArrayList<InboundNatRule>();
+        if (this.inner().inboundNatRules() != null) {
+            for (InboundNatRuleInner inner : this.inner().inboundNatRules()) {
+                lst.add( new InboundNatRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<LoadBalancingRule> loadBalancingRules() {
+        List<LoadBalancingRule> lst = new ArrayList<LoadBalancingRule>();
+        if (this.inner().loadBalancingRules() != null) {
+            for (LoadBalancingRuleInner inner : this.inner().loadBalancingRules()) {
+                lst.add( new LoadBalancingRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<OutboundRule> outboundRules() {
+        List<OutboundRule> lst = new ArrayList<OutboundRule>();
+        if (this.inner().outboundRules() != null) {
+            for (OutboundRuleInner inner : this.inner().outboundRules()) {
+                lst.add( new OutboundRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<Probe> probes() {
+        List<Probe> lst = new ArrayList<Probe>();
+        if (this.inner().probes() != null) {
+            for (ProbeInner inner : this.inner().probes()) {
+                lst.add( new ProbeImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public LoadBalancerSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public LoadBalancerImpl withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools) {
+        this.inner().withBackendAddressPools(backendAddressPools);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations) {
+        this.inner().withFrontendIPConfigurations(frontendIPConfigurations);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withInboundNatPools(List<InboundNatPool> inboundNatPools) {
+        this.inner().withInboundNatPools(inboundNatPools);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withInboundNatRules(List<InboundNatRuleInner> inboundNatRules) {
+        this.inner().withInboundNatRules(inboundNatRules);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules) {
+        this.inner().withLoadBalancingRules(loadBalancingRules);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withOutboundRules(List<OutboundRuleInner> outboundRules) {
+        this.inner().withOutboundRules(outboundRules);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withProbes(List<ProbeInner> probes) {
+        this.inner().withProbes(probes);
+        return this;
+    }
+
+    @Override
+    public LoadBalancerImpl withSku(LoadBalancerSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerInner.java
new file mode 100644
index 000000000000..1febba03ce42
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerInner.java
@@ -0,0 +1,319 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerSku;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatPool;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * LoadBalancer resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class LoadBalancerInner extends Resource {
+    /**
+     * The load balancer SKU.
+     */
+    @JsonProperty(value = "sku")
+    private LoadBalancerSku sku;
+
+    /**
+     * Object representing the frontend IPs to be used for the load balancer.
+     */
+    @JsonProperty(value = "properties.frontendIPConfigurations")
+    private List<FrontendIPConfigurationInner> frontendIPConfigurations;
+
+    /**
+     * Collection of backend address pools used by a load balancer.
+     */
+    @JsonProperty(value = "properties.backendAddressPools")
+    private List<BackendAddressPoolInner> backendAddressPools;
+
+    /**
+     * Object collection representing the load balancing rules Gets the
+     * provisioning.
+     */
+    @JsonProperty(value = "properties.loadBalancingRules")
+    private List<LoadBalancingRuleInner> loadBalancingRules;
+
+    /**
+     * Collection of probe objects used in the load balancer.
+     */
+    @JsonProperty(value = "properties.probes")
+    private List<ProbeInner> probes;
+
+    /**
+     * Collection of inbound NAT Rules used by a load balancer. Defining
+     * inbound NAT rules on your load balancer is mutually exclusive with
+     * defining an inbound NAT pool. Inbound NAT pools are referenced from
+     * virtual machine scale sets. NICs that are associated with individual
+     * virtual machines cannot reference an Inbound NAT pool. They have to
+     * reference individual inbound NAT rules.
+     */
+    @JsonProperty(value = "properties.inboundNatRules")
+    private List<InboundNatRuleInner> inboundNatRules;
+
+    /**
+     * Defines an external port range for inbound NAT to a single backend port
+     * on NICs associated with a load balancer. Inbound NAT rules are created
+     * automatically for each NIC associated with the Load Balancer using an
+     * external port from this range. Defining an Inbound NAT pool on your Load
+     * Balancer is mutually exclusive with defining inbound Nat rules. Inbound
+     * NAT pools are referenced from virtual machine scale sets. NICs that are
+     * associated with individual virtual machines cannot reference an inbound
+     * NAT pool. They have to reference individual inbound NAT rules.
+     */
+    @JsonProperty(value = "properties.inboundNatPools")
+    private List<InboundNatPool> inboundNatPools;
+
+    /**
+     * The outbound rules.
+     */
+    @JsonProperty(value = "properties.outboundRules")
+    private List<OutboundRuleInner> outboundRules;
+
+    /**
+     * The resource GUID property of the load balancer resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the load balancer resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the load balancer SKU.
+     *
+     * @return the sku value
+     */
+    public LoadBalancerSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the load balancer SKU.
+     *
+     * @param sku the sku value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withSku(LoadBalancerSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get object representing the frontend IPs to be used for the load balancer.
+     *
+     * @return the frontendIPConfigurations value
+     */
+    public List<FrontendIPConfigurationInner> frontendIPConfigurations() {
+        return this.frontendIPConfigurations;
+    }
+
+    /**
+     * Set object representing the frontend IPs to be used for the load balancer.
+     *
+     * @param frontendIPConfigurations the frontendIPConfigurations value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations) {
+        this.frontendIPConfigurations = frontendIPConfigurations;
+        return this;
+    }
+
+    /**
+     * Get collection of backend address pools used by a load balancer.
+     *
+     * @return the backendAddressPools value
+     */
+    public List<BackendAddressPoolInner> backendAddressPools() {
+        return this.backendAddressPools;
+    }
+
+    /**
+     * Set collection of backend address pools used by a load balancer.
+     *
+     * @param backendAddressPools the backendAddressPools value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools) {
+        this.backendAddressPools = backendAddressPools;
+        return this;
+    }
+
+    /**
+     * Get object collection representing the load balancing rules Gets the provisioning.
+     *
+     * @return the loadBalancingRules value
+     */
+    public List<LoadBalancingRuleInner> loadBalancingRules() {
+        return this.loadBalancingRules;
+    }
+
+    /**
+     * Set object collection representing the load balancing rules Gets the provisioning.
+     *
+     * @param loadBalancingRules the loadBalancingRules value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules) {
+        this.loadBalancingRules = loadBalancingRules;
+        return this;
+    }
+
+    /**
+     * Get collection of probe objects used in the load balancer.
+     *
+     * @return the probes value
+     */
+    public List<ProbeInner> probes() {
+        return this.probes;
+    }
+
+    /**
+     * Set collection of probe objects used in the load balancer.
+     *
+     * @param probes the probes value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withProbes(List<ProbeInner> probes) {
+        this.probes = probes;
+        return this;
+    }
+
+    /**
+     * Get collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules.
+     *
+     * @return the inboundNatRules value
+     */
+    public List<InboundNatRuleInner> inboundNatRules() {
+        return this.inboundNatRules;
+    }
+
+    /**
+     * Set collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules.
+     *
+     * @param inboundNatRules the inboundNatRules value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withInboundNatRules(List<InboundNatRuleInner> inboundNatRules) {
+        this.inboundNatRules = inboundNatRules;
+        return this;
+    }
+
+    /**
+     * Get defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules.
+     *
+     * @return the inboundNatPools value
+     */
+    public List<InboundNatPool> inboundNatPools() {
+        return this.inboundNatPools;
+    }
+
+    /**
+     * Set defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules.
+     *
+     * @param inboundNatPools the inboundNatPools value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withInboundNatPools(List<InboundNatPool> inboundNatPools) {
+        this.inboundNatPools = inboundNatPools;
+        return this;
+    }
+
+    /**
+     * Get the outbound rules.
+     *
+     * @return the outboundRules value
+     */
+    public List<OutboundRuleInner> outboundRules() {
+        return this.outboundRules;
+    }
+
+    /**
+     * Set the outbound rules.
+     *
+     * @param outboundRules the outboundRules value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withOutboundRules(List<OutboundRuleInner> outboundRules) {
+        this.outboundRules = outboundRules;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the load balancer resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the load balancer resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesImpl.java
new file mode 100644
index 000000000000..58ff42d2b578
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerLoadBalancingRules;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancingRule;
+
+class LoadBalancerLoadBalancingRulesImpl extends WrapperImpl<LoadBalancerLoadBalancingRulesInner> implements LoadBalancerLoadBalancingRules {
+    private final NetworkManager manager;
+
+    LoadBalancerLoadBalancingRulesImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerLoadBalancingRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private LoadBalancingRuleImpl wrapModel(LoadBalancingRuleInner inner) {
+        return  new LoadBalancingRuleImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<LoadBalancingRule> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerLoadBalancingRulesInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<LoadBalancingRuleInner>, Iterable<LoadBalancingRuleInner>>() {
+            @Override
+            public Iterable<LoadBalancingRuleInner> call(Page<LoadBalancingRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LoadBalancingRuleInner, LoadBalancingRule>() {
+            @Override
+            public LoadBalancingRule call(LoadBalancingRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<LoadBalancingRule> getAsync(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName) {
+        LoadBalancerLoadBalancingRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, loadBalancingRuleName)
+        .flatMap(new Func1<LoadBalancingRuleInner, Observable<LoadBalancingRule>>() {
+            @Override
+            public Observable<LoadBalancingRule> call(LoadBalancingRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((LoadBalancingRule)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesInner.java
new file mode 100644
index 000000000000..d9664464972b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerLoadBalancingRulesInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 LoadBalancerLoadBalancingRules.
+ */
+public class LoadBalancerLoadBalancingRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerLoadBalancingRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerLoadBalancingRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerLoadBalancingRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerLoadBalancingRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerLoadBalancingRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerLoadBalancingRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerLoadBalancingRules list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/loadBalancingRules")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerLoadBalancingRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/loadBalancingRules/{loadBalancingRuleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("loadBalancingRuleName") String loadBalancingRuleName, @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.network.v2020_04_01.LoadBalancerLoadBalancingRules listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;LoadBalancingRuleInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancingRuleInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<LoadBalancingRuleInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<LoadBalancingRuleInner>(response.body()) {
+            @Override
+            public Page<LoadBalancingRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<LoadBalancingRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<LoadBalancingRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancingRuleInner&gt; object
+     */
+    public Observable<Page<LoadBalancingRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<LoadBalancingRuleInner>>, Page<LoadBalancingRuleInner>>() {
+                @Override
+                public Page<LoadBalancingRuleInner> call(ServiceResponse<Page<LoadBalancingRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancingRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancingRuleInner>>, Observable<ServiceResponse<Page<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(ServiceResponse<Page<LoadBalancingRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<LoadBalancingRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<LoadBalancingRuleInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancingRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancingRuleInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancingRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancingRuleInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancingRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancingRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified load balancer load balancing rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param loadBalancingRuleName The name of the load balancing rule.
+     * @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 LoadBalancingRuleInner object if successful.
+     */
+    public LoadBalancingRuleInner get(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, loadBalancingRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer load balancing rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param loadBalancingRuleName The name of the load balancing 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<LoadBalancingRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName, final ServiceCallback<LoadBalancingRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, loadBalancingRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer load balancing rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param loadBalancingRuleName The name of the load balancing rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancingRuleInner object
+     */
+    public Observable<LoadBalancingRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, loadBalancingRuleName).map(new Func1<ServiceResponse<LoadBalancingRuleInner>, LoadBalancingRuleInner>() {
+            @Override
+            public LoadBalancingRuleInner call(ServiceResponse<LoadBalancingRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer load balancing rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param loadBalancingRuleName The name of the load balancing rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancingRuleInner object
+     */
+    public Observable<ServiceResponse<LoadBalancingRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String loadBalancingRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (loadBalancingRuleName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancingRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, loadBalancingRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancingRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancingRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancingRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LoadBalancingRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LoadBalancingRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LoadBalancingRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @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;LoadBalancingRuleInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancingRuleInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<LoadBalancingRuleInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LoadBalancingRuleInner>(response.body()) {
+            @Override
+            public Page<LoadBalancingRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @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<LoadBalancingRuleInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<LoadBalancingRuleInner>> serviceFuture, final ListOperationCallback<LoadBalancingRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @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;LoadBalancingRuleInner&gt; object
+     */
+    public Observable<Page<LoadBalancingRuleInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LoadBalancingRuleInner>>, Page<LoadBalancingRuleInner>>() {
+                @Override
+                public Page<LoadBalancingRuleInner> call(ServiceResponse<Page<LoadBalancingRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+     * @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;LoadBalancingRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancingRuleInner>>, Observable<ServiceResponse<Page<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(ServiceResponse<Page<LoadBalancingRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancing rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<LoadBalancingRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancingRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> 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<LoadBalancingRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancingRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancingRuleInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancingRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancingRuleInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancingRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancingRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfaceImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfaceImpl.java
new file mode 100644
index 000000000000..df383df61f58
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfaceImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterface;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceDnsSettings;
+import java.util.List;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroup;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfiguration;
+import com.microsoft.azure.SubResource;
+
+class LoadBalancerNetworkInterfaceImpl extends WrapperImpl<NetworkInterfaceInner> implements LoadBalancerNetworkInterface {
+    private final NetworkManager manager;
+
+    LoadBalancerNetworkInterfaceImpl(NetworkInterfaceInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public NetworkInterfaceDnsSettings dnsSettings() {
+        return this.inner().dnsSettings();
+    }
+
+    @Override
+    public Boolean enableAcceleratedNetworking() {
+        return this.inner().enableAcceleratedNetworking();
+    }
+
+    @Override
+    public Boolean enableIPForwarding() {
+        return this.inner().enableIPForwarding();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<String> hostedWorkloads() {
+        return this.inner().hostedWorkloads();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> ipConfigurations() {
+        List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> lst = new ArrayList<VirtualMachineScaleSetNetworkInterfaceIPConfiguration>();
+        if (this.inner().ipConfigurations() != null) {
+            for (NetworkInterfaceIPConfigurationInner inner : this.inner().ipConfigurations()) {
+                lst.add( new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String macAddress() {
+        return this.inner().macAddress();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public NetworkSecurityGroup networkSecurityGroup() {
+        NetworkSecurityGroupInner inner = this.inner().networkSecurityGroup();
+        if (inner != null) {
+            return  new NetworkSecurityGroupImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Boolean primary() {
+        return this.inner().primary();
+    }
+
+    @Override
+    public PrivateEndpoint privateEndpoint() {
+        PrivateEndpointInner inner = this.inner().privateEndpoint();
+        if (inner != null) {
+            return  new PrivateEndpointImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public List<NetworkInterfaceTapConfiguration> tapConfigurations() {
+        List<NetworkInterfaceTapConfiguration> lst = new ArrayList<NetworkInterfaceTapConfiguration>();
+        if (this.inner().tapConfigurations() != null) {
+            for (NetworkInterfaceTapConfigurationInner inner : this.inner().tapConfigurations()) {
+                lst.add( new NetworkInterfaceTapConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public SubResource virtualMachine() {
+        return this.inner().virtualMachine();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesImpl.java
new file mode 100644
index 000000000000..5629e6346020
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterfaces;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterface;
+
+class LoadBalancerNetworkInterfacesImpl extends WrapperImpl<LoadBalancerNetworkInterfacesInner> implements LoadBalancerNetworkInterfaces {
+    private final NetworkManager manager;
+
+    LoadBalancerNetworkInterfacesImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerNetworkInterfaces());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private LoadBalancerNetworkInterfaceImpl wrapModel(NetworkInterfaceInner inner) {
+        return  new LoadBalancerNetworkInterfaceImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<LoadBalancerNetworkInterface> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerNetworkInterfacesInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceInner>, Iterable<NetworkInterfaceInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceInner> call(Page<NetworkInterfaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceInner, LoadBalancerNetworkInterface>() {
+            @Override
+            public LoadBalancerNetworkInterface call(NetworkInterfaceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesInner.java
new file mode 100644
index 000000000000..ff5e3b2d1617
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerNetworkInterfacesInner.java
@@ -0,0 +1,301 @@
+/**
+ * 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.network.v2020_04_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.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 LoadBalancerNetworkInterfaces.
+ */
+public class LoadBalancerNetworkInterfacesInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerNetworkInterfacesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerNetworkInterfacesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerNetworkInterfacesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerNetworkInterfacesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerNetworkInterfaces to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerNetworkInterfacesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterfaces list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/networkInterfaces")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerNetworkInterfaces listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<NetworkInterfaceInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @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<NetworkInterfaceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets associated load balancer network interfaces.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> 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<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesImpl.java
new file mode 100644
index 000000000000..ad7e816ba652
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerOutboundRules;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.OutboundRule;
+
+class LoadBalancerOutboundRulesImpl extends WrapperImpl<LoadBalancerOutboundRulesInner> implements LoadBalancerOutboundRules {
+    private final NetworkManager manager;
+
+    LoadBalancerOutboundRulesImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerOutboundRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private OutboundRuleImpl wrapModel(OutboundRuleInner inner) {
+        return  new OutboundRuleImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<OutboundRule> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerOutboundRulesInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<OutboundRuleInner>, Iterable<OutboundRuleInner>>() {
+            @Override
+            public Iterable<OutboundRuleInner> call(Page<OutboundRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OutboundRuleInner, OutboundRule>() {
+            @Override
+            public OutboundRule call(OutboundRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<OutboundRule> getAsync(String resourceGroupName, String loadBalancerName, String outboundRuleName) {
+        LoadBalancerOutboundRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, outboundRuleName)
+        .flatMap(new Func1<OutboundRuleInner, Observable<OutboundRule>>() {
+            @Override
+            public Observable<OutboundRule> call(OutboundRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((OutboundRule)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesInner.java
new file mode 100644
index 000000000000..58b24182d3cf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerOutboundRulesInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 LoadBalancerOutboundRules.
+ */
+public class LoadBalancerOutboundRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerOutboundRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerOutboundRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerOutboundRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerOutboundRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerOutboundRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerOutboundRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerOutboundRules list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/outboundRules")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerOutboundRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/outboundRules/{outboundRuleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("outboundRuleName") String outboundRuleName, @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.network.v2020_04_01.LoadBalancerOutboundRules listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;OutboundRuleInner&gt; object if successful.
+     */
+    public PagedList<OutboundRuleInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<OutboundRuleInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<OutboundRuleInner>(response.body()) {
+            @Override
+            public Page<OutboundRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<OutboundRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<OutboundRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OutboundRuleInner&gt; object
+     */
+    public Observable<Page<OutboundRuleInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<OutboundRuleInner>>, Page<OutboundRuleInner>>() {
+                @Override
+                public Page<OutboundRuleInner> call(ServiceResponse<Page<OutboundRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OutboundRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OutboundRuleInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<OutboundRuleInner>>, Observable<ServiceResponse<Page<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(ServiceResponse<Page<OutboundRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<OutboundRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<OutboundRuleInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OutboundRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OutboundRuleInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OutboundRuleInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OutboundRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OutboundRuleInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OutboundRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OutboundRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified load balancer outbound rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param outboundRuleName The name of the outbound rule.
+     * @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 OutboundRuleInner object if successful.
+     */
+    public OutboundRuleInner get(String resourceGroupName, String loadBalancerName, String outboundRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, outboundRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer outbound rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param outboundRuleName The name of the outbound 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<OutboundRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String outboundRuleName, final ServiceCallback<OutboundRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, outboundRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer outbound rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param outboundRuleName The name of the outbound rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OutboundRuleInner object
+     */
+    public Observable<OutboundRuleInner> getAsync(String resourceGroupName, String loadBalancerName, String outboundRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, outboundRuleName).map(new Func1<ServiceResponse<OutboundRuleInner>, OutboundRuleInner>() {
+            @Override
+            public OutboundRuleInner call(ServiceResponse<OutboundRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer outbound rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param outboundRuleName The name of the outbound rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OutboundRuleInner object
+     */
+    public Observable<ServiceResponse<OutboundRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String outboundRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (outboundRuleName == null) {
+            throw new IllegalArgumentException("Parameter outboundRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, outboundRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OutboundRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OutboundRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OutboundRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OutboundRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OutboundRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OutboundRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @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;OutboundRuleInner&gt; object if successful.
+     */
+    public PagedList<OutboundRuleInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<OutboundRuleInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OutboundRuleInner>(response.body()) {
+            @Override
+            public Page<OutboundRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @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<OutboundRuleInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OutboundRuleInner>> serviceFuture, final ListOperationCallback<OutboundRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @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;OutboundRuleInner&gt; object
+     */
+    public Observable<Page<OutboundRuleInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OutboundRuleInner>>, Page<OutboundRuleInner>>() {
+                @Override
+                public Page<OutboundRuleInner> call(ServiceResponse<Page<OutboundRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+     * @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;OutboundRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OutboundRuleInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OutboundRuleInner>>, Observable<ServiceResponse<Page<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(ServiceResponse<Page<OutboundRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the outbound rules in a load balancer.
+     *
+    ServiceResponse<PageImpl<OutboundRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OutboundRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OutboundRuleInner>>> 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<OutboundRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OutboundRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OutboundRuleInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OutboundRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OutboundRuleInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OutboundRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OutboundRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesImpl.java
new file mode 100644
index 000000000000..fa3b26a3e279
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerProbes;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.Probe;
+
+class LoadBalancerProbesImpl extends WrapperImpl<LoadBalancerProbesInner> implements LoadBalancerProbes {
+    private final NetworkManager manager;
+
+    LoadBalancerProbesImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancerProbes());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private ProbeImpl wrapModel(ProbeInner inner) {
+        return  new ProbeImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<Probe> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        LoadBalancerProbesInner client = this.inner();
+        return client.listAsync(resourceGroupName, loadBalancerName)
+        .flatMapIterable(new Func1<Page<ProbeInner>, Iterable<ProbeInner>>() {
+            @Override
+            public Iterable<ProbeInner> call(Page<ProbeInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ProbeInner, Probe>() {
+            @Override
+            public Probe call(ProbeInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<Probe> getAsync(String resourceGroupName, String loadBalancerName, String probeName) {
+        LoadBalancerProbesInner client = this.inner();
+        return client.getAsync(resourceGroupName, loadBalancerName, probeName)
+        .flatMap(new Func1<ProbeInner, Observable<Probe>>() {
+            @Override
+            public Observable<Probe> call(ProbeInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Probe)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesInner.java
new file mode 100644
index 000000000000..8106777ba592
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancerProbesInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 LoadBalancerProbes.
+ */
+public class LoadBalancerProbesInner {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancerProbesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancerProbesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancerProbesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancerProbesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancerProbes to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancerProbesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancerProbes list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancerProbes get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("probeName") String probeName, @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.network.v2020_04_01.LoadBalancerProbes listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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;ProbeInner&gt; object if successful.
+     */
+    public PagedList<ProbeInner> list(final String resourceGroupName, final String loadBalancerName) {
+        ServiceResponse<Page<ProbeInner>> response = listSinglePageAsync(resourceGroupName, loadBalancerName).toBlocking().single();
+        return new PagedList<ProbeInner>(response.body()) {
+            @Override
+            public Page<ProbeInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<ProbeInner>> listAsync(final String resourceGroupName, final String loadBalancerName, final ListOperationCallback<ProbeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, loadBalancerName),
+            new Func1<String, Observable<ServiceResponse<Page<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProbeInner&gt; object
+     */
+    public Observable<Page<ProbeInner>> listAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listWithServiceResponseAsync(resourceGroupName, loadBalancerName)
+            .map(new Func1<ServiceResponse<Page<ProbeInner>>, Page<ProbeInner>>() {
+                @Override
+                public Page<ProbeInner> call(ServiceResponse<Page<ProbeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProbeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ProbeInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String loadBalancerName) {
+        return listSinglePageAsync(resourceGroupName, loadBalancerName)
+            .concatMap(new Func1<ServiceResponse<Page<ProbeInner>>, Observable<ServiceResponse<Page<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(ServiceResponse<Page<ProbeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+    ServiceResponse<PageImpl<ProbeInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ProbeInner>> * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ProbeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ProbeInner>>> listSinglePageAsync(final String resourceGroupName, final String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ProbeInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ProbeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ProbeInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ProbeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ProbeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets load balancer probe.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param probeName The name of the probe.
+     * @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 ProbeInner object if successful.
+     */
+    public ProbeInner get(String resourceGroupName, String loadBalancerName, String probeName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, probeName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets load balancer probe.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param probeName The name of the probe.
+     * @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<ProbeInner> getAsync(String resourceGroupName, String loadBalancerName, String probeName, final ServiceCallback<ProbeInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, loadBalancerName, probeName), serviceCallback);
+    }
+
+    /**
+     * Gets load balancer probe.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param probeName The name of the probe.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProbeInner object
+     */
+    public Observable<ProbeInner> getAsync(String resourceGroupName, String loadBalancerName, String probeName) {
+        return getWithServiceResponseAsync(resourceGroupName, loadBalancerName, probeName).map(new Func1<ServiceResponse<ProbeInner>, ProbeInner>() {
+            @Override
+            public ProbeInner call(ServiceResponse<ProbeInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets load balancer probe.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param probeName The name of the probe.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProbeInner object
+     */
+    public Observable<ServiceResponse<ProbeInner>> getWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String probeName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (probeName == null) {
+            throw new IllegalArgumentException("Parameter probeName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, loadBalancerName, probeName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProbeInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProbeInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProbeInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ProbeInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ProbeInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ProbeInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @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;ProbeInner&gt; object if successful.
+     */
+    public PagedList<ProbeInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ProbeInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ProbeInner>(response.body()) {
+            @Override
+            public Page<ProbeInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @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<ProbeInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ProbeInner>> serviceFuture, final ListOperationCallback<ProbeInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @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;ProbeInner&gt; object
+     */
+    public Observable<Page<ProbeInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ProbeInner>>, Page<ProbeInner>>() {
+                @Override
+                public Page<ProbeInner> call(ServiceResponse<Page<ProbeInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+     * @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;ProbeInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ProbeInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ProbeInner>>, Observable<ServiceResponse<Page<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(ServiceResponse<Page<ProbeInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancer probes.
+     *
+    ServiceResponse<PageImpl<ProbeInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ProbeInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ProbeInner>>> 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<ProbeInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProbeInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ProbeInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ProbeInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ProbeInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ProbeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ProbeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersImpl.java
new file mode 100644
index 000000000000..79fe747c3cc3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancers;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancer;
+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;
+
+class LoadBalancersImpl extends GroupableResourcesCoreImpl<LoadBalancer, LoadBalancerImpl, LoadBalancerInner, LoadBalancersInner, NetworkManager>  implements LoadBalancers {
+    protected LoadBalancersImpl(NetworkManager manager) {
+        super(manager.inner().loadBalancers(), manager);
+    }
+
+    @Override
+    protected Observable<LoadBalancerInner> getInnerAsync(String resourceGroupName, String name) {
+        LoadBalancersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        LoadBalancersInner 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<LoadBalancer> listByResourceGroup(String resourceGroupName) {
+        LoadBalancersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<LoadBalancer> listByResourceGroupAsync(String resourceGroupName) {
+        LoadBalancersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<LoadBalancerInner>, Iterable<LoadBalancerInner>>() {
+            @Override
+            public Iterable<LoadBalancerInner> call(Page<LoadBalancerInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LoadBalancerInner, LoadBalancer>() {
+            @Override
+            public LoadBalancer call(LoadBalancerInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<LoadBalancer> list() {
+        LoadBalancersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<LoadBalancer> listAsync() {
+        LoadBalancersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<LoadBalancerInner>, Iterable<LoadBalancerInner>>() {
+            @Override
+            public Iterable<LoadBalancerInner> call(Page<LoadBalancerInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LoadBalancerInner, LoadBalancer>() {
+            @Override
+            public LoadBalancer call(LoadBalancerInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public LoadBalancerImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected LoadBalancerImpl wrapModel(LoadBalancerInner inner) {
+        return  new LoadBalancerImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected LoadBalancerImpl wrapModel(String name) {
+        return new LoadBalancerImpl(name, new LoadBalancerInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersInner.java
new file mode 100644
index 000000000000..d26e00c4cdba
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancersInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 LoadBalancers.
+ */
+public class LoadBalancersInner implements InnerSupportsGet<LoadBalancerInner>, InnerSupportsDelete<Void>, InnerSupportsListing<LoadBalancerInner> {
+    /** The Retrofit service to perform REST calls. */
+    private LoadBalancersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LoadBalancersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LoadBalancersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LoadBalancers to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LoadBalancersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancers delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancers beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @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.network.v2020_04_01.LoadBalancers getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.LoadBalancers createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("subscriptionId") String subscriptionId, @Body LoadBalancerInner 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.network.v2020_04_01.LoadBalancers beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("subscriptionId") String subscriptionId, @Body LoadBalancerInner 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.network.v2020_04_01.LoadBalancers updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("loadBalancerName") String loadBalancerName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LoadBalancers list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/loadBalancers")
+        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.network.v2020_04_01.LoadBalancers listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers")
+        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.network.v2020_04_01.LoadBalancers 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.network.v2020_04_01.LoadBalancers listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 loadBalancerName) {
+        deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 loadBalancerName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String loadBalancerName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, loadBalancerName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 loadBalancerName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 loadBalancerName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String loadBalancerName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, loadBalancerName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, loadBalancerName, this.client.subscriptionId(), 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 specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner getByResourceGroup(String resourceGroupName, String loadBalancerName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<LoadBalancerInner> getByResourceGroupAsync(String resourceGroupName, String loadBalancerName, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<LoadBalancerInner> getByResourceGroupAsync(String resourceGroupName, String loadBalancerName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancerInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancerInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancerInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param expand Expands referenced resources.
+     * @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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner getByResourceGroup(String resourceGroupName, String loadBalancerName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param expand Expands referenced resources.
+     * @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<LoadBalancerInner> getByResourceGroupAsync(String resourceGroupName, String loadBalancerName, String expand, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<LoadBalancerInner> getByResourceGroupAsync(String resourceGroupName, String loadBalancerName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, loadBalancerName, expand).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancerInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancerInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancerInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LoadBalancerInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LoadBalancerInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LoadBalancerInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer 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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner createOrUpdate(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @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<LoadBalancerInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<LoadBalancerInner> createOrUpdateAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, loadBalancerName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<LoadBalancerInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer 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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner beginCreateOrUpdate(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @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<LoadBalancerInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<LoadBalancerInner> beginCreateOrUpdateAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, loadBalancerName, parameters).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a load balancer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters Parameters supplied to the create or update load balancer operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, LoadBalancerInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, loadBalancerName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancerInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancerInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancerInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LoadBalancerInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LoadBalancerInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LoadBalancerInner>() { }.getType())
+                .register(201, new TypeToken<LoadBalancerInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner updateTags(String resourceGroupName, String loadBalancerName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @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<LoadBalancerInner> updateTagsAsync(String resourceGroupName, String loadBalancerName, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName), serviceCallback);
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<LoadBalancerInner> updateTagsAsync(String resourceGroupName, String loadBalancerName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String loadBalancerName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancerInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancerInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancerInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param tags Resource tags.
+     * @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 LoadBalancerInner object if successful.
+     */
+    public LoadBalancerInner updateTags(String resourceGroupName, String loadBalancerName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param tags Resource tags.
+     * @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<LoadBalancerInner> updateTagsAsync(String resourceGroupName, String loadBalancerName, Map<String, String> tags, final ServiceCallback<LoadBalancerInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<LoadBalancerInner> updateTagsAsync(String resourceGroupName, String loadBalancerName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, loadBalancerName, tags).map(new Func1<ServiceResponse<LoadBalancerInner>, LoadBalancerInner>() {
+            @Override
+            public LoadBalancerInner call(ServiceResponse<LoadBalancerInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a load balancer tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param loadBalancerName The name of the load balancer.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LoadBalancerInner object
+     */
+    public Observable<ServiceResponse<LoadBalancerInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String loadBalancerName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (loadBalancerName == null) {
+            throw new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, loadBalancerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LoadBalancerInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LoadBalancerInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LoadBalancerInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LoadBalancerInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LoadBalancerInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LoadBalancerInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancers in a 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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> list() {
+        ServiceResponse<Page<LoadBalancerInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancers in a 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<LoadBalancerInner>> listAsync(final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<LoadBalancerInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<LoadBalancerInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<LoadBalancerInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @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<LoadBalancerInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<LoadBalancerInner>> serviceFuture, final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @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;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+     * @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;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a subscription.
+     *
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> 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<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the load balancers in 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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<LoadBalancerInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the load balancers in 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<LoadBalancerInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<LoadBalancerInner>> serviceFuture, final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the load balancers in 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;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in 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;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the load balancers in a resource group.
+     *
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> 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<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleImpl.java
new file mode 100644
index 000000000000..907a0ef70eb2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleImpl.java
@@ -0,0 +1,127 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancingRule;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.LoadDistribution;
+import com.microsoft.azure.management.network.v2020_04_01.TransportProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class LoadBalancingRuleImpl extends IndexableRefreshableWrapperImpl<LoadBalancingRule, LoadBalancingRuleInner> implements LoadBalancingRule {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String loadBalancingRuleName;
+
+    LoadBalancingRuleImpl(LoadBalancingRuleInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.loadBalancingRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancingRules");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<LoadBalancingRuleInner> getInnerAsync() {
+        LoadBalancerLoadBalancingRulesInner client = this.manager().inner().loadBalancerLoadBalancingRules();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.loadBalancingRuleName);
+    }
+
+
+
+    @Override
+    public SubResource backendAddressPool() {
+        return this.inner().backendAddressPool();
+    }
+
+    @Override
+    public Integer backendPort() {
+        return this.inner().backendPort();
+    }
+
+    @Override
+    public Boolean disableOutboundSnat() {
+        return this.inner().disableOutboundSnat();
+    }
+
+    @Override
+    public Boolean enableFloatingIP() {
+        return this.inner().enableFloatingIP();
+    }
+
+    @Override
+    public Boolean enableTcpReset() {
+        return this.inner().enableTcpReset();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource frontendIPConfiguration() {
+        return this.inner().frontendIPConfiguration();
+    }
+
+    @Override
+    public int frontendPort() {
+        return this.inner().frontendPort();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Integer idleTimeoutInMinutes() {
+        return this.inner().idleTimeoutInMinutes();
+    }
+
+    @Override
+    public LoadDistribution loadDistribution() {
+        return this.inner().loadDistribution();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource probe() {
+        return this.inner().probe();
+    }
+
+    @Override
+    public TransportProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleInner.java
new file mode 100644
index 000000000000..38308367ca4b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LoadBalancingRuleInner.java
@@ -0,0 +1,398 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.TransportProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.LoadDistribution;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * A load balancing rule for a load balancer.
+ */
+@JsonFlatten
+public class LoadBalancingRuleInner extends SubResource {
+    /**
+     * A reference to frontend IP addresses.
+     */
+    @JsonProperty(value = "properties.frontendIPConfiguration")
+    private SubResource frontendIPConfiguration;
+
+    /**
+     * A reference to a pool of DIPs. Inbound traffic is randomly load balanced
+     * across IPs in the backend IPs.
+     */
+    @JsonProperty(value = "properties.backendAddressPool")
+    private SubResource backendAddressPool;
+
+    /**
+     * The reference to the load balancer probe used by the load balancing
+     * rule.
+     */
+    @JsonProperty(value = "properties.probe")
+    private SubResource probe;
+
+    /**
+     * The reference to the transport protocol used by the load balancing rule.
+     * Possible values include: 'Udp', 'Tcp', 'All'.
+     */
+    @JsonProperty(value = "properties.protocol", required = true)
+    private TransportProtocol protocol;
+
+    /**
+     * The load distribution policy for this rule. Possible values include:
+     * 'Default', 'SourceIP', 'SourceIPProtocol'.
+     */
+    @JsonProperty(value = "properties.loadDistribution")
+    private LoadDistribution loadDistribution;
+
+    /**
+     * The port for the external endpoint. Port numbers for each rule must be
+     * unique within the Load Balancer. Acceptable values are between 0 and
+     * 65534. Note that value 0 enables "Any Port".
+     */
+    @JsonProperty(value = "properties.frontendPort", required = true)
+    private int frontendPort;
+
+    /**
+     * The port used for internal connections on the endpoint. Acceptable
+     * values are between 0 and 65535. Note that value 0 enables "Any Port".
+     */
+    @JsonProperty(value = "properties.backendPort")
+    private Integer backendPort;
+
+    /**
+     * The timeout for the TCP idle connection. The value can be set between 4
+     * and 30 minutes. The default value is 4 minutes. This element is only
+     * used when the protocol is set to TCP.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * Configures a virtual machine's endpoint for the floating IP capability
+     * required to configure a SQL AlwaysOn Availability Group. This setting is
+     * required when using the SQL AlwaysOn Availability Groups in SQL server.
+     * This setting can't be changed after you create the endpoint.
+     */
+    @JsonProperty(value = "properties.enableFloatingIP")
+    private Boolean enableFloatingIP;
+
+    /**
+     * Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected
+     * connection termination. This element is only used when the protocol is
+     * set to TCP.
+     */
+    @JsonProperty(value = "properties.enableTcpReset")
+    private Boolean enableTcpReset;
+
+    /**
+     * Configures SNAT for the VMs in the backend pool to use the publicIP
+     * address specified in the frontend of the load balancing rule.
+     */
+    @JsonProperty(value = "properties.disableOutboundSnat")
+    private Boolean disableOutboundSnat;
+
+    /**
+     * The provisioning state of the load balancing rule resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of load balancing
+     * rules used by the load balancer. This name can be used to access the
+     * resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get a reference to frontend IP addresses.
+     *
+     * @return the frontendIPConfiguration value
+     */
+    public SubResource frontendIPConfiguration() {
+        return this.frontendIPConfiguration;
+    }
+
+    /**
+     * Set a reference to frontend IP addresses.
+     *
+     * @param frontendIPConfiguration the frontendIPConfiguration value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) {
+        this.frontendIPConfiguration = frontendIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get a reference to a pool of DIPs. Inbound traffic is randomly load balanced across IPs in the backend IPs.
+     *
+     * @return the backendAddressPool value
+     */
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set a reference to a pool of DIPs. Inbound traffic is randomly load balanced across IPs in the backend IPs.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get the reference to the load balancer probe used by the load balancing rule.
+     *
+     * @return the probe value
+     */
+    public SubResource probe() {
+        return this.probe;
+    }
+
+    /**
+     * Set the reference to the load balancer probe used by the load balancing rule.
+     *
+     * @param probe the probe value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withProbe(SubResource probe) {
+        this.probe = probe;
+        return this;
+    }
+
+    /**
+     * Get the reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @return the protocol value
+     */
+    public TransportProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the reference to the transport protocol used by the load balancing rule. Possible values include: 'Udp', 'Tcp', 'All'.
+     *
+     * @param protocol the protocol value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withProtocol(TransportProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the load distribution policy for this rule. Possible values include: 'Default', 'SourceIP', 'SourceIPProtocol'.
+     *
+     * @return the loadDistribution value
+     */
+    public LoadDistribution loadDistribution() {
+        return this.loadDistribution;
+    }
+
+    /**
+     * Set the load distribution policy for this rule. Possible values include: 'Default', 'SourceIP', 'SourceIPProtocol'.
+     *
+     * @param loadDistribution the loadDistribution value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withLoadDistribution(LoadDistribution loadDistribution) {
+        this.loadDistribution = loadDistribution;
+        return this;
+    }
+
+    /**
+     * Get the port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values are between 0 and 65534. Note that value 0 enables "Any Port".
+     *
+     * @return the frontendPort value
+     */
+    public int frontendPort() {
+        return this.frontendPort;
+    }
+
+    /**
+     * Set the port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values are between 0 and 65534. Note that value 0 enables "Any Port".
+     *
+     * @param frontendPort the frontendPort value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withFrontendPort(int frontendPort) {
+        this.frontendPort = frontendPort;
+        return this;
+    }
+
+    /**
+     * Get the port used for internal connections on the endpoint. Acceptable values are between 0 and 65535. Note that value 0 enables "Any Port".
+     *
+     * @return the backendPort value
+     */
+    public Integer backendPort() {
+        return this.backendPort;
+    }
+
+    /**
+     * Set the port used for internal connections on the endpoint. Acceptable values are between 0 and 65535. Note that value 0 enables "Any Port".
+     *
+     * @param backendPort the backendPort value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withBackendPort(Integer backendPort) {
+        this.backendPort = backendPort;
+        return this;
+    }
+
+    /**
+     * Get the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @return the enableFloatingIP value
+     */
+    public Boolean enableFloatingIP() {
+        return this.enableFloatingIP;
+    }
+
+    /**
+     * Set configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint.
+     *
+     * @param enableFloatingIP the enableFloatingIP value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withEnableFloatingIP(Boolean enableFloatingIP) {
+        this.enableFloatingIP = enableFloatingIP;
+        return this;
+    }
+
+    /**
+     * Get receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @return the enableTcpReset value
+     */
+    public Boolean enableTcpReset() {
+        return this.enableTcpReset;
+    }
+
+    /**
+     * Set receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @param enableTcpReset the enableTcpReset value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withEnableTcpReset(Boolean enableTcpReset) {
+        this.enableTcpReset = enableTcpReset;
+        return this;
+    }
+
+    /**
+     * Get configures SNAT for the VMs in the backend pool to use the publicIP address specified in the frontend of the load balancing rule.
+     *
+     * @return the disableOutboundSnat value
+     */
+    public Boolean disableOutboundSnat() {
+        return this.disableOutboundSnat;
+    }
+
+    /**
+     * Set configures SNAT for the VMs in the backend pool to use the publicIP address specified in the frontend of the load balancing rule.
+     *
+     * @param disableOutboundSnat the disableOutboundSnat value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withDisableOutboundSnat(Boolean disableOutboundSnat) {
+        this.disableOutboundSnat = disableOutboundSnat;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the load balancing rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of load balancing rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of load balancing rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the LoadBalancingRuleInner object itself.
+     */
+    public LoadBalancingRuleInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayImpl.java
new file mode 100644
index 000000000000..1be1dd3954b8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateway;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class LocalNetworkGatewayImpl extends GroupableResourceCoreImpl<LocalNetworkGateway, LocalNetworkGatewayInner, LocalNetworkGatewayImpl, NetworkManager> implements LocalNetworkGateway, LocalNetworkGateway.Definition, LocalNetworkGateway.Update {
+    LocalNetworkGatewayImpl(String name, LocalNetworkGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<LocalNetworkGateway> createResourceAsync() {
+        LocalNetworkGatewaysInner client = this.manager().inner().localNetworkGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<LocalNetworkGateway> updateResourceAsync() {
+        LocalNetworkGatewaysInner client = this.manager().inner().localNetworkGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<LocalNetworkGatewayInner> getInnerAsync() {
+        LocalNetworkGatewaysInner client = this.manager().inner().localNetworkGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public BgpSettings bgpSettings() {
+        return this.inner().bgpSettings();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String fqdn() {
+        return this.inner().fqdn();
+    }
+
+    @Override
+    public String gatewayIpAddress() {
+        return this.inner().gatewayIpAddress();
+    }
+
+    @Override
+    public AddressSpace localNetworkAddressSpace() {
+        return this.inner().localNetworkAddressSpace();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public LocalNetworkGatewayImpl withBgpSettings(BgpSettings bgpSettings) {
+        this.inner().withBgpSettings(bgpSettings);
+        return this;
+    }
+
+    @Override
+    public LocalNetworkGatewayImpl withFqdn(String fqdn) {
+        this.inner().withFqdn(fqdn);
+        return this;
+    }
+
+    @Override
+    public LocalNetworkGatewayImpl withGatewayIpAddress(String gatewayIpAddress) {
+        this.inner().withGatewayIpAddress(gatewayIpAddress);
+        return this;
+    }
+
+    @Override
+    public LocalNetworkGatewayImpl withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace) {
+        this.inner().withLocalNetworkAddressSpace(localNetworkAddressSpace);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayInner.java
new file mode 100644
index 000000000000..b73d1c3e1f74
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewayInner.java
@@ -0,0 +1,201 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A common class for general resource information.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class LocalNetworkGatewayInner extends Resource {
+    /**
+     * Local network site address space.
+     */
+    @JsonProperty(value = "properties.localNetworkAddressSpace")
+    private AddressSpace localNetworkAddressSpace;
+
+    /**
+     * IP address of local network gateway.
+     */
+    @JsonProperty(value = "properties.gatewayIpAddress")
+    private String gatewayIpAddress;
+
+    /**
+     * FQDN of local network gateway.
+     */
+    @JsonProperty(value = "properties.fqdn")
+    private String fqdn;
+
+    /**
+     * Local network gateway's BGP speaker settings.
+     */
+    @JsonProperty(value = "properties.bgpSettings")
+    private BgpSettings bgpSettings;
+
+    /**
+     * The resource GUID property of the local network gateway resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the local network gateway resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get local network site address space.
+     *
+     * @return the localNetworkAddressSpace value
+     */
+    public AddressSpace localNetworkAddressSpace() {
+        return this.localNetworkAddressSpace;
+    }
+
+    /**
+     * Set local network site address space.
+     *
+     * @param localNetworkAddressSpace the localNetworkAddressSpace value to set
+     * @return the LocalNetworkGatewayInner object itself.
+     */
+    public LocalNetworkGatewayInner withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace) {
+        this.localNetworkAddressSpace = localNetworkAddressSpace;
+        return this;
+    }
+
+    /**
+     * Get iP address of local network gateway.
+     *
+     * @return the gatewayIpAddress value
+     */
+    public String gatewayIpAddress() {
+        return this.gatewayIpAddress;
+    }
+
+    /**
+     * Set iP address of local network gateway.
+     *
+     * @param gatewayIpAddress the gatewayIpAddress value to set
+     * @return the LocalNetworkGatewayInner object itself.
+     */
+    public LocalNetworkGatewayInner withGatewayIpAddress(String gatewayIpAddress) {
+        this.gatewayIpAddress = gatewayIpAddress;
+        return this;
+    }
+
+    /**
+     * Get fQDN of local network gateway.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set fQDN of local network gateway.
+     *
+     * @param fqdn the fqdn value to set
+     * @return the LocalNetworkGatewayInner object itself.
+     */
+    public LocalNetworkGatewayInner withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get local network gateway's BGP speaker settings.
+     *
+     * @return the bgpSettings value
+     */
+    public BgpSettings bgpSettings() {
+        return this.bgpSettings;
+    }
+
+    /**
+     * Set local network gateway's BGP speaker settings.
+     *
+     * @param bgpSettings the bgpSettings value to set
+     * @return the LocalNetworkGatewayInner object itself.
+     */
+    public LocalNetworkGatewayInner withBgpSettings(BgpSettings bgpSettings) {
+        this.bgpSettings = bgpSettings;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the local network gateway resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the local network gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the LocalNetworkGatewayInner object itself.
+     */
+    public LocalNetworkGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysImpl.java
new file mode 100644
index 000000000000..9bd6255e76ee
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysImpl.java
@@ -0,0 +1,114 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateways;
+import com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateway;
+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;
+
+class LocalNetworkGatewaysImpl extends GroupableResourcesCoreImpl<LocalNetworkGateway, LocalNetworkGatewayImpl, LocalNetworkGatewayInner, LocalNetworkGatewaysInner, NetworkManager>  implements LocalNetworkGateways {
+    protected LocalNetworkGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().localNetworkGateways(), manager);
+    }
+
+    @Override
+    protected Observable<LocalNetworkGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        LocalNetworkGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        LocalNetworkGatewaysInner 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<LocalNetworkGateway> listByResourceGroup(String resourceGroupName) {
+        LocalNetworkGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<LocalNetworkGateway> listByResourceGroupAsync(String resourceGroupName) {
+        LocalNetworkGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<LocalNetworkGatewayInner>, Iterable<LocalNetworkGatewayInner>>() {
+            @Override
+            public Iterable<LocalNetworkGatewayInner> call(Page<LocalNetworkGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LocalNetworkGatewayInner, LocalNetworkGateway>() {
+            @Override
+            public LocalNetworkGateway call(LocalNetworkGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public LocalNetworkGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected LocalNetworkGatewayImpl wrapModel(LocalNetworkGatewayInner inner) {
+        return  new LocalNetworkGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected LocalNetworkGatewayImpl wrapModel(String name) {
+        return new LocalNetworkGatewayImpl(name, new LocalNetworkGatewayInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysInner.java
new file mode 100644
index 000000000000..9547f61b653e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocalNetworkGatewaysInner.java
@@ -0,0 +1,901 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+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.network.v2020_04_01.TagsObject;
+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 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.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 LocalNetworkGateways.
+ */
+public class LocalNetworkGatewaysInner implements InnerSupportsGet<LocalNetworkGatewayInner>, InnerSupportsDelete<Void> {
+    /** The Retrofit service to perform REST calls. */
+    private LocalNetworkGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LocalNetworkGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public LocalNetworkGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(LocalNetworkGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for LocalNetworkGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface LocalNetworkGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body LocalNetworkGatewayInner 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.network.v2020_04_01.LocalNetworkGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body LocalNetworkGatewayInner 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.network.v2020_04_01.LocalNetworkGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @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.network.v2020_04_01.LocalNetworkGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @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.network.v2020_04_01.LocalNetworkGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @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.network.v2020_04_01.LocalNetworkGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("localNetworkGatewayName") String localNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways")
+        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.network.v2020_04_01.LocalNetworkGateways listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway 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 LocalNetworkGatewayInner object if successful.
+     */
+    public LocalNetworkGatewayInner createOrUpdate(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @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<LocalNetworkGatewayInner> createOrUpdateAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters, final ServiceCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<LocalNetworkGatewayInner> createOrUpdateAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters).map(new Func1<ServiceResponse<LocalNetworkGatewayInner>, LocalNetworkGatewayInner>() {
+            @Override
+            public LocalNetworkGatewayInner call(ServiceResponse<LocalNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<LocalNetworkGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<LocalNetworkGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway 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 LocalNetworkGatewayInner object if successful.
+     */
+    public LocalNetworkGatewayInner beginCreateOrUpdate(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @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<LocalNetworkGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters, final ServiceCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<LocalNetworkGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, parameters).map(new Func1<ServiceResponse<LocalNetworkGatewayInner>, LocalNetworkGatewayInner>() {
+            @Override
+            public LocalNetworkGatewayInner call(ServiceResponse<LocalNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a local network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param parameters Parameters supplied to the create or update local network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<LocalNetworkGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName, LocalNetworkGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LocalNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LocalNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LocalNetworkGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LocalNetworkGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LocalNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LocalNetworkGatewayInner>() { }.getType())
+                .register(201, new TypeToken<LocalNetworkGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified local network gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 LocalNetworkGatewayInner object if successful.
+     */
+    public LocalNetworkGatewayInner getByResourceGroup(String resourceGroupName, String localNetworkGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified local network gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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<LocalNetworkGatewayInner> getByResourceGroupAsync(String resourceGroupName, String localNetworkGatewayName, final ServiceCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified local network gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<LocalNetworkGatewayInner> getByResourceGroupAsync(String resourceGroupName, String localNetworkGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).map(new Func1<ServiceResponse<LocalNetworkGatewayInner>, LocalNetworkGatewayInner>() {
+            @Override
+            public LocalNetworkGatewayInner call(ServiceResponse<LocalNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified local network gateway in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<LocalNetworkGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LocalNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LocalNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LocalNetworkGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LocalNetworkGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LocalNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LocalNetworkGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 localNetworkGatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 localNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String localNetworkGatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 localNetworkGatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 localNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String localNetworkGatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified local network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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 LocalNetworkGatewayInner object if successful.
+     */
+    public LocalNetworkGatewayInner updateTags(String resourceGroupName, String localNetworkGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @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<LocalNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String localNetworkGatewayName, final ServiceCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<LocalNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String localNetworkGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName).map(new Func1<ServiceResponse<LocalNetworkGatewayInner>, LocalNetworkGatewayInner>() {
+            @Override
+            public LocalNetworkGatewayInner call(ServiceResponse<LocalNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<LocalNetworkGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LocalNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LocalNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LocalNetworkGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param tags Resource tags.
+     * @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 LocalNetworkGatewayInner object if successful.
+     */
+    public LocalNetworkGatewayInner updateTags(String resourceGroupName, String localNetworkGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param tags Resource tags.
+     * @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<LocalNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String localNetworkGatewayName, Map<String, String> tags, final ServiceCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<LocalNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String localNetworkGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, localNetworkGatewayName, tags).map(new Func1<ServiceResponse<LocalNetworkGatewayInner>, LocalNetworkGatewayInner>() {
+            @Override
+            public LocalNetworkGatewayInner call(ServiceResponse<LocalNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a local network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param localNetworkGatewayName The name of the local network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the LocalNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<LocalNetworkGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String localNetworkGatewayName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (localNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter localNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, localNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<LocalNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<LocalNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<LocalNetworkGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<LocalNetworkGatewayInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<LocalNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<LocalNetworkGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;LocalNetworkGatewayInner&gt; object if successful.
+     */
+    public PagedList<LocalNetworkGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<LocalNetworkGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<LocalNetworkGatewayInner>(response.body()) {
+            @Override
+            public Page<LocalNetworkGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<LocalNetworkGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LocalNetworkGatewayInner&gt; object
+     */
+    public Observable<Page<LocalNetworkGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<LocalNetworkGatewayInner>>, Page<LocalNetworkGatewayInner>>() {
+                @Override
+                public Page<LocalNetworkGatewayInner> call(ServiceResponse<Page<LocalNetworkGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LocalNetworkGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<LocalNetworkGatewayInner>>, Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(ServiceResponse<Page<LocalNetworkGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<LocalNetworkGatewayInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LocalNetworkGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LocalNetworkGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LocalNetworkGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LocalNetworkGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LocalNetworkGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LocalNetworkGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the local network gateways in 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;LocalNetworkGatewayInner&gt; object if successful.
+     */
+    public PagedList<LocalNetworkGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<LocalNetworkGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LocalNetworkGatewayInner>(response.body()) {
+            @Override
+            public Page<LocalNetworkGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the local network gateways in 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<LocalNetworkGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<LocalNetworkGatewayInner>> serviceFuture, final ListOperationCallback<LocalNetworkGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the local network gateways in 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;LocalNetworkGatewayInner&gt; object
+     */
+    public Observable<Page<LocalNetworkGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LocalNetworkGatewayInner>>, Page<LocalNetworkGatewayInner>>() {
+                @Override
+                public Page<LocalNetworkGatewayInner> call(ServiceResponse<Page<LocalNetworkGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the local network gateways in 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;LocalNetworkGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LocalNetworkGatewayInner>>, Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(ServiceResponse<Page<LocalNetworkGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the local network gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<LocalNetworkGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LocalNetworkGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> 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<LocalNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LocalNetworkGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LocalNetworkGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LocalNetworkGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LocalNetworkGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LocalNetworkGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LocalNetworkGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationImpl.java
new file mode 100644
index 000000000000..194d2a291a93
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.LocationAvailableDelegation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import java.util.List;
+
+class LocationAvailableDelegationImpl extends WrapperImpl<AvailableDelegationInner> implements LocationAvailableDelegation {
+    private final NetworkManager manager;
+
+    LocationAvailableDelegationImpl(AvailableDelegationInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public List<String> actions() {
+        return this.inner().actions();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String serviceName() {
+        return this.inner().serviceName();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationModelImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationModelImpl.java
new file mode 100644
index 000000000000..9bf8fc6f4f98
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/LocationAvailableDelegationModelImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.LocationAvailableDelegationModel;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import java.util.List;
+
+class LocationAvailableDelegationModelImpl extends WrapperImpl<AvailableDelegationInner> implements LocationAvailableDelegationModel {
+    private final NetworkManager manager;
+
+    LocationAvailableDelegationModelImpl(AvailableDelegationInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public List<String> actions() {
+        return this.inner().actions();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String serviceName() {
+        return this.inner().serviceName();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayImpl.java
new file mode 100644
index 000000000000..43a5d41592f4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayImpl.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NatGateway;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.NatGatewaySku;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class NatGatewayImpl extends GroupableResourceCoreImpl<NatGateway, NatGatewayInner, NatGatewayImpl, NetworkManager> implements NatGateway, NatGateway.Definition, NatGateway.Update {
+    NatGatewayImpl(String name, NatGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NatGateway> createResourceAsync() {
+        NatGatewaysInner client = this.manager().inner().natGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NatGateway> updateResourceAsync() {
+        NatGatewaysInner client = this.manager().inner().natGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NatGatewayInner> getInnerAsync() {
+        NatGatewaysInner client = this.manager().inner().natGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public Integer idleTimeoutInMinutes() {
+        return this.inner().idleTimeoutInMinutes();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<SubResource> publicIpAddresses() {
+        return this.inner().publicIpAddresses();
+    }
+
+    @Override
+    public List<SubResource> publicIpPrefixes() {
+        return this.inner().publicIpPrefixes();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public NatGatewaySku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public List<SubResource> subnets() {
+        return this.inner().subnets();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+    @Override
+    public NatGatewayImpl withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.inner().withIdleTimeoutInMinutes(idleTimeoutInMinutes);
+        return this;
+    }
+
+    @Override
+    public NatGatewayImpl withPublicIpAddresses(List<SubResource> publicIpAddresses) {
+        this.inner().withPublicIpAddresses(publicIpAddresses);
+        return this;
+    }
+
+    @Override
+    public NatGatewayImpl withPublicIpPrefixes(List<SubResource> publicIpPrefixes) {
+        this.inner().withPublicIpPrefixes(publicIpPrefixes);
+        return this;
+    }
+
+    @Override
+    public NatGatewayImpl withSku(NatGatewaySku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public NatGatewayImpl withZones(List<String> zones) {
+        this.inner().withZones(zones);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayInner.java
new file mode 100644
index 000000000000..a2a7c5b35757
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewayInner.java
@@ -0,0 +1,245 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NatGatewaySku;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Nat Gateway resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NatGatewayInner extends Resource {
+    /**
+     * The nat gateway SKU.
+     */
+    @JsonProperty(value = "sku")
+    private NatGatewaySku sku;
+
+    /**
+     * The idle timeout of the nat gateway.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * An array of public ip addresses associated with the nat gateway
+     * resource.
+     */
+    @JsonProperty(value = "properties.publicIpAddresses")
+    private List<SubResource> publicIpAddresses;
+
+    /**
+     * An array of public ip prefixes associated with the nat gateway resource.
+     */
+    @JsonProperty(value = "properties.publicIpPrefixes")
+    private List<SubResource> publicIpPrefixes;
+
+    /**
+     * An array of references to the subnets using this nat gateway resource.
+     */
+    @JsonProperty(value = "properties.subnets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> subnets;
+
+    /**
+     * The resource GUID property of the NAT gateway resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the NAT gateway resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A list of availability zones denoting the zone in which Nat Gateway
+     * should be deployed.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the nat gateway SKU.
+     *
+     * @return the sku value
+     */
+    public NatGatewaySku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the nat gateway SKU.
+     *
+     * @param sku the sku value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withSku(NatGatewaySku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the idle timeout of the nat gateway.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the idle timeout of the nat gateway.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get an array of public ip addresses associated with the nat gateway resource.
+     *
+     * @return the publicIpAddresses value
+     */
+    public List<SubResource> publicIpAddresses() {
+        return this.publicIpAddresses;
+    }
+
+    /**
+     * Set an array of public ip addresses associated with the nat gateway resource.
+     *
+     * @param publicIpAddresses the publicIpAddresses value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withPublicIpAddresses(List<SubResource> publicIpAddresses) {
+        this.publicIpAddresses = publicIpAddresses;
+        return this;
+    }
+
+    /**
+     * Get an array of public ip prefixes associated with the nat gateway resource.
+     *
+     * @return the publicIpPrefixes value
+     */
+    public List<SubResource> publicIpPrefixes() {
+        return this.publicIpPrefixes;
+    }
+
+    /**
+     * Set an array of public ip prefixes associated with the nat gateway resource.
+     *
+     * @param publicIpPrefixes the publicIpPrefixes value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withPublicIpPrefixes(List<SubResource> publicIpPrefixes) {
+        this.publicIpPrefixes = publicIpPrefixes;
+        return this;
+    }
+
+    /**
+     * Get an array of references to the subnets using this nat gateway resource.
+     *
+     * @return the subnets value
+     */
+    public List<SubResource> subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * Get the resource GUID property of the NAT gateway resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the NAT gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a list of availability zones denoting the zone in which Nat Gateway should be deployed.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting the zone in which Nat Gateway should be deployed.
+     *
+     * @param zones the zones value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NatGatewayInner object itself.
+     */
+    public NatGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysImpl.java
new file mode 100644
index 000000000000..d891c8199899
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NatGateways;
+import com.microsoft.azure.management.network.v2020_04_01.NatGateway;
+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;
+
+class NatGatewaysImpl extends GroupableResourcesCoreImpl<NatGateway, NatGatewayImpl, NatGatewayInner, NatGatewaysInner, NetworkManager>  implements NatGateways {
+    protected NatGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().natGateways(), manager);
+    }
+
+    @Override
+    protected Observable<NatGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        NatGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NatGatewaysInner 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<NatGateway> listByResourceGroup(String resourceGroupName) {
+        NatGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NatGateway> listByResourceGroupAsync(String resourceGroupName) {
+        NatGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NatGatewayInner>, Iterable<NatGatewayInner>>() {
+            @Override
+            public Iterable<NatGatewayInner> call(Page<NatGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NatGatewayInner, NatGateway>() {
+            @Override
+            public NatGateway call(NatGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NatGateway> list() {
+        NatGatewaysInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NatGateway> listAsync() {
+        NatGatewaysInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NatGatewayInner>, Iterable<NatGatewayInner>>() {
+            @Override
+            public Iterable<NatGatewayInner> call(Page<NatGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NatGatewayInner, NatGateway>() {
+            @Override
+            public NatGateway call(NatGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NatGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected NatGatewayImpl wrapModel(NatGatewayInner inner) {
+        return  new NatGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NatGatewayImpl wrapModel(String name) {
+        return new NatGatewayImpl(name, new NatGatewayInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysInner.java
new file mode 100644
index 000000000000..c460f496c047
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NatGatewaysInner.java
@@ -0,0 +1,1209 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 NatGateways.
+ */
+public class NatGatewaysInner implements InnerSupportsGet<NatGatewayInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NatGatewayInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NatGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NatGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NatGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NatGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NatGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NatGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NatGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @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.network.v2020_04_01.NatGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @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.network.v2020_04_01.NatGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NatGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @Path("subscriptionId") String subscriptionId, @Body NatGatewayInner 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.network.v2020_04_01.NatGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @Path("subscriptionId") String subscriptionId, @Body NatGatewayInner 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.network.v2020_04_01.NatGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("natGatewayName") String natGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NatGateways list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/natGateways")
+        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.network.v2020_04_01.NatGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways")
+        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.network.v2020_04_01.NatGateways 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.network.v2020_04_01.NatGateways listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 natGatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, natGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 natGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, natGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String natGatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, natGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String natGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, natGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 natGatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, natGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 natGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, natGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String natGatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, natGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String natGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, natGatewayName, this.client.subscriptionId(), 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 specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner getByResourceGroup(String resourceGroupName, String natGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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<NatGatewayInner> getByResourceGroupAsync(String resourceGroupName, String natGatewayName, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<NatGatewayInner> getByResourceGroupAsync(String resourceGroupName, String natGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String natGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, natGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NatGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NatGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NatGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param expand Expands referenced resources.
+     * @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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner getByResourceGroup(String resourceGroupName, String natGatewayName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param expand Expands referenced resources.
+     * @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<NatGatewayInner> getByResourceGroupAsync(String resourceGroupName, String natGatewayName, String expand, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<NatGatewayInner> getByResourceGroupAsync(String resourceGroupName, String natGatewayName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, natGatewayName, expand).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified nat gateway in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String natGatewayName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, natGatewayName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NatGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NatGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NatGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NatGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NatGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NatGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway 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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner createOrUpdate(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @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<NatGatewayInner> createOrUpdateAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NatGatewayInner> createOrUpdateAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, natGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NatGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway 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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner beginCreateOrUpdate(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @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<NatGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<NatGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, natGatewayName, parameters).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a nat gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param parameters Parameters supplied to the create or update nat gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String natGatewayName, NatGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, natGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NatGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NatGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NatGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NatGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NatGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NatGatewayInner>() { }.getType())
+                .register(201, new TypeToken<NatGatewayInner>() { }.getType())
+                .register(202, new TypeToken<NatGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner updateTags(String resourceGroupName, String natGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @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<NatGatewayInner> updateTagsAsync(String resourceGroupName, String natGatewayName, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<NatGatewayInner> updateTagsAsync(String resourceGroupName, String natGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String natGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, natGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NatGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NatGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NatGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param tags Resource tags.
+     * @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 NatGatewayInner object if successful.
+     */
+    public NatGatewayInner updateTags(String resourceGroupName, String natGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param tags Resource tags.
+     * @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<NatGatewayInner> updateTagsAsync(String resourceGroupName, String natGatewayName, Map<String, String> tags, final ServiceCallback<NatGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<NatGatewayInner> updateTagsAsync(String resourceGroupName, String natGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, natGatewayName, tags).map(new Func1<ServiceResponse<NatGatewayInner>, NatGatewayInner>() {
+            @Override
+            public NatGatewayInner call(ServiceResponse<NatGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates nat gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param natGatewayName The name of the nat gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NatGatewayInner object
+     */
+    public Observable<ServiceResponse<NatGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String natGatewayName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (natGatewayName == null) {
+            throw new IllegalArgumentException("Parameter natGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, natGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NatGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NatGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NatGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NatGatewayInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NatGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NatGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Nat Gateways in a 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;NatGatewayInner&gt; object if successful.
+     */
+    public PagedList<NatGatewayInner> list() {
+        ServiceResponse<Page<NatGatewayInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NatGatewayInner>(response.body()) {
+            @Override
+            public Page<NatGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Nat Gateways in a 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<NatGatewayInner>> listAsync(final ListOperationCallback<NatGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NatGatewayInner&gt; object
+     */
+    public Observable<Page<NatGatewayInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NatGatewayInner>>, Page<NatGatewayInner>>() {
+                @Override
+                public Page<NatGatewayInner> call(ServiceResponse<Page<NatGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NatGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NatGatewayInner>>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(ServiceResponse<Page<NatGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NatGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NatGatewayInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NatGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NatGatewayInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NatGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NatGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;NatGatewayInner&gt; object if successful.
+     */
+    public PagedList<NatGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NatGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NatGatewayInner>(response.body()) {
+            @Override
+            public Page<NatGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<NatGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NatGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NatGatewayInner&gt; object
+     */
+    public Observable<Page<NatGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NatGatewayInner>>, Page<NatGatewayInner>>() {
+                @Override
+                public Page<NatGatewayInner> call(ServiceResponse<Page<NatGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NatGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NatGatewayInner>>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(ServiceResponse<Page<NatGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<NatGatewayInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NatGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NatGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NatGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NatGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NatGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NatGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @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;NatGatewayInner&gt; object if successful.
+     */
+    public PagedList<NatGatewayInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NatGatewayInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NatGatewayInner>(response.body()) {
+            @Override
+            public Page<NatGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @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<NatGatewayInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NatGatewayInner>> serviceFuture, final ListOperationCallback<NatGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @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;NatGatewayInner&gt; object
+     */
+    public Observable<Page<NatGatewayInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NatGatewayInner>>, Page<NatGatewayInner>>() {
+                @Override
+                public Page<NatGatewayInner> call(ServiceResponse<Page<NatGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+     * @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;NatGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NatGatewayInner>>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(ServiceResponse<Page<NatGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Nat Gateways in a subscription.
+     *
+    ServiceResponse<PageImpl<NatGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NatGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> 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<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NatGatewayInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NatGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NatGatewayInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NatGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NatGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all nat gateways in 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;NatGatewayInner&gt; object if successful.
+     */
+    public PagedList<NatGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NatGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NatGatewayInner>(response.body()) {
+            @Override
+            public Page<NatGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all nat gateways in 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<NatGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NatGatewayInner>> serviceFuture, final ListOperationCallback<NatGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all nat gateways in 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;NatGatewayInner&gt; object
+     */
+    public Observable<Page<NatGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NatGatewayInner>>, Page<NatGatewayInner>>() {
+                @Override
+                public Page<NatGatewayInner> call(ServiceResponse<Page<NatGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all nat gateways in 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;NatGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NatGatewayInner>>, Observable<ServiceResponse<Page<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(ServiceResponse<Page<NatGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all nat gateways in a resource group.
+     *
+    ServiceResponse<PageImpl<NatGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NatGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NatGatewayInner>>> 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<NatGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NatGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NatGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NatGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NatGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NatGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NatGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java
new file mode 100644
index 000000000000..878df04ea16e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticResponse;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticResult;
+
+class NetworkConfigurationDiagnosticResponseImpl extends WrapperImpl<NetworkConfigurationDiagnosticResponseInner> implements NetworkConfigurationDiagnosticResponse {
+    private final NetworkManager manager;
+    NetworkConfigurationDiagnosticResponseImpl(NetworkConfigurationDiagnosticResponseInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<NetworkConfigurationDiagnosticResult> results() {
+        return this.inner().results();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseInner.java
new file mode 100644
index 000000000000..e4dd608e654d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkConfigurationDiagnosticResponseInner.java
@@ -0,0 +1,34 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticResult;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Results of network configuration diagnostic on the target resource.
+ */
+public class NetworkConfigurationDiagnosticResponseInner {
+    /**
+     * List of network configuration diagnostic results.
+     */
+    @JsonProperty(value = "results", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkConfigurationDiagnosticResult> results;
+
+    /**
+     * Get list of network configuration diagnostic results.
+     *
+     * @return the results value
+     */
+    public List<NetworkConfigurationDiagnosticResult> results() {
+        return this.results;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationInner.java
new file mode 100644
index 000000000000..773c8a4904f7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationInner.java
@@ -0,0 +1,387 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * IPConfiguration in a network interface.
+ */
+@JsonFlatten
+public class NetworkInterfaceIPConfigurationInner extends SubResource {
+    /**
+     * The reference to Virtual Network Taps.
+     */
+    @JsonProperty(value = "properties.virtualNetworkTaps")
+    private List<VirtualNetworkTapInner> virtualNetworkTaps;
+
+    /**
+     * The reference to ApplicationGatewayBackendAddressPool resource.
+     */
+    @JsonProperty(value = "properties.applicationGatewayBackendAddressPools")
+    private List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools;
+
+    /**
+     * The reference to LoadBalancerBackendAddressPool resource.
+     */
+    @JsonProperty(value = "properties.loadBalancerBackendAddressPools")
+    private List<BackendAddressPoolInner> loadBalancerBackendAddressPools;
+
+    /**
+     * A list of references of LoadBalancerInboundNatRules.
+     */
+    @JsonProperty(value = "properties.loadBalancerInboundNatRules")
+    private List<InboundNatRuleInner> loadBalancerInboundNatRules;
+
+    /**
+     * Private IP address of the IP configuration.
+     */
+    @JsonProperty(value = "properties.privateIPAddress")
+    private String privateIPAddress;
+
+    /**
+     * The private IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.privateIPAllocationMethod")
+    private IPAllocationMethod privateIPAllocationMethod;
+
+    /**
+     * Whether the specific IP configuration is IPv4 or IPv6. Default is IPv4.
+     * Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.privateIPAddressVersion")
+    private IPVersion privateIPAddressVersion;
+
+    /**
+     * Subnet bound to the IP configuration.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * Whether this is a primary customer address on the network interface.
+     */
+    @JsonProperty(value = "properties.primary")
+    private Boolean primary;
+
+    /**
+     * Public IP address bound to the IP configuration.
+     */
+    @JsonProperty(value = "properties.publicIPAddress")
+    private PublicIPAddressInner publicIPAddress;
+
+    /**
+     * Application security groups in which the IP configuration is included.
+     */
+    @JsonProperty(value = "properties.applicationSecurityGroups")
+    private List<ApplicationSecurityGroupInner> applicationSecurityGroups;
+
+    /**
+     * The provisioning state of the network interface IP configuration.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * PrivateLinkConnection properties for the network interface.
+     */
+    @JsonProperty(value = "properties.privateLinkConnectionProperties", access = JsonProperty.Access.WRITE_ONLY)
+    private NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the reference to Virtual Network Taps.
+     *
+     * @return the virtualNetworkTaps value
+     */
+    public List<VirtualNetworkTapInner> virtualNetworkTaps() {
+        return this.virtualNetworkTaps;
+    }
+
+    /**
+     * Set the reference to Virtual Network Taps.
+     *
+     * @param virtualNetworkTaps the virtualNetworkTaps value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withVirtualNetworkTaps(List<VirtualNetworkTapInner> virtualNetworkTaps) {
+        this.virtualNetworkTaps = virtualNetworkTaps;
+        return this;
+    }
+
+    /**
+     * Get the reference to ApplicationGatewayBackendAddressPool resource.
+     *
+     * @return the applicationGatewayBackendAddressPools value
+     */
+    public List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools() {
+        return this.applicationGatewayBackendAddressPools;
+    }
+
+    /**
+     * Set the reference to ApplicationGatewayBackendAddressPool resource.
+     *
+     * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withApplicationGatewayBackendAddressPools(List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools) {
+        this.applicationGatewayBackendAddressPools = applicationGatewayBackendAddressPools;
+        return this;
+    }
+
+    /**
+     * Get the reference to LoadBalancerBackendAddressPool resource.
+     *
+     * @return the loadBalancerBackendAddressPools value
+     */
+    public List<BackendAddressPoolInner> loadBalancerBackendAddressPools() {
+        return this.loadBalancerBackendAddressPools;
+    }
+
+    /**
+     * Set the reference to LoadBalancerBackendAddressPool resource.
+     *
+     * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withLoadBalancerBackendAddressPools(List<BackendAddressPoolInner> loadBalancerBackendAddressPools) {
+        this.loadBalancerBackendAddressPools = loadBalancerBackendAddressPools;
+        return this;
+    }
+
+    /**
+     * Get a list of references of LoadBalancerInboundNatRules.
+     *
+     * @return the loadBalancerInboundNatRules value
+     */
+    public List<InboundNatRuleInner> loadBalancerInboundNatRules() {
+        return this.loadBalancerInboundNatRules;
+    }
+
+    /**
+     * Set a list of references of LoadBalancerInboundNatRules.
+     *
+     * @param loadBalancerInboundNatRules the loadBalancerInboundNatRules value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withLoadBalancerInboundNatRules(List<InboundNatRuleInner> loadBalancerInboundNatRules) {
+        this.loadBalancerInboundNatRules = loadBalancerInboundNatRules;
+        return this;
+    }
+
+    /**
+     * Get private IP address of the IP configuration.
+     *
+     * @return the privateIPAddress value
+     */
+    public String privateIPAddress() {
+        return this.privateIPAddress;
+    }
+
+    /**
+     * Set private IP address of the IP configuration.
+     *
+     * @param privateIPAddress the privateIPAddress value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withPrivateIPAddress(String privateIPAddress) {
+        this.privateIPAddress = privateIPAddress;
+        return this;
+    }
+
+    /**
+     * Get the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the privateIPAllocationMethod value
+     */
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.privateIPAllocationMethod;
+    }
+
+    /**
+     * Set the private IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param privateIPAllocationMethod the privateIPAllocationMethod value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) {
+        this.privateIPAllocationMethod = privateIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get whether the specific IP configuration is IPv4 or IPv6. Default is IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the privateIPAddressVersion value
+     */
+    public IPVersion privateIPAddressVersion() {
+        return this.privateIPAddressVersion;
+    }
+
+    /**
+     * Set whether the specific IP configuration is IPv4 or IPv6. Default is IPv4. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param privateIPAddressVersion the privateIPAddressVersion value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withPrivateIPAddressVersion(IPVersion privateIPAddressVersion) {
+        this.privateIPAddressVersion = privateIPAddressVersion;
+        return this;
+    }
+
+    /**
+     * Get subnet bound to the IP configuration.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set subnet bound to the IP configuration.
+     *
+     * @param subnet the subnet value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get whether this is a primary customer address on the network interface.
+     *
+     * @return the primary value
+     */
+    public Boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Set whether this is a primary customer address on the network interface.
+     *
+     * @param primary the primary value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withPrimary(Boolean primary) {
+        this.primary = primary;
+        return this;
+    }
+
+    /**
+     * Get public IP address bound to the IP configuration.
+     *
+     * @return the publicIPAddress value
+     */
+    public PublicIPAddressInner publicIPAddress() {
+        return this.publicIPAddress;
+    }
+
+    /**
+     * Set public IP address bound to the IP configuration.
+     *
+     * @param publicIPAddress the publicIPAddress value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withPublicIPAddress(PublicIPAddressInner publicIPAddress) {
+        this.publicIPAddress = publicIPAddress;
+        return this;
+    }
+
+    /**
+     * Get application security groups in which the IP configuration is included.
+     *
+     * @return the applicationSecurityGroups value
+     */
+    public List<ApplicationSecurityGroupInner> applicationSecurityGroups() {
+        return this.applicationSecurityGroups;
+    }
+
+    /**
+     * Set application security groups in which the IP configuration is included.
+     *
+     * @param applicationSecurityGroups the applicationSecurityGroups value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withApplicationSecurityGroups(List<ApplicationSecurityGroupInner> applicationSecurityGroups) {
+        this.applicationSecurityGroups = applicationSecurityGroups;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the network interface IP configuration. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get privateLinkConnection properties for the network interface.
+     *
+     * @return the privateLinkConnectionProperties value
+     */
+    public NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties() {
+        return this.privateLinkConnectionProperties;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the NetworkInterfaceIPConfigurationInner object itself.
+     */
+    public NetworkInterfaceIPConfigurationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsImpl.java
new file mode 100644
index 000000000000..8db7fca7dd14
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurations;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceNetworkInterfaceIPConfiguration;
+
+class NetworkInterfaceIPConfigurationsImpl extends WrapperImpl<NetworkInterfaceIPConfigurationsInner> implements NetworkInterfaceIPConfigurations {
+    private final NetworkManager manager;
+
+    NetworkInterfaceIPConfigurationsImpl(NetworkManager manager) {
+        super(manager.inner().networkInterfaceIPConfigurations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private NetworkInterfaceNetworkInterfaceIPConfigurationImpl wrapModel(NetworkInterfaceIPConfigurationInner inner) {
+        return  new NetworkInterfaceNetworkInterfaceIPConfigurationImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<NetworkInterfaceNetworkInterfaceIPConfiguration> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        NetworkInterfaceIPConfigurationsInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkInterfaceName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceIPConfigurationInner>, Iterable<NetworkInterfaceIPConfigurationInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceIPConfigurationInner> call(Page<NetworkInterfaceIPConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceIPConfigurationInner, NetworkInterfaceNetworkInterfaceIPConfiguration>() {
+            @Override
+            public NetworkInterfaceNetworkInterfaceIPConfiguration call(NetworkInterfaceIPConfigurationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkInterfaceNetworkInterfaceIPConfiguration> getAsync(String resourceGroupName, String networkInterfaceName, String ipConfigurationName) {
+        NetworkInterfaceIPConfigurationsInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkInterfaceName, ipConfigurationName)
+        .flatMap(new Func1<NetworkInterfaceIPConfigurationInner, Observable<NetworkInterfaceNetworkInterfaceIPConfiguration>>() {
+            @Override
+            public Observable<NetworkInterfaceNetworkInterfaceIPConfiguration> call(NetworkInterfaceIPConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NetworkInterfaceNetworkInterfaceIPConfiguration)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsInner.java
new file mode 100644
index 000000000000..1b22cdc70ad6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceIPConfigurationsInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 NetworkInterfaceIPConfigurations.
+ */
+public class NetworkInterfaceIPConfigurationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkInterfaceIPConfigurationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkInterfaceIPConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkInterfaceIPConfigurationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkInterfaceIPConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkInterfaceIPConfigurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkInterfaceIPConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurations list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/ipConfigurations")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaceIPConfigurations get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/ipConfigurations/{ipConfigurationName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("ipConfigurationName") String ipConfigurationName, @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.network.v2020_04_01.NetworkInterfaceIPConfigurations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceIPConfigurationInner> list(final String resourceGroupName, final String networkInterfaceName) {
+        ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response = listSinglePageAsync(resourceGroupName, networkInterfaceName).toBlocking().single();
+        return new PagedList<NetworkInterfaceIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceIPConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceIPConfigurationInner>> listAsync(final String resourceGroupName, final String networkInterfaceName, final ListOperationCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkInterfaceName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceIPConfigurationInner>> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkInterfaceName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Page<NetworkInterfaceIPConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceIPConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listSinglePageAsync(resourceGroupName, networkInterfaceName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listSinglePageAsync(final String resourceGroupName, final String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified network interface ip configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration 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 NetworkInterfaceIPConfigurationInner object if successful.
+     */
+    public NetworkInterfaceIPConfigurationInner get(String resourceGroupName, String networkInterfaceName, String ipConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, ipConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network interface ip configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip 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<NetworkInterfaceIPConfigurationInner> getAsync(String resourceGroupName, String networkInterfaceName, String ipConfigurationName, final ServiceCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, ipConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network interface ip configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<NetworkInterfaceIPConfigurationInner> getAsync(String resourceGroupName, String networkInterfaceName, String ipConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, ipConfigurationName).map(new Func1<ServiceResponse<NetworkInterfaceIPConfigurationInner>, NetworkInterfaceIPConfigurationInner>() {
+            @Override
+            public NetworkInterfaceIPConfigurationInner call(ServiceResponse<NetworkInterfaceIPConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network interface ip configuration.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> getWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String ipConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkInterfaceName, ipConfigurationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceIPConfigurationInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceIPConfigurationInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceIPConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceIPConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceIPConfigurationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceIPConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @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<NetworkInterfaceIPConfigurationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceIPConfigurationInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceIPConfigurationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Page<NetworkInterfaceIPConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceIPConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get all ip configurations in a network interface.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> 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<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceImpl.java
new file mode 100644
index 000000000000..8d015c535db2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceDnsSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroup;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfiguration;
+
+class NetworkInterfaceImpl extends GroupableResourceCoreImpl<NetworkInterface, NetworkInterfaceInner, NetworkInterfaceImpl, NetworkManager> implements NetworkInterface, NetworkInterface.Definition, NetworkInterface.Update {
+    NetworkInterfaceImpl(String name, NetworkInterfaceInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NetworkInterface> createResourceAsync() {
+        NetworkInterfacesInner client = this.manager().inner().networkInterfaces();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkInterface> updateResourceAsync() {
+        NetworkInterfacesInner client = this.manager().inner().networkInterfaces();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkInterfaceInner> getInnerAsync() {
+        NetworkInterfacesInner client = this.manager().inner().networkInterfaces();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public NetworkInterfaceDnsSettings dnsSettings() {
+        return this.inner().dnsSettings();
+    }
+
+    @Override
+    public Boolean enableAcceleratedNetworking() {
+        return this.inner().enableAcceleratedNetworking();
+    }
+
+    @Override
+    public Boolean enableIPForwarding() {
+        return this.inner().enableIPForwarding();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<String> hostedWorkloads() {
+        return this.inner().hostedWorkloads();
+    }
+
+    @Override
+    public List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> ipConfigurations() {
+        List<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> lst = new ArrayList<VirtualMachineScaleSetNetworkInterfaceIPConfiguration>();
+        if (this.inner().ipConfigurations() != null) {
+            for (NetworkInterfaceIPConfigurationInner inner : this.inner().ipConfigurations()) {
+                lst.add( new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String macAddress() {
+        return this.inner().macAddress();
+    }
+
+    @Override
+    public NetworkSecurityGroup networkSecurityGroup() {
+        NetworkSecurityGroupInner inner = this.inner().networkSecurityGroup();
+        if (inner != null) {
+            return  new NetworkSecurityGroupImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Boolean primary() {
+        return this.inner().primary();
+    }
+
+    @Override
+    public PrivateEndpoint privateEndpoint() {
+        PrivateEndpointInner inner = this.inner().privateEndpoint();
+        if (inner != null) {
+            return  new PrivateEndpointImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<NetworkInterfaceTapConfiguration> tapConfigurations() {
+        List<NetworkInterfaceTapConfiguration> lst = new ArrayList<NetworkInterfaceTapConfiguration>();
+        if (this.inner().tapConfigurations() != null) {
+            for (NetworkInterfaceTapConfigurationInner inner : this.inner().tapConfigurations()) {
+                lst.add( new NetworkInterfaceTapConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public SubResource virtualMachine() {
+        return this.inner().virtualMachine();
+    }
+
+    @Override
+    public NetworkInterfaceImpl withDnsSettings(NetworkInterfaceDnsSettings dnsSettings) {
+        this.inner().withDnsSettings(dnsSettings);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceImpl withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking) {
+        this.inner().withEnableAcceleratedNetworking(enableAcceleratedNetworking);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceImpl withEnableIPForwarding(Boolean enableIPForwarding) {
+        this.inner().withEnableIPForwarding(enableIPForwarding);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceImpl withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations) {
+        this.inner().withIpConfigurations(ipConfigurations);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceImpl withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup) {
+        this.inner().withNetworkSecurityGroup(networkSecurityGroup);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceInner.java
new file mode 100644
index 000000000000..2975197f4aa1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceInner.java
@@ -0,0 +1,319 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceDnsSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A network interface in a resource group.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NetworkInterfaceInner extends Resource {
+    /**
+     * The reference to a virtual machine.
+     */
+    @JsonProperty(value = "properties.virtualMachine", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource virtualMachine;
+
+    /**
+     * The reference to the NetworkSecurityGroup resource.
+     */
+    @JsonProperty(value = "properties.networkSecurityGroup")
+    private NetworkSecurityGroupInner networkSecurityGroup;
+
+    /**
+     * A reference to the private endpoint to which the network interface is
+     * linked.
+     */
+    @JsonProperty(value = "properties.privateEndpoint", access = JsonProperty.Access.WRITE_ONLY)
+    private PrivateEndpointInner privateEndpoint;
+
+    /**
+     * A list of IPConfigurations of the network interface.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<NetworkInterfaceIPConfigurationInner> ipConfigurations;
+
+    /**
+     * A list of TapConfigurations of the network interface.
+     */
+    @JsonProperty(value = "properties.tapConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceTapConfigurationInner> tapConfigurations;
+
+    /**
+     * The DNS settings in network interface.
+     */
+    @JsonProperty(value = "properties.dnsSettings")
+    private NetworkInterfaceDnsSettings dnsSettings;
+
+    /**
+     * The MAC address of the network interface.
+     */
+    @JsonProperty(value = "properties.macAddress", access = JsonProperty.Access.WRITE_ONLY)
+    private String macAddress;
+
+    /**
+     * Whether this is a primary network interface on a virtual machine.
+     */
+    @JsonProperty(value = "properties.primary", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean primary;
+
+    /**
+     * If the network interface is accelerated networking enabled.
+     */
+    @JsonProperty(value = "properties.enableAcceleratedNetworking")
+    private Boolean enableAcceleratedNetworking;
+
+    /**
+     * Indicates whether IP forwarding is enabled on this network interface.
+     */
+    @JsonProperty(value = "properties.enableIPForwarding")
+    private Boolean enableIPForwarding;
+
+    /**
+     * A list of references to linked BareMetal resources.
+     */
+    @JsonProperty(value = "properties.hostedWorkloads", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> hostedWorkloads;
+
+    /**
+     * The resource GUID property of the network interface resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the network interface resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the reference to a virtual machine.
+     *
+     * @return the virtualMachine value
+     */
+    public SubResource virtualMachine() {
+        return this.virtualMachine;
+    }
+
+    /**
+     * Get the reference to the NetworkSecurityGroup resource.
+     *
+     * @return the networkSecurityGroup value
+     */
+    public NetworkSecurityGroupInner networkSecurityGroup() {
+        return this.networkSecurityGroup;
+    }
+
+    /**
+     * Set the reference to the NetworkSecurityGroup resource.
+     *
+     * @param networkSecurityGroup the networkSecurityGroup value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup) {
+        this.networkSecurityGroup = networkSecurityGroup;
+        return this;
+    }
+
+    /**
+     * Get a reference to the private endpoint to which the network interface is linked.
+     *
+     * @return the privateEndpoint value
+     */
+    public PrivateEndpointInner privateEndpoint() {
+        return this.privateEndpoint;
+    }
+
+    /**
+     * Get a list of IPConfigurations of the network interface.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<NetworkInterfaceIPConfigurationInner> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set a list of IPConfigurations of the network interface.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get a list of TapConfigurations of the network interface.
+     *
+     * @return the tapConfigurations value
+     */
+    public List<NetworkInterfaceTapConfigurationInner> tapConfigurations() {
+        return this.tapConfigurations;
+    }
+
+    /**
+     * Get the DNS settings in network interface.
+     *
+     * @return the dnsSettings value
+     */
+    public NetworkInterfaceDnsSettings dnsSettings() {
+        return this.dnsSettings;
+    }
+
+    /**
+     * Set the DNS settings in network interface.
+     *
+     * @param dnsSettings the dnsSettings value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withDnsSettings(NetworkInterfaceDnsSettings dnsSettings) {
+        this.dnsSettings = dnsSettings;
+        return this;
+    }
+
+    /**
+     * Get the MAC address of the network interface.
+     *
+     * @return the macAddress value
+     */
+    public String macAddress() {
+        return this.macAddress;
+    }
+
+    /**
+     * Get whether this is a primary network interface on a virtual machine.
+     *
+     * @return the primary value
+     */
+    public Boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Get if the network interface is accelerated networking enabled.
+     *
+     * @return the enableAcceleratedNetworking value
+     */
+    public Boolean enableAcceleratedNetworking() {
+        return this.enableAcceleratedNetworking;
+    }
+
+    /**
+     * Set if the network interface is accelerated networking enabled.
+     *
+     * @param enableAcceleratedNetworking the enableAcceleratedNetworking value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking) {
+        this.enableAcceleratedNetworking = enableAcceleratedNetworking;
+        return this;
+    }
+
+    /**
+     * Get indicates whether IP forwarding is enabled on this network interface.
+     *
+     * @return the enableIPForwarding value
+     */
+    public Boolean enableIPForwarding() {
+        return this.enableIPForwarding;
+    }
+
+    /**
+     * Set indicates whether IP forwarding is enabled on this network interface.
+     *
+     * @param enableIPForwarding the enableIPForwarding value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withEnableIPForwarding(Boolean enableIPForwarding) {
+        this.enableIPForwarding = enableIPForwarding;
+        return this;
+    }
+
+    /**
+     * Get a list of references to linked BareMetal resources.
+     *
+     * @return the hostedWorkloads value
+     */
+    public List<String> hostedWorkloads() {
+        return this.hostedWorkloads;
+    }
+
+    /**
+     * Get the resource GUID property of the network interface resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the network interface resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkInterfaceInner object itself.
+     */
+    public NetworkInterfaceInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancerImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancerImpl.java
new file mode 100644
index 000000000000..60d85301dec6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancerImpl.java
@@ -0,0 +1,158 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceLoadBalancer;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatPool;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancingRule;
+import com.microsoft.azure.management.network.v2020_04_01.OutboundRule;
+import com.microsoft.azure.management.network.v2020_04_01.Probe;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerSku;
+import java.util.Map;
+
+class NetworkInterfaceLoadBalancerImpl extends WrapperImpl<LoadBalancerInner> implements NetworkInterfaceLoadBalancer {
+    private final NetworkManager manager;
+
+    NetworkInterfaceLoadBalancerImpl(LoadBalancerInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public List<BackendAddressPool> backendAddressPools() {
+        List<BackendAddressPool> lst = new ArrayList<BackendAddressPool>();
+        if (this.inner().backendAddressPools() != null) {
+            for (BackendAddressPoolInner inner : this.inner().backendAddressPools()) {
+                lst.add( new BackendAddressPoolImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<FrontendIPConfiguration> frontendIPConfigurations() {
+        List<FrontendIPConfiguration> lst = new ArrayList<FrontendIPConfiguration>();
+        if (this.inner().frontendIPConfigurations() != null) {
+            for (FrontendIPConfigurationInner inner : this.inner().frontendIPConfigurations()) {
+                lst.add( new FrontendIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<InboundNatPool> inboundNatPools() {
+        return this.inner().inboundNatPools();
+    }
+
+    @Override
+    public List<InboundNatRule> inboundNatRules() {
+        List<InboundNatRule> lst = new ArrayList<InboundNatRule>();
+        if (this.inner().inboundNatRules() != null) {
+            for (InboundNatRuleInner inner : this.inner().inboundNatRules()) {
+                lst.add( new InboundNatRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<LoadBalancingRule> loadBalancingRules() {
+        List<LoadBalancingRule> lst = new ArrayList<LoadBalancingRule>();
+        if (this.inner().loadBalancingRules() != null) {
+            for (LoadBalancingRuleInner inner : this.inner().loadBalancingRules()) {
+                lst.add( new LoadBalancingRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<OutboundRule> outboundRules() {
+        List<OutboundRule> lst = new ArrayList<OutboundRule>();
+        if (this.inner().outboundRules() != null) {
+            for (OutboundRuleInner inner : this.inner().outboundRules()) {
+                lst.add( new OutboundRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<Probe> probes() {
+        List<Probe> lst = new ArrayList<Probe>();
+        if (this.inner().probes() != null) {
+            for (ProbeInner inner : this.inner().probes()) {
+                lst.add( new ProbeImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public LoadBalancerSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersImpl.java
new file mode 100644
index 000000000000..f554b9e76c36
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceLoadBalancers;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceLoadBalancer;
+
+class NetworkInterfaceLoadBalancersImpl extends WrapperImpl<NetworkInterfaceLoadBalancersInner> implements NetworkInterfaceLoadBalancers {
+    private final NetworkManager manager;
+
+    NetworkInterfaceLoadBalancersImpl(NetworkManager manager) {
+        super(manager.inner().networkInterfaceLoadBalancers());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private NetworkInterfaceLoadBalancerImpl wrapModel(LoadBalancerInner inner) {
+        return  new NetworkInterfaceLoadBalancerImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<NetworkInterfaceLoadBalancer> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        NetworkInterfaceLoadBalancersInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkInterfaceName)
+        .flatMapIterable(new Func1<Page<LoadBalancerInner>, Iterable<LoadBalancerInner>>() {
+            @Override
+            public Iterable<LoadBalancerInner> call(Page<LoadBalancerInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<LoadBalancerInner, NetworkInterfaceLoadBalancer>() {
+            @Override
+            public NetworkInterfaceLoadBalancer call(LoadBalancerInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersInner.java
new file mode 100644
index 000000000000..d37ff74790a3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceLoadBalancersInner.java
@@ -0,0 +1,301 @@
+/**
+ * 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.network.v2020_04_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.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 NetworkInterfaceLoadBalancers.
+ */
+public class NetworkInterfaceLoadBalancersInner {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkInterfaceLoadBalancersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkInterfaceLoadBalancersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkInterfaceLoadBalancersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkInterfaceLoadBalancersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkInterfaceLoadBalancers to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkInterfaceLoadBalancersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceLoadBalancers list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/loadBalancers")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaceLoadBalancers listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> list(final String resourceGroupName, final String networkInterfaceName) {
+        ServiceResponse<Page<LoadBalancerInner>> response = listSinglePageAsync(resourceGroupName, networkInterfaceName).toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<LoadBalancerInner>> listAsync(final String resourceGroupName, final String networkInterfaceName, final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkInterfaceName),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkInterfaceName)
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listSinglePageAsync(resourceGroupName, networkInterfaceName)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listSinglePageAsync(final String resourceGroupName, final String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @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;LoadBalancerInner&gt; object if successful.
+     */
+    public PagedList<LoadBalancerInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<LoadBalancerInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<LoadBalancerInner>(response.body()) {
+            @Override
+            public Page<LoadBalancerInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @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<LoadBalancerInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<LoadBalancerInner>> serviceFuture, final ListOperationCallback<LoadBalancerInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @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;LoadBalancerInner&gt; object
+     */
+    public Observable<Page<LoadBalancerInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Page<LoadBalancerInner>>() {
+                @Override
+                public Page<LoadBalancerInner> call(ServiceResponse<Page<LoadBalancerInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+     * @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;LoadBalancerInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<LoadBalancerInner>>, Observable<ServiceResponse<Page<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(ServiceResponse<Page<LoadBalancerInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all load balancers in a network interface.
+     *
+    ServiceResponse<PageImpl<LoadBalancerInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;LoadBalancerInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<LoadBalancerInner>>> 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<LoadBalancerInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<LoadBalancerInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<LoadBalancerInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<LoadBalancerInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<LoadBalancerInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<LoadBalancerInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<LoadBalancerInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceNetworkInterfaceIPConfigurationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceNetworkInterfaceIPConfigurationImpl.java
new file mode 100644
index 000000000000..c897c5fba38a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceNetworkInterfaceIPConfigurationImpl.java
@@ -0,0 +1,170 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceNetworkInterfaceIPConfiguration;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddress;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTap;
+
+class NetworkInterfaceNetworkInterfaceIPConfigurationImpl extends IndexableRefreshableWrapperImpl<NetworkInterfaceNetworkInterfaceIPConfiguration, NetworkInterfaceIPConfigurationInner> implements NetworkInterfaceNetworkInterfaceIPConfiguration {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkInterfaceName;
+    private String ipConfigurationName;
+
+    NetworkInterfaceNetworkInterfaceIPConfigurationImpl(NetworkInterfaceIPConfigurationInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkInterfaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkInterfaces");
+        this.ipConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "ipConfigurations");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<NetworkInterfaceIPConfigurationInner> getInnerAsync() {
+        NetworkInterfaceIPConfigurationsInner client = this.manager().inner().networkInterfaceIPConfigurations();
+        return client.getAsync(this.resourceGroupName, this.networkInterfaceName, this.ipConfigurationName);
+    }
+
+
+
+    @Override
+    public List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools() {
+        return this.inner().applicationGatewayBackendAddressPools();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> applicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().applicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().applicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<BackendAddressPool> loadBalancerBackendAddressPools() {
+        List<BackendAddressPool> lst = new ArrayList<BackendAddressPool>();
+        if (this.inner().loadBalancerBackendAddressPools() != null) {
+            for (BackendAddressPoolInner inner : this.inner().loadBalancerBackendAddressPools()) {
+                lst.add( new BackendAddressPoolImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<InboundNatRule> loadBalancerInboundNatRules() {
+        List<InboundNatRule> lst = new ArrayList<InboundNatRule>();
+        if (this.inner().loadBalancerInboundNatRules() != null) {
+            for (InboundNatRuleInner inner : this.inner().loadBalancerInboundNatRules()) {
+                lst.add( new InboundNatRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Boolean primary() {
+        return this.inner().primary();
+    }
+
+    @Override
+    public String privateIPAddress() {
+        return this.inner().privateIPAddress();
+    }
+
+    @Override
+    public IPVersion privateIPAddressVersion() {
+        return this.inner().privateIPAddressVersion();
+    }
+
+    @Override
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.inner().privateIPAllocationMethod();
+    }
+
+    @Override
+    public NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties() {
+        return this.inner().privateLinkConnectionProperties();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PublicIPAddress publicIPAddress() {
+        PublicIPAddressInner inner = this.inner().publicIPAddress();
+        if (inner != null) {
+            return  new PublicIPAddressImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Subnet subnet() {
+        SubnetInner inner = this.inner().subnet();
+        if (inner != null) {
+            return  new SubnetImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public List<VirtualNetworkTap> virtualNetworkTaps() {
+        List<VirtualNetworkTap> lst = new ArrayList<VirtualNetworkTap>();
+        if (this.inner().virtualNetworkTaps() != null) {
+            for (VirtualNetworkTapInner inner : this.inner().virtualNetworkTaps()) {
+                lst.add( new VirtualNetworkTapImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationImpl.java
new file mode 100644
index 000000000000..98a1f46c4696
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationImpl.java
@@ -0,0 +1,134 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfiguration;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTap;
+
+class NetworkInterfaceTapConfigurationImpl extends CreatableUpdatableImpl<NetworkInterfaceTapConfiguration, NetworkInterfaceTapConfigurationInner, NetworkInterfaceTapConfigurationImpl> implements NetworkInterfaceTapConfiguration, NetworkInterfaceTapConfiguration.Definition, NetworkInterfaceTapConfiguration.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkInterfaceName;
+    private String tapConfigurationName;
+
+    NetworkInterfaceTapConfigurationImpl(String name, NetworkManager manager) {
+        super(name, new NetworkInterfaceTapConfigurationInner());
+        this.manager = manager;
+        // Set resource name
+        this.tapConfigurationName = name;
+        //
+    }
+
+    NetworkInterfaceTapConfigurationImpl(NetworkInterfaceTapConfigurationInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.tapConfigurationName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkInterfaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkInterfaces");
+        this.tapConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "tapConfigurations");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<NetworkInterfaceTapConfiguration> createResourceAsync() {
+        NetworkInterfaceTapConfigurationsInner client = this.manager().inner().networkInterfaceTapConfigurations();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkInterfaceName, this.tapConfigurationName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkInterfaceTapConfiguration> updateResourceAsync() {
+        NetworkInterfaceTapConfigurationsInner client = this.manager().inner().networkInterfaceTapConfigurations();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkInterfaceName, this.tapConfigurationName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkInterfaceTapConfigurationInner> getInnerAsync() {
+        NetworkInterfaceTapConfigurationsInner client = this.manager().inner().networkInterfaceTapConfigurations();
+        return client.getAsync(this.resourceGroupName, this.networkInterfaceName, this.tapConfigurationName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public VirtualNetworkTap virtualNetworkTap() {
+        VirtualNetworkTapInner inner = this.inner().virtualNetworkTap();
+        if (inner != null) {
+            return  new VirtualNetworkTapImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public NetworkInterfaceTapConfigurationImpl withExistingNetworkInterface(String resourceGroupName, String networkInterfaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.networkInterfaceName = networkInterfaceName;
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceTapConfigurationImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceTapConfigurationImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public NetworkInterfaceTapConfigurationImpl withVirtualNetworkTap(VirtualNetworkTapInner virtualNetworkTap) {
+        this.inner().withVirtualNetworkTap(virtualNetworkTap);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationInner.java
new file mode 100644
index 000000000000..02a1a7aad062
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Tap configuration in a Network Interface.
+ */
+@JsonFlatten
+public class NetworkInterfaceTapConfigurationInner extends SubResource {
+    /**
+     * The reference to the Virtual Network Tap resource.
+     */
+    @JsonProperty(value = "properties.virtualNetworkTap")
+    private VirtualNetworkTapInner virtualNetworkTap;
+
+    /**
+     * The provisioning state of the network interface tap configuration
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Sub Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the reference to the Virtual Network Tap resource.
+     *
+     * @return the virtualNetworkTap value
+     */
+    public VirtualNetworkTapInner virtualNetworkTap() {
+        return this.virtualNetworkTap;
+    }
+
+    /**
+     * Set the reference to the Virtual Network Tap resource.
+     *
+     * @param virtualNetworkTap the virtualNetworkTap value to set
+     * @return the NetworkInterfaceTapConfigurationInner object itself.
+     */
+    public NetworkInterfaceTapConfigurationInner withVirtualNetworkTap(VirtualNetworkTapInner virtualNetworkTap) {
+        this.virtualNetworkTap = virtualNetworkTap;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the network interface tap configuration resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the NetworkInterfaceTapConfigurationInner object itself.
+     */
+    public NetworkInterfaceTapConfigurationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get sub Resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsImpl.java
new file mode 100644
index 000000000000..f1c86ba8a505
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfigurations;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfiguration;
+
+class NetworkInterfaceTapConfigurationsImpl extends WrapperImpl<NetworkInterfaceTapConfigurationsInner> implements NetworkInterfaceTapConfigurations {
+    private final NetworkManager manager;
+
+    NetworkInterfaceTapConfigurationsImpl(NetworkManager manager) {
+        super(manager.inner().networkInterfaceTapConfigurations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public NetworkInterfaceTapConfigurationImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private NetworkInterfaceTapConfigurationImpl wrapModel(NetworkInterfaceTapConfigurationInner inner) {
+        return  new NetworkInterfaceTapConfigurationImpl(inner, manager());
+    }
+
+    private NetworkInterfaceTapConfigurationImpl wrapModel(String name) {
+        return new NetworkInterfaceTapConfigurationImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<NetworkInterfaceTapConfiguration> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        NetworkInterfaceTapConfigurationsInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkInterfaceName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceTapConfigurationInner>, Iterable<NetworkInterfaceTapConfigurationInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceTapConfigurationInner> call(Page<NetworkInterfaceTapConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceTapConfigurationInner, NetworkInterfaceTapConfiguration>() {
+            @Override
+            public NetworkInterfaceTapConfiguration call(NetworkInterfaceTapConfigurationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkInterfaceTapConfiguration> getAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        NetworkInterfaceTapConfigurationsInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkInterfaceName, tapConfigurationName)
+        .flatMap(new Func1<NetworkInterfaceTapConfigurationInner, Observable<NetworkInterfaceTapConfiguration>>() {
+            @Override
+            public Observable<NetworkInterfaceTapConfiguration> call(NetworkInterfaceTapConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NetworkInterfaceTapConfiguration)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        NetworkInterfaceTapConfigurationsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsInner.java
new file mode 100644
index 000000000000..7d90ebf523f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfaceTapConfigurationsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 NetworkInterfaceTapConfigurations.
+ */
+public class NetworkInterfaceTapConfigurationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkInterfaceTapConfigurationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkInterfaceTapConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkInterfaceTapConfigurationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkInterfaceTapConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkInterfaceTapConfigurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkInterfaceTapConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfigurations delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("tapConfigurationName") String tapConfigurationName, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("tapConfigurationName") String tapConfigurationName, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("tapConfigurationName") String tapConfigurationName, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("tapConfigurationName") String tapConfigurationName, @Path("subscriptionId") String subscriptionId, @Body NetworkInterfaceTapConfigurationInner tapConfigurationParameters, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("tapConfigurationName") String tapConfigurationName, @Path("subscriptionId") String subscriptionId, @Body NetworkInterfaceTapConfigurationInner tapConfigurationParameters, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaceTapConfigurations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @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 networkInterfaceName, String tapConfigurationName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap 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<Void> deleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (tapConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkInterfaceName, tapConfigurationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @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 networkInterfaceName, String tapConfigurationName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap 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<Void> beginDeleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified tap configuration from the NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (tapConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkInterfaceName, tapConfigurationName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Get the specified tap configuration on a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @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 NetworkInterfaceTapConfigurationInner object if successful.
+     */
+    public NetworkInterfaceTapConfigurationInner get(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified tap configuration on a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap 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<NetworkInterfaceTapConfigurationInner> getAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, final ServiceCallback<NetworkInterfaceTapConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Get the specified tap configuration on a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceTapConfigurationInner object
+     */
+    public Observable<NetworkInterfaceTapConfigurationInner> getAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName).map(new Func1<ServiceResponse<NetworkInterfaceTapConfigurationInner>, NetworkInterfaceTapConfigurationInner>() {
+            @Override
+            public NetworkInterfaceTapConfigurationInner call(ServiceResponse<NetworkInterfaceTapConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified tap configuration on a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceTapConfigurationInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>> getWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (tapConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkInterfaceName, tapConfigurationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceTapConfigurationInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceTapConfigurationInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceTapConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceTapConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration 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 NetworkInterfaceTapConfigurationInner object if successful.
+     */
+    public NetworkInterfaceTapConfigurationInner createOrUpdate(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @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<NetworkInterfaceTapConfigurationInner> createOrUpdateAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters, final ServiceCallback<NetworkInterfaceTapConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkInterfaceTapConfigurationInner> createOrUpdateAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters).map(new Func1<ServiceResponse<NetworkInterfaceTapConfigurationInner>, NetworkInterfaceTapConfigurationInner>() {
+            @Override
+            public NetworkInterfaceTapConfigurationInner call(ServiceResponse<NetworkInterfaceTapConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (tapConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationName 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 (tapConfigurationParameters == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationParameters is required and cannot be null.");
+        }
+        Validator.validate(tapConfigurationParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkInterfaceName, tapConfigurationName, this.client.subscriptionId(), tapConfigurationParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NetworkInterfaceTapConfigurationInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration 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 NetworkInterfaceTapConfigurationInner object if successful.
+     */
+    public NetworkInterfaceTapConfigurationInner beginCreateOrUpdate(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @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<NetworkInterfaceTapConfigurationInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters, final ServiceCallback<NetworkInterfaceTapConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceTapConfigurationInner object
+     */
+    public Observable<NetworkInterfaceTapConfigurationInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tapConfigurationName, tapConfigurationParameters).map(new Func1<ServiceResponse<NetworkInterfaceTapConfigurationInner>, NetworkInterfaceTapConfigurationInner>() {
+            @Override
+            public NetworkInterfaceTapConfigurationInner call(ServiceResponse<NetworkInterfaceTapConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Tap configuration in the specified NetworkInterface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tapConfigurationName The name of the tap configuration.
+     * @param tapConfigurationParameters Parameters supplied to the create or update tap configuration operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceTapConfigurationInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String tapConfigurationName, NetworkInterfaceTapConfigurationInner tapConfigurationParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (tapConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationName 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 (tapConfigurationParameters == null) {
+            throw new IllegalArgumentException("Parameter tapConfigurationParameters is required and cannot be null.");
+        }
+        Validator.validate(tapConfigurationParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkInterfaceName, tapConfigurationName, this.client.subscriptionId(), tapConfigurationParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceTapConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceTapConfigurationInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceTapConfigurationInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceTapConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceTapConfigurationInner>() { }.getType())
+                .register(201, new TypeToken<NetworkInterfaceTapConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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;NetworkInterfaceTapConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceTapConfigurationInner> list(final String resourceGroupName, final String networkInterfaceName) {
+        ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> response = listSinglePageAsync(resourceGroupName, networkInterfaceName).toBlocking().single();
+        return new PagedList<NetworkInterfaceTapConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceTapConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceTapConfigurationInner>> listAsync(final String resourceGroupName, final String networkInterfaceName, final ListOperationCallback<NetworkInterfaceTapConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkInterfaceName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceTapConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceTapConfigurationInner>> listAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkInterfaceName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>, Page<NetworkInterfaceTapConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceTapConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceTapConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkInterfaceName) {
+        return listSinglePageAsync(resourceGroupName, networkInterfaceName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceTapConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> listSinglePageAsync(final String resourceGroupName, final String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceTapConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceTapConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @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;NetworkInterfaceTapConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceTapConfigurationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceTapConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceTapConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @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<NetworkInterfaceTapConfigurationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceTapConfigurationInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceTapConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @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;NetworkInterfaceTapConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceTapConfigurationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>, Page<NetworkInterfaceTapConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceTapConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+     * @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;NetworkInterfaceTapConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get all Tap configurations in a network interface.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceTapConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> 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<NetworkInterfaceTapConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceTapConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceTapConfigurationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceTapConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceTapConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesImpl.java
new file mode 100644
index 000000000000..96fedb91c2bb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesImpl.java
@@ -0,0 +1,229 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaces;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import com.microsoft.azure.Page;
+import rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveRouteListResult;
+import com.microsoft.azure.management.network.v2020_04_01.EffectiveNetworkSecurityGroupListResult;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+
+class NetworkInterfacesImpl extends WrapperImpl<NetworkInterfacesInner> implements NetworkInterfaces {
+    private final NetworkManager manager;
+
+    NetworkInterfacesImpl(NetworkManager manager) {
+        super(manager.inner().networkInterfaces());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public NetworkInterfaceImpl defineNetworkInterface(String name) {
+        return wrapNetworkInterfaceModel(name);
+    }
+
+    private NetworkInterfaceImpl wrapNetworkInterfaceModel(String name) {
+        return new NetworkInterfaceImpl(name, new NetworkInterfaceInner(), this.manager());
+    }
+
+    private NetworkInterfaceImpl wrapNetworkInterfaceModel(NetworkInterfaceInner inner) {
+        return  new NetworkInterfaceImpl(inner.name(), inner, manager());
+    }
+
+    private VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl wrapVirtualMachineScaleSetNetworkInterfaceIPConfigurationModel(NetworkInterfaceIPConfigurationInner inner) {
+        return  new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager());
+    }
+
+    private Observable<NetworkInterfaceInner> getNetworkInterfaceInnerUsingNetworkInterfacesInnerAsync(String resourceGroupName, String name) {
+        NetworkInterfacesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    private Observable<NetworkInterfaceIPConfigurationInner> getNetworkInterfaceIPConfigurationInnerUsingNetworkInterfacesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String virtualMachineScaleSetName = IdParsingUtils.getValueFromIdByName(id, "virtualMachineScaleSets");
+        String virtualmachineIndex = IdParsingUtils.getValueFromIdByName(id, "virtualMachines");
+        String networkInterfaceName = IdParsingUtils.getValueFromIdByName(id, "networkInterfaces");
+        String ipConfigurationName = IdParsingUtils.getValueFromIdByName(id, "ipConfigurations");
+        NetworkInterfacesInner client = this.inner();
+        return client.getVirtualMachineScaleSetIpConfigurationAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName);
+    }
+
+    @Override
+    public Observable<NetworkInterface> getByResourceGroupAsync(String resourceGroupName, String name) {
+        return this.getNetworkInterfaceInnerUsingNetworkInterfacesInnerAsync(resourceGroupName, name).flatMap(new Func1<NetworkInterfaceInner, Observable<NetworkInterface>> () {
+            @Override
+            public Observable<NetworkInterface> call(NetworkInterfaceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return  Observable.just((NetworkInterface)wrapNetworkInterfaceModel(inner));
+                }
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkInterface> listByResourceGroupAsync(String resourceGroupName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceInner>, Iterable<NetworkInterfaceInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceInner> call(Page<NetworkInterfaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceInner, NetworkInterface>() {
+            @Override
+            public NetworkInterface call(NetworkInterfaceInner inner) {
+                return wrapNetworkInterfaceModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkInterface> listAsync() {
+        NetworkInterfacesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NetworkInterfaceInner>, Iterable<NetworkInterfaceInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceInner> call(Page<NetworkInterfaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceInner, NetworkInterface>() {
+            @Override
+            public NetworkInterface call(NetworkInterfaceInner inner) {
+                return wrapNetworkInterfaceModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String name) {
+        return this.inner().deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<EffectiveRouteListResult> getEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.getEffectiveRouteTableAsync(resourceGroupName, networkInterfaceName)
+        .map(new Func1<EffectiveRouteListResultInner, EffectiveRouteListResult>() {
+            @Override
+            public EffectiveRouteListResult call(EffectiveRouteListResultInner inner) {
+                return new EffectiveRouteListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<EffectiveNetworkSecurityGroupListResult> listEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.listEffectiveNetworkSecurityGroupsAsync(resourceGroupName, networkInterfaceName)
+        .map(new Func1<EffectiveNetworkSecurityGroupListResultInner, EffectiveNetworkSecurityGroupListResult>() {
+            @Override
+            public EffectiveNetworkSecurityGroupListResult call(EffectiveNetworkSecurityGroupListResultInner inner) {
+                return new EffectiveNetworkSecurityGroupListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<LoadBalancerNetworkInterface> listVirtualMachineScaleSetVMNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex) {
+        NetworkInterfacesInner client = this.inner();
+        return client.listVirtualMachineScaleSetVMNetworkInterfacesAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceInner>, Iterable<NetworkInterfaceInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceInner> call(Page<NetworkInterfaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceInner, LoadBalancerNetworkInterface>() {
+            @Override
+            public LoadBalancerNetworkInterface call(NetworkInterfaceInner inner) {
+                return new LoadBalancerNetworkInterfaceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<LoadBalancerNetworkInterface> listVirtualMachineScaleSetNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.listVirtualMachineScaleSetNetworkInterfacesAsync(resourceGroupName, virtualMachineScaleSetName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceInner>, Iterable<NetworkInterfaceInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceInner> call(Page<NetworkInterfaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceInner, LoadBalancerNetworkInterface>() {
+            @Override
+            public LoadBalancerNetworkInterface call(NetworkInterfaceInner inner) {
+                return new LoadBalancerNetworkInterfaceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<LoadBalancerNetworkInterface> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.getVirtualMachineScaleSetNetworkInterfaceAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName)
+        .map(new Func1<NetworkInterfaceInner, LoadBalancerNetworkInterface>() {
+            @Override
+            public LoadBalancerNetworkInterface call(NetworkInterfaceInner inner) {
+                return new LoadBalancerNetworkInterfaceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.getVirtualMachineScaleSetIpConfigurationAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName)
+        .flatMap(new Func1<NetworkInterfaceIPConfigurationInner, Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration>>() {
+            @Override
+            public Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> call(NetworkInterfaceIPConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualMachineScaleSetNetworkInterfaceIPConfiguration)wrapVirtualMachineScaleSetNetworkInterfaceIPConfigurationModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Observable<VirtualMachineScaleSetNetworkInterfaceIPConfiguration> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName) {
+        NetworkInterfacesInner client = this.inner();
+        return client.listVirtualMachineScaleSetIpConfigurationsAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName)
+        .flatMapIterable(new Func1<Page<NetworkInterfaceIPConfigurationInner>, Iterable<NetworkInterfaceIPConfigurationInner>>() {
+            @Override
+            public Iterable<NetworkInterfaceIPConfigurationInner> call(Page<NetworkInterfaceIPConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkInterfaceIPConfigurationInner, VirtualMachineScaleSetNetworkInterfaceIPConfiguration>() {
+            @Override
+            public VirtualMachineScaleSetNetworkInterfaceIPConfiguration call(NetworkInterfaceIPConfigurationInner inner) {
+                return wrapVirtualMachineScaleSetNetworkInterfaceIPConfigurationModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesInner.java
new file mode 100644
index 000000000000..54577725efed
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkInterfacesInner.java
@@ -0,0 +1,2821 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in NetworkInterfaces.
+ */
+public class NetworkInterfacesInner implements InnerSupportsGet<NetworkInterfaceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NetworkInterfaceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkInterfacesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkInterfacesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkInterfacesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkInterfacesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkInterfaces to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkInterfacesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaces delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkInterfaces createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Body NetworkInterfaceInner 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.network.v2020_04_01.NetworkInterfaces beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Body NetworkInterfaceInner 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.network.v2020_04_01.NetworkInterfaces updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaces list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/networkInterfaces")
+        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.network.v2020_04_01.NetworkInterfaces listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces")
+        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.network.v2020_04_01.NetworkInterfaces getEffectiveRouteTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/effectiveRouteTable")
+        Observable<Response<ResponseBody>> getEffectiveRouteTable(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces beginGetEffectiveRouteTable" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/effectiveRouteTable")
+        Observable<Response<ResponseBody>> beginGetEffectiveRouteTable(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces listEffectiveNetworkSecurityGroups" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/effectiveNetworkSecurityGroups")
+        Observable<Response<ResponseBody>> listEffectiveNetworkSecurityGroups(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces beginListEffectiveNetworkSecurityGroups" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/effectiveNetworkSecurityGroups")
+        Observable<Response<ResponseBody>> beginListEffectiveNetworkSecurityGroups(@Path("resourceGroupName") String resourceGroupName, @Path("networkInterfaceName") String networkInterfaceName, @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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetVMNetworkInterfaces" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces")
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetVMNetworkInterfaces(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetNetworkInterfaces" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/networkInterfaces")
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetNetworkInterfaces(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @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.network.v2020_04_01.NetworkInterfaces getVirtualMachineScaleSetNetworkInterface" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}")
+        Observable<Response<ResponseBody>> getVirtualMachineScaleSetNetworkInterface(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetIpConfigurations" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}/ipConfigurations")
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetIpConfigurations(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @Path("networkInterfaceName") String networkInterfaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkInterfaces getVirtualMachineScaleSetIpConfiguration" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}/ipConfigurations/{ipConfigurationName}")
+        Observable<Response<ResponseBody>> getVirtualMachineScaleSetIpConfiguration(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @Path("networkInterfaceName") String networkInterfaceName, @Path("ipConfigurationName") String ipConfigurationName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkInterfaces 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.network.v2020_04_01.NetworkInterfaces 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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetVMNetworkInterfacesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetVMNetworkInterfacesNext(@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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetNetworkInterfacesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetNetworkInterfacesNext(@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.network.v2020_04_01.NetworkInterfaces listVirtualMachineScaleSetIpConfigurationsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetIpConfigurationsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 networkInterfaceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 networkInterfaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkInterfaceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 networkInterfaceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 networkInterfaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkInterfaceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), 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 information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner getByResourceGroup(String resourceGroupName, String networkInterfaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceInner> getByResourceGroupAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> getByResourceGroupAsync(String resourceGroupName, String networkInterfaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner getByResourceGroup(String resourceGroupName, String networkInterfaceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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<NetworkInterfaceInner> getByResourceGroupAsync(String resourceGroupName, String networkInterfaceName, String expand, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> getByResourceGroupAsync(String resourceGroupName, String networkInterfaceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkInterfaceName, expand).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface 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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner createOrUpdate(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @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<NetworkInterfaceInner> createOrUpdateAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkInterfaceInner> createOrUpdateAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NetworkInterfaceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface 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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner beginCreateOrUpdate(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @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<NetworkInterfaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkInterfaceName, parameters).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param parameters Parameters supplied to the create or update network interface operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, NetworkInterfaceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceInner>() { }.getType())
+                .register(201, new TypeToken<NetworkInterfaceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner updateTags(String resourceGroupName, String networkInterfaceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceInner> updateTagsAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> updateTagsAsync(String resourceGroupName, String networkInterfaceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tags Resource tags.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner updateTags(String resourceGroupName, String networkInterfaceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tags Resource tags.
+     * @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<NetworkInterfaceInner> updateTagsAsync(String resourceGroupName, String networkInterfaceName, Map<String, String> tags, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> updateTagsAsync(String resourceGroupName, String networkInterfaceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkInterfaceName, tags).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network interface tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in a 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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> list() {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in a 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<NetworkInterfaceInner>> listAsync(final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<NetworkInterfaceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 EffectiveRouteListResultInner object if successful.
+     */
+    public EffectiveRouteListResultInner getEffectiveRouteTable(String resourceGroupName, String networkInterfaceName) {
+        return getEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<EffectiveRouteListResultInner> getEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<EffectiveRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<EffectiveRouteListResultInner> getEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName) {
+        return getEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<EffectiveRouteListResultInner>, EffectiveRouteListResultInner>() {
+            @Override
+            public EffectiveRouteListResultInner call(ServiceResponse<EffectiveRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<EffectiveRouteListResultInner>> getEffectiveRouteTableWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getEffectiveRouteTable(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<EffectiveRouteListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 EffectiveRouteListResultInner object if successful.
+     */
+    public EffectiveRouteListResultInner beginGetEffectiveRouteTable(String resourceGroupName, String networkInterfaceName) {
+        return beginGetEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<EffectiveRouteListResultInner> beginGetEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<EffectiveRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EffectiveRouteListResultInner object
+     */
+    public Observable<EffectiveRouteListResultInner> beginGetEffectiveRouteTableAsync(String resourceGroupName, String networkInterfaceName) {
+        return beginGetEffectiveRouteTableWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<EffectiveRouteListResultInner>, EffectiveRouteListResultInner>() {
+            @Override
+            public EffectiveRouteListResultInner call(ServiceResponse<EffectiveRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all route tables applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EffectiveRouteListResultInner object
+     */
+    public Observable<ServiceResponse<EffectiveRouteListResultInner>> beginGetEffectiveRouteTableWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetEffectiveRouteTable(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EffectiveRouteListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EffectiveRouteListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EffectiveRouteListResultInner> clientResponse = beginGetEffectiveRouteTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EffectiveRouteListResultInner> beginGetEffectiveRouteTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EffectiveRouteListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EffectiveRouteListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 EffectiveNetworkSecurityGroupListResultInner object if successful.
+     */
+    public EffectiveNetworkSecurityGroupListResultInner listEffectiveNetworkSecurityGroups(String resourceGroupName, String networkInterfaceName) {
+        return listEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<EffectiveNetworkSecurityGroupListResultInner> listEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<EffectiveNetworkSecurityGroupListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<EffectiveNetworkSecurityGroupListResultInner> listEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName) {
+        return listEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>, EffectiveNetworkSecurityGroupListResultInner>() {
+            @Override
+            public EffectiveNetworkSecurityGroupListResultInner call(ServiceResponse<EffectiveNetworkSecurityGroupListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>> listEffectiveNetworkSecurityGroupsWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listEffectiveNetworkSecurityGroups(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<EffectiveNetworkSecurityGroupListResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 EffectiveNetworkSecurityGroupListResultInner object if successful.
+     */
+    public EffectiveNetworkSecurityGroupListResultInner beginListEffectiveNetworkSecurityGroups(String resourceGroupName, String networkInterfaceName) {
+        return beginListEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<EffectiveNetworkSecurityGroupListResultInner> beginListEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName, final ServiceCallback<EffectiveNetworkSecurityGroupListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EffectiveNetworkSecurityGroupListResultInner object
+     */
+    public Observable<EffectiveNetworkSecurityGroupListResultInner> beginListEffectiveNetworkSecurityGroupsAsync(String resourceGroupName, String networkInterfaceName) {
+        return beginListEffectiveNetworkSecurityGroupsWithServiceResponseAsync(resourceGroupName, networkInterfaceName).map(new Func1<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>, EffectiveNetworkSecurityGroupListResultInner>() {
+            @Override
+            public EffectiveNetworkSecurityGroupListResultInner call(ServiceResponse<EffectiveNetworkSecurityGroupListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets all network security groups applied to a network interface.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EffectiveNetworkSecurityGroupListResultInner object
+     */
+    public Observable<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>> beginListEffectiveNetworkSecurityGroupsWithServiceResponseAsync(String resourceGroupName, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginListEffectiveNetworkSecurityGroups(resourceGroupName, networkInterfaceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EffectiveNetworkSecurityGroupListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EffectiveNetworkSecurityGroupListResultInner> clientResponse = beginListEffectiveNetworkSecurityGroupsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EffectiveNetworkSecurityGroupListResultInner> beginListEffectiveNetworkSecurityGroupsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EffectiveNetworkSecurityGroupListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EffectiveNetworkSecurityGroupListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listVirtualMachineScaleSetVMNetworkInterfaces(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listVirtualMachineScaleSetVMNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @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<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetVMNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex) {
+        return listVirtualMachineScaleSetVMNetworkInterfacesWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetVMNetworkInterfacesWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex) {
+        return listVirtualMachineScaleSetVMNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetVMNetworkInterfacesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param virtualmachineIndex The virtual machine index.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetVMNetworkInterfacesSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.listVirtualMachineScaleSetVMNetworkInterfaces(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listVirtualMachineScaleSetVMNetworkInterfacesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listVirtualMachineScaleSetNetworkInterfaces(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listVirtualMachineScaleSetNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @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<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        return listVirtualMachineScaleSetNetworkInterfacesWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetNetworkInterfacesWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        return listVirtualMachineScaleSetNetworkInterfacesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetNetworkInterfacesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetNetworkInterfacesSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.listVirtualMachineScaleSetNetworkInterfaces(resourceGroupName, virtualMachineScaleSetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listVirtualMachineScaleSetNetworkInterfacesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner getVirtualMachineScaleSetNetworkInterface(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName) {
+        return getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceInner> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName), serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName) {
+        return getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        final String expand = null;
+        return service.getVirtualMachineScaleSetNetworkInterface(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = getVirtualMachineScaleSetNetworkInterfaceDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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 NetworkInterfaceInner object if successful.
+     */
+    public NetworkInterfaceInner getVirtualMachineScaleSetNetworkInterface(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String expand) {
+        return getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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<NetworkInterfaceInner> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String expand, final ServiceCallback<NetworkInterfaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand), serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<NetworkInterfaceInner> getVirtualMachineScaleSetNetworkInterfaceAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String expand) {
+        return getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand).map(new Func1<ServiceResponse<NetworkInterfaceInner>, NetworkInterfaceInner>() {
+            @Override
+            public NetworkInterfaceInner call(ServiceResponse<NetworkInterfaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified network interface in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceInner>> getVirtualMachineScaleSetNetworkInterfaceWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.getVirtualMachineScaleSetNetworkInterface(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceInner> clientResponse = getVirtualMachineScaleSetNetworkInterfaceDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceInner> getVirtualMachineScaleSetNetworkInterfaceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceIPConfigurationInner> listVirtualMachineScaleSetIpConfigurations(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName) {
+        ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response = listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName).toBlocking().single();
+        return new PagedList<NetworkInterfaceIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceIPConfigurationInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @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<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final ListOperationCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName) {
+        return listVirtualMachineScaleSetIpConfigurationsWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Page<NetworkInterfaceIPConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceIPConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName) {
+        return listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetIpConfigurationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        final String expand = null;
+        return service.listVirtualMachineScaleSetIpConfigurations(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> result = listVirtualMachineScaleSetIpConfigurationsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceIPConfigurationInner> listVirtualMachineScaleSetIpConfigurations(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String expand) {
+        ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response = listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand).toBlocking().single();
+        return new PagedList<NetworkInterfaceIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceIPConfigurationInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @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<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String expand, final ListOperationCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String expand) {
+        return listVirtualMachineScaleSetIpConfigurationsWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Page<NetworkInterfaceIPConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceIPConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String expand) {
+        return listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetIpConfigurationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param virtualmachineIndex The virtual machine index.
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param networkInterfaceName The name of the network interface.
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.listVirtualMachineScaleSetIpConfigurations(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> result = listVirtualMachineScaleSetIpConfigurationsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @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 NetworkInterfaceIPConfigurationInner object if successful.
+     */
+    public NetworkInterfaceIPConfigurationInner getVirtualMachineScaleSetIpConfiguration(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName) {
+        return getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip 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<NetworkInterfaceIPConfigurationInner> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, final ServiceCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<NetworkInterfaceIPConfigurationInner> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName) {
+        return getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName).map(new Func1<ServiceResponse<NetworkInterfaceIPConfigurationInner>, NetworkInterfaceIPConfigurationInner>() {
+            @Override
+            public NetworkInterfaceIPConfigurationInner call(ServiceResponse<NetworkInterfaceIPConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        final String expand = null;
+        return service.getVirtualMachineScaleSetIpConfiguration(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceIPConfigurationInner> clientResponse = getVirtualMachineScaleSetIpConfigurationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @param expand Expands referenced resources.
+     * @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 NetworkInterfaceIPConfigurationInner object if successful.
+     */
+    public NetworkInterfaceIPConfigurationInner getVirtualMachineScaleSetIpConfiguration(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String expand) {
+        return getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @param expand Expands referenced resources.
+     * @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<NetworkInterfaceIPConfigurationInner> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String expand, final ServiceCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, expand), serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<NetworkInterfaceIPConfigurationInner> getVirtualMachineScaleSetIpConfigurationAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String expand) {
+        return getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, expand).map(new Func1<ServiceResponse<NetworkInterfaceIPConfigurationInner>, NetworkInterfaceIPConfigurationInner>() {
+            @Override
+            public NetworkInterfaceIPConfigurationInner call(ServiceResponse<NetworkInterfaceIPConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the ip configuration.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkInterfaceIPConfigurationInner object
+     */
+    public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> getVirtualMachineScaleSetIpConfigurationWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.getVirtualMachineScaleSetIpConfiguration(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkInterfaceIPConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkInterfaceIPConfigurationInner> clientResponse = getVirtualMachineScaleSetIpConfigurationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkInterfaceIPConfigurationInner> getVirtualMachineScaleSetIpConfigurationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkInterfaceIPConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkInterfaceIPConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @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<NetworkInterfaceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a subscription.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> 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<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in 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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in 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<NetworkInterfaceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in 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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in 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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> 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<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listVirtualMachineScaleSetVMNetworkInterfacesNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @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<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesNextAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetVMNetworkInterfacesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetVMNetworkInterfacesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetVMNetworkInterfacesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetVMNetworkInterfacesNextSinglePageAsync(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.listVirtualMachineScaleSetVMNetworkInterfacesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listVirtualMachineScaleSetVMNetworkInterfacesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listVirtualMachineScaleSetVMNetworkInterfacesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceInner> listVirtualMachineScaleSetNetworkInterfacesNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceInner>> response = listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @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<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesNextAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetNetworkInterfacesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Page<NetworkInterfaceInner>>() {
+                @Override
+                public Page<NetworkInterfaceInner> call(ServiceResponse<Page<NetworkInterfaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetNetworkInterfacesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceInner>>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(ServiceResponse<Page<NetworkInterfaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetNetworkInterfacesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network interfaces in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> listVirtualMachineScaleSetNetworkInterfacesNextSinglePageAsync(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.listVirtualMachineScaleSetNetworkInterfacesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceInner>> result = listVirtualMachineScaleSetNetworkInterfacesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceInner>> listVirtualMachineScaleSetNetworkInterfacesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object if successful.
+     */
+    public PagedList<NetworkInterfaceIPConfigurationInner> listVirtualMachineScaleSetIpConfigurationsNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response = listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkInterfaceIPConfigurationInner>(response.body()) {
+            @Override
+            public Page<NetworkInterfaceIPConfigurationInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @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<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkInterfaceIPConfigurationInner>> serviceFuture, final ListOperationCallback<NetworkInterfaceIPConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<Page<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsNextAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetIpConfigurationsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Page<NetworkInterfaceIPConfigurationInner>>() {
+                @Override
+                public Page<NetworkInterfaceIPConfigurationInner> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+     * @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;NetworkInterfaceIPConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetIpConfigurationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get the specified network interface ip configuration in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkInterfaceIPConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> listVirtualMachineScaleSetIpConfigurationsNextSinglePageAsync(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.listVirtualMachineScaleSetIpConfigurationsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> result = listVirtualMachineScaleSetIpConfigurationsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkInterfaceIPConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkInterfaceIPConfigurationInner>> listVirtualMachineScaleSetIpConfigurationsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkInterfaceIPConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkInterfaceIPConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManagementClientImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManagementClientImpl.java
new file mode 100644
index 000000000000..e6a4bf8e78bc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManagementClientImpl.java
@@ -0,0 +1,4161 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+import com.microsoft.azure.management.network.v2020_04_01.BastionShareableLinkListRequest;
+import com.microsoft.azure.management.network.v2020_04_01.SessionIds;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWanVpnProfileParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+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.Path;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * Initializes a new instance of the NetworkManagementClientImpl class.
+ */
+public class NetworkManagementClientImpl extends AzureServiceClient {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkManagementClientService service;
+    /** 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;
+    }
+
+    /** The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets The subscription credentials which uniquely identify the 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 The subscription credentials which uniquely identify the 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 NetworkManagementClientImpl 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;
+    }
+
+    /** The preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets The preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets The preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public NetworkManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * 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 NetworkManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** Whether a unique x-ms-client-request-id should be generated. 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 Whether a unique x-ms-client-request-id should be generated. 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 Whether a unique x-ms-client-request-id should be generated. 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 NetworkManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The ApplicationGatewaysInner object to access its operations.
+     */
+    private ApplicationGatewaysInner applicationGateways;
+
+    /**
+     * Gets the ApplicationGatewaysInner object to access its operations.
+     * @return the ApplicationGatewaysInner object.
+     */
+    public ApplicationGatewaysInner applicationGateways() {
+        return this.applicationGateways;
+    }
+
+    /**
+     * The ApplicationSecurityGroupsInner object to access its operations.
+     */
+    private ApplicationSecurityGroupsInner applicationSecurityGroups;
+
+    /**
+     * Gets the ApplicationSecurityGroupsInner object to access its operations.
+     * @return the ApplicationSecurityGroupsInner object.
+     */
+    public ApplicationSecurityGroupsInner applicationSecurityGroups() {
+        return this.applicationSecurityGroups;
+    }
+
+    /**
+     * The AvailableDelegationsInner object to access its operations.
+     */
+    private AvailableDelegationsInner availableDelegations;
+
+    /**
+     * Gets the AvailableDelegationsInner object to access its operations.
+     * @return the AvailableDelegationsInner object.
+     */
+    public AvailableDelegationsInner availableDelegations() {
+        return this.availableDelegations;
+    }
+
+    /**
+     * The AvailableResourceGroupDelegationsInner object to access its operations.
+     */
+    private AvailableResourceGroupDelegationsInner availableResourceGroupDelegations;
+
+    /**
+     * Gets the AvailableResourceGroupDelegationsInner object to access its operations.
+     * @return the AvailableResourceGroupDelegationsInner object.
+     */
+    public AvailableResourceGroupDelegationsInner availableResourceGroupDelegations() {
+        return this.availableResourceGroupDelegations;
+    }
+
+    /**
+     * The AvailableServiceAliasesInner object to access its operations.
+     */
+    private AvailableServiceAliasesInner availableServiceAliases;
+
+    /**
+     * Gets the AvailableServiceAliasesInner object to access its operations.
+     * @return the AvailableServiceAliasesInner object.
+     */
+    public AvailableServiceAliasesInner availableServiceAliases() {
+        return this.availableServiceAliases;
+    }
+
+    /**
+     * The AzureFirewallsInner object to access its operations.
+     */
+    private AzureFirewallsInner azureFirewalls;
+
+    /**
+     * Gets the AzureFirewallsInner object to access its operations.
+     * @return the AzureFirewallsInner object.
+     */
+    public AzureFirewallsInner azureFirewalls() {
+        return this.azureFirewalls;
+    }
+
+    /**
+     * The AzureFirewallFqdnTagsInner object to access its operations.
+     */
+    private AzureFirewallFqdnTagsInner azureFirewallFqdnTags;
+
+    /**
+     * Gets the AzureFirewallFqdnTagsInner object to access its operations.
+     * @return the AzureFirewallFqdnTagsInner object.
+     */
+    public AzureFirewallFqdnTagsInner azureFirewallFqdnTags() {
+        return this.azureFirewallFqdnTags;
+    }
+
+    /**
+     * The BastionHostsInner object to access its operations.
+     */
+    private BastionHostsInner bastionHosts;
+
+    /**
+     * Gets the BastionHostsInner object to access its operations.
+     * @return the BastionHostsInner object.
+     */
+    public BastionHostsInner bastionHosts() {
+        return this.bastionHosts;
+    }
+
+    /**
+     * The DdosCustomPoliciesInner object to access its operations.
+     */
+    private DdosCustomPoliciesInner ddosCustomPolicies;
+
+    /**
+     * Gets the DdosCustomPoliciesInner object to access its operations.
+     * @return the DdosCustomPoliciesInner object.
+     */
+    public DdosCustomPoliciesInner ddosCustomPolicies() {
+        return this.ddosCustomPolicies;
+    }
+
+    /**
+     * The DdosProtectionPlansInner object to access its operations.
+     */
+    private DdosProtectionPlansInner ddosProtectionPlans;
+
+    /**
+     * Gets the DdosProtectionPlansInner object to access its operations.
+     * @return the DdosProtectionPlansInner object.
+     */
+    public DdosProtectionPlansInner ddosProtectionPlans() {
+        return this.ddosProtectionPlans;
+    }
+
+    /**
+     * The AvailableEndpointServicesInner object to access its operations.
+     */
+    private AvailableEndpointServicesInner availableEndpointServices;
+
+    /**
+     * Gets the AvailableEndpointServicesInner object to access its operations.
+     * @return the AvailableEndpointServicesInner object.
+     */
+    public AvailableEndpointServicesInner availableEndpointServices() {
+        return this.availableEndpointServices;
+    }
+
+    /**
+     * The ExpressRouteCircuitAuthorizationsInner object to access its operations.
+     */
+    private ExpressRouteCircuitAuthorizationsInner expressRouteCircuitAuthorizations;
+
+    /**
+     * Gets the ExpressRouteCircuitAuthorizationsInner object to access its operations.
+     * @return the ExpressRouteCircuitAuthorizationsInner object.
+     */
+    public ExpressRouteCircuitAuthorizationsInner expressRouteCircuitAuthorizations() {
+        return this.expressRouteCircuitAuthorizations;
+    }
+
+    /**
+     * The ExpressRouteCircuitPeeringsInner object to access its operations.
+     */
+    private ExpressRouteCircuitPeeringsInner expressRouteCircuitPeerings;
+
+    /**
+     * Gets the ExpressRouteCircuitPeeringsInner object to access its operations.
+     * @return the ExpressRouteCircuitPeeringsInner object.
+     */
+    public ExpressRouteCircuitPeeringsInner expressRouteCircuitPeerings() {
+        return this.expressRouteCircuitPeerings;
+    }
+
+    /**
+     * The ExpressRouteCircuitConnectionsInner object to access its operations.
+     */
+    private ExpressRouteCircuitConnectionsInner expressRouteCircuitConnections;
+
+    /**
+     * Gets the ExpressRouteCircuitConnectionsInner object to access its operations.
+     * @return the ExpressRouteCircuitConnectionsInner object.
+     */
+    public ExpressRouteCircuitConnectionsInner expressRouteCircuitConnections() {
+        return this.expressRouteCircuitConnections;
+    }
+
+    /**
+     * The PeerExpressRouteCircuitConnectionsInner object to access its operations.
+     */
+    private PeerExpressRouteCircuitConnectionsInner peerExpressRouteCircuitConnections;
+
+    /**
+     * Gets the PeerExpressRouteCircuitConnectionsInner object to access its operations.
+     * @return the PeerExpressRouteCircuitConnectionsInner object.
+     */
+    public PeerExpressRouteCircuitConnectionsInner peerExpressRouteCircuitConnections() {
+        return this.peerExpressRouteCircuitConnections;
+    }
+
+    /**
+     * The ExpressRouteCircuitsInner object to access its operations.
+     */
+    private ExpressRouteCircuitsInner expressRouteCircuits;
+
+    /**
+     * Gets the ExpressRouteCircuitsInner object to access its operations.
+     * @return the ExpressRouteCircuitsInner object.
+     */
+    public ExpressRouteCircuitsInner expressRouteCircuits() {
+        return this.expressRouteCircuits;
+    }
+
+    /**
+     * The ExpressRouteServiceProvidersInner object to access its operations.
+     */
+    private ExpressRouteServiceProvidersInner expressRouteServiceProviders;
+
+    /**
+     * Gets the ExpressRouteServiceProvidersInner object to access its operations.
+     * @return the ExpressRouteServiceProvidersInner object.
+     */
+    public ExpressRouteServiceProvidersInner expressRouteServiceProviders() {
+        return this.expressRouteServiceProviders;
+    }
+
+    /**
+     * The ExpressRouteCrossConnectionsInner object to access its operations.
+     */
+    private ExpressRouteCrossConnectionsInner expressRouteCrossConnections;
+
+    /**
+     * Gets the ExpressRouteCrossConnectionsInner object to access its operations.
+     * @return the ExpressRouteCrossConnectionsInner object.
+     */
+    public ExpressRouteCrossConnectionsInner expressRouteCrossConnections() {
+        return this.expressRouteCrossConnections;
+    }
+
+    /**
+     * The ExpressRouteCrossConnectionPeeringsInner object to access its operations.
+     */
+    private ExpressRouteCrossConnectionPeeringsInner expressRouteCrossConnectionPeerings;
+
+    /**
+     * Gets the ExpressRouteCrossConnectionPeeringsInner object to access its operations.
+     * @return the ExpressRouteCrossConnectionPeeringsInner object.
+     */
+    public ExpressRouteCrossConnectionPeeringsInner expressRouteCrossConnectionPeerings() {
+        return this.expressRouteCrossConnectionPeerings;
+    }
+
+    /**
+     * The ExpressRoutePortsLocationsInner object to access its operations.
+     */
+    private ExpressRoutePortsLocationsInner expressRoutePortsLocations;
+
+    /**
+     * Gets the ExpressRoutePortsLocationsInner object to access its operations.
+     * @return the ExpressRoutePortsLocationsInner object.
+     */
+    public ExpressRoutePortsLocationsInner expressRoutePortsLocations() {
+        return this.expressRoutePortsLocations;
+    }
+
+    /**
+     * The ExpressRoutePortsInner object to access its operations.
+     */
+    private ExpressRoutePortsInner expressRoutePorts;
+
+    /**
+     * Gets the ExpressRoutePortsInner object to access its operations.
+     * @return the ExpressRoutePortsInner object.
+     */
+    public ExpressRoutePortsInner expressRoutePorts() {
+        return this.expressRoutePorts;
+    }
+
+    /**
+     * The ExpressRouteLinksInner object to access its operations.
+     */
+    private ExpressRouteLinksInner expressRouteLinks;
+
+    /**
+     * Gets the ExpressRouteLinksInner object to access its operations.
+     * @return the ExpressRouteLinksInner object.
+     */
+    public ExpressRouteLinksInner expressRouteLinks() {
+        return this.expressRouteLinks;
+    }
+
+    /**
+     * The FirewallPoliciesInner object to access its operations.
+     */
+    private FirewallPoliciesInner firewallPolicies;
+
+    /**
+     * Gets the FirewallPoliciesInner object to access its operations.
+     * @return the FirewallPoliciesInner object.
+     */
+    public FirewallPoliciesInner firewallPolicies() {
+        return this.firewallPolicies;
+    }
+
+    /**
+     * The FirewallPolicyRuleGroupsInner object to access its operations.
+     */
+    private FirewallPolicyRuleGroupsInner firewallPolicyRuleGroups;
+
+    /**
+     * Gets the FirewallPolicyRuleGroupsInner object to access its operations.
+     * @return the FirewallPolicyRuleGroupsInner object.
+     */
+    public FirewallPolicyRuleGroupsInner firewallPolicyRuleGroups() {
+        return this.firewallPolicyRuleGroups;
+    }
+
+    /**
+     * The IpAllocationsInner object to access its operations.
+     */
+    private IpAllocationsInner ipAllocations;
+
+    /**
+     * Gets the IpAllocationsInner object to access its operations.
+     * @return the IpAllocationsInner object.
+     */
+    public IpAllocationsInner ipAllocations() {
+        return this.ipAllocations;
+    }
+
+    /**
+     * The IpGroupsInner object to access its operations.
+     */
+    private IpGroupsInner ipGroups;
+
+    /**
+     * Gets the IpGroupsInner object to access its operations.
+     * @return the IpGroupsInner object.
+     */
+    public IpGroupsInner ipGroups() {
+        return this.ipGroups;
+    }
+
+    /**
+     * The LoadBalancersInner object to access its operations.
+     */
+    private LoadBalancersInner loadBalancers;
+
+    /**
+     * Gets the LoadBalancersInner object to access its operations.
+     * @return the LoadBalancersInner object.
+     */
+    public LoadBalancersInner loadBalancers() {
+        return this.loadBalancers;
+    }
+
+    /**
+     * The LoadBalancerBackendAddressPoolsInner object to access its operations.
+     */
+    private LoadBalancerBackendAddressPoolsInner loadBalancerBackendAddressPools;
+
+    /**
+     * Gets the LoadBalancerBackendAddressPoolsInner object to access its operations.
+     * @return the LoadBalancerBackendAddressPoolsInner object.
+     */
+    public LoadBalancerBackendAddressPoolsInner loadBalancerBackendAddressPools() {
+        return this.loadBalancerBackendAddressPools;
+    }
+
+    /**
+     * The LoadBalancerFrontendIPConfigurationsInner object to access its operations.
+     */
+    private LoadBalancerFrontendIPConfigurationsInner loadBalancerFrontendIPConfigurations;
+
+    /**
+     * Gets the LoadBalancerFrontendIPConfigurationsInner object to access its operations.
+     * @return the LoadBalancerFrontendIPConfigurationsInner object.
+     */
+    public LoadBalancerFrontendIPConfigurationsInner loadBalancerFrontendIPConfigurations() {
+        return this.loadBalancerFrontendIPConfigurations;
+    }
+
+    /**
+     * The InboundNatRulesInner object to access its operations.
+     */
+    private InboundNatRulesInner inboundNatRules;
+
+    /**
+     * Gets the InboundNatRulesInner object to access its operations.
+     * @return the InboundNatRulesInner object.
+     */
+    public InboundNatRulesInner inboundNatRules() {
+        return this.inboundNatRules;
+    }
+
+    /**
+     * The LoadBalancerLoadBalancingRulesInner object to access its operations.
+     */
+    private LoadBalancerLoadBalancingRulesInner loadBalancerLoadBalancingRules;
+
+    /**
+     * Gets the LoadBalancerLoadBalancingRulesInner object to access its operations.
+     * @return the LoadBalancerLoadBalancingRulesInner object.
+     */
+    public LoadBalancerLoadBalancingRulesInner loadBalancerLoadBalancingRules() {
+        return this.loadBalancerLoadBalancingRules;
+    }
+
+    /**
+     * The LoadBalancerOutboundRulesInner object to access its operations.
+     */
+    private LoadBalancerOutboundRulesInner loadBalancerOutboundRules;
+
+    /**
+     * Gets the LoadBalancerOutboundRulesInner object to access its operations.
+     * @return the LoadBalancerOutboundRulesInner object.
+     */
+    public LoadBalancerOutboundRulesInner loadBalancerOutboundRules() {
+        return this.loadBalancerOutboundRules;
+    }
+
+    /**
+     * The LoadBalancerNetworkInterfacesInner object to access its operations.
+     */
+    private LoadBalancerNetworkInterfacesInner loadBalancerNetworkInterfaces;
+
+    /**
+     * Gets the LoadBalancerNetworkInterfacesInner object to access its operations.
+     * @return the LoadBalancerNetworkInterfacesInner object.
+     */
+    public LoadBalancerNetworkInterfacesInner loadBalancerNetworkInterfaces() {
+        return this.loadBalancerNetworkInterfaces;
+    }
+
+    /**
+     * The LoadBalancerProbesInner object to access its operations.
+     */
+    private LoadBalancerProbesInner loadBalancerProbes;
+
+    /**
+     * Gets the LoadBalancerProbesInner object to access its operations.
+     * @return the LoadBalancerProbesInner object.
+     */
+    public LoadBalancerProbesInner loadBalancerProbes() {
+        return this.loadBalancerProbes;
+    }
+
+    /**
+     * The NatGatewaysInner object to access its operations.
+     */
+    private NatGatewaysInner natGateways;
+
+    /**
+     * Gets the NatGatewaysInner object to access its operations.
+     * @return the NatGatewaysInner object.
+     */
+    public NatGatewaysInner natGateways() {
+        return this.natGateways;
+    }
+
+    /**
+     * The NetworkInterfacesInner object to access its operations.
+     */
+    private NetworkInterfacesInner networkInterfaces;
+
+    /**
+     * Gets the NetworkInterfacesInner object to access its operations.
+     * @return the NetworkInterfacesInner object.
+     */
+    public NetworkInterfacesInner networkInterfaces() {
+        return this.networkInterfaces;
+    }
+
+    /**
+     * The NetworkInterfaceIPConfigurationsInner object to access its operations.
+     */
+    private NetworkInterfaceIPConfigurationsInner networkInterfaceIPConfigurations;
+
+    /**
+     * Gets the NetworkInterfaceIPConfigurationsInner object to access its operations.
+     * @return the NetworkInterfaceIPConfigurationsInner object.
+     */
+    public NetworkInterfaceIPConfigurationsInner networkInterfaceIPConfigurations() {
+        return this.networkInterfaceIPConfigurations;
+    }
+
+    /**
+     * The NetworkInterfaceLoadBalancersInner object to access its operations.
+     */
+    private NetworkInterfaceLoadBalancersInner networkInterfaceLoadBalancers;
+
+    /**
+     * Gets the NetworkInterfaceLoadBalancersInner object to access its operations.
+     * @return the NetworkInterfaceLoadBalancersInner object.
+     */
+    public NetworkInterfaceLoadBalancersInner networkInterfaceLoadBalancers() {
+        return this.networkInterfaceLoadBalancers;
+    }
+
+    /**
+     * The NetworkInterfaceTapConfigurationsInner object to access its operations.
+     */
+    private NetworkInterfaceTapConfigurationsInner networkInterfaceTapConfigurations;
+
+    /**
+     * Gets the NetworkInterfaceTapConfigurationsInner object to access its operations.
+     * @return the NetworkInterfaceTapConfigurationsInner object.
+     */
+    public NetworkInterfaceTapConfigurationsInner networkInterfaceTapConfigurations() {
+        return this.networkInterfaceTapConfigurations;
+    }
+
+    /**
+     * The NetworkProfilesInner object to access its operations.
+     */
+    private NetworkProfilesInner networkProfiles;
+
+    /**
+     * Gets the NetworkProfilesInner object to access its operations.
+     * @return the NetworkProfilesInner object.
+     */
+    public NetworkProfilesInner networkProfiles() {
+        return this.networkProfiles;
+    }
+
+    /**
+     * The NetworkSecurityGroupsInner object to access its operations.
+     */
+    private NetworkSecurityGroupsInner networkSecurityGroups;
+
+    /**
+     * Gets the NetworkSecurityGroupsInner object to access its operations.
+     * @return the NetworkSecurityGroupsInner object.
+     */
+    public NetworkSecurityGroupsInner networkSecurityGroups() {
+        return this.networkSecurityGroups;
+    }
+
+    /**
+     * The SecurityRulesInner object to access its operations.
+     */
+    private SecurityRulesInner securityRules;
+
+    /**
+     * Gets the SecurityRulesInner object to access its operations.
+     * @return the SecurityRulesInner object.
+     */
+    public SecurityRulesInner securityRules() {
+        return this.securityRules;
+    }
+
+    /**
+     * The DefaultSecurityRulesInner object to access its operations.
+     */
+    private DefaultSecurityRulesInner defaultSecurityRules;
+
+    /**
+     * Gets the DefaultSecurityRulesInner object to access its operations.
+     * @return the DefaultSecurityRulesInner object.
+     */
+    public DefaultSecurityRulesInner defaultSecurityRules() {
+        return this.defaultSecurityRules;
+    }
+
+    /**
+     * The NetworkVirtualAppliancesInner object to access its operations.
+     */
+    private NetworkVirtualAppliancesInner networkVirtualAppliances;
+
+    /**
+     * Gets the NetworkVirtualAppliancesInner object to access its operations.
+     * @return the NetworkVirtualAppliancesInner object.
+     */
+    public NetworkVirtualAppliancesInner networkVirtualAppliances() {
+        return this.networkVirtualAppliances;
+    }
+
+    /**
+     * The NetworkWatchersInner object to access its operations.
+     */
+    private NetworkWatchersInner networkWatchers;
+
+    /**
+     * Gets the NetworkWatchersInner object to access its operations.
+     * @return the NetworkWatchersInner object.
+     */
+    public NetworkWatchersInner networkWatchers() {
+        return this.networkWatchers;
+    }
+
+    /**
+     * The PacketCapturesInner object to access its operations.
+     */
+    private PacketCapturesInner packetCaptures;
+
+    /**
+     * Gets the PacketCapturesInner object to access its operations.
+     * @return the PacketCapturesInner object.
+     */
+    public PacketCapturesInner packetCaptures() {
+        return this.packetCaptures;
+    }
+
+    /**
+     * The ConnectionMonitorsInner object to access its operations.
+     */
+    private ConnectionMonitorsInner connectionMonitors;
+
+    /**
+     * Gets the ConnectionMonitorsInner object to access its operations.
+     * @return the ConnectionMonitorsInner object.
+     */
+    public ConnectionMonitorsInner connectionMonitors() {
+        return this.connectionMonitors;
+    }
+
+    /**
+     * The FlowLogsInner object to access its operations.
+     */
+    private FlowLogsInner flowLogs;
+
+    /**
+     * Gets the FlowLogsInner object to access its operations.
+     * @return the FlowLogsInner object.
+     */
+    public FlowLogsInner flowLogs() {
+        return this.flowLogs;
+    }
+
+    /**
+     * 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 PrivateEndpointsInner object to access its operations.
+     */
+    private PrivateEndpointsInner privateEndpoints;
+
+    /**
+     * Gets the PrivateEndpointsInner object to access its operations.
+     * @return the PrivateEndpointsInner object.
+     */
+    public PrivateEndpointsInner privateEndpoints() {
+        return this.privateEndpoints;
+    }
+
+    /**
+     * The AvailablePrivateEndpointTypesInner object to access its operations.
+     */
+    private AvailablePrivateEndpointTypesInner availablePrivateEndpointTypes;
+
+    /**
+     * Gets the AvailablePrivateEndpointTypesInner object to access its operations.
+     * @return the AvailablePrivateEndpointTypesInner object.
+     */
+    public AvailablePrivateEndpointTypesInner availablePrivateEndpointTypes() {
+        return this.availablePrivateEndpointTypes;
+    }
+
+    /**
+     * The PrivateDnsZoneGroupsInner object to access its operations.
+     */
+    private PrivateDnsZoneGroupsInner privateDnsZoneGroups;
+
+    /**
+     * Gets the PrivateDnsZoneGroupsInner object to access its operations.
+     * @return the PrivateDnsZoneGroupsInner object.
+     */
+    public PrivateDnsZoneGroupsInner privateDnsZoneGroups() {
+        return this.privateDnsZoneGroups;
+    }
+
+    /**
+     * The PrivateLinkServicesInner object to access its operations.
+     */
+    private PrivateLinkServicesInner privateLinkServices;
+
+    /**
+     * Gets the PrivateLinkServicesInner object to access its operations.
+     * @return the PrivateLinkServicesInner object.
+     */
+    public PrivateLinkServicesInner privateLinkServices() {
+        return this.privateLinkServices;
+    }
+
+    /**
+     * The PublicIPAddressesInner object to access its operations.
+     */
+    private PublicIPAddressesInner publicIPAddresses;
+
+    /**
+     * Gets the PublicIPAddressesInner object to access its operations.
+     * @return the PublicIPAddressesInner object.
+     */
+    public PublicIPAddressesInner publicIPAddresses() {
+        return this.publicIPAddresses;
+    }
+
+    /**
+     * The PublicIPPrefixesInner object to access its operations.
+     */
+    private PublicIPPrefixesInner publicIPPrefixes;
+
+    /**
+     * Gets the PublicIPPrefixesInner object to access its operations.
+     * @return the PublicIPPrefixesInner object.
+     */
+    public PublicIPPrefixesInner publicIPPrefixes() {
+        return this.publicIPPrefixes;
+    }
+
+    /**
+     * The RouteFiltersInner object to access its operations.
+     */
+    private RouteFiltersInner routeFilters;
+
+    /**
+     * Gets the RouteFiltersInner object to access its operations.
+     * @return the RouteFiltersInner object.
+     */
+    public RouteFiltersInner routeFilters() {
+        return this.routeFilters;
+    }
+
+    /**
+     * The RouteFilterRulesInner object to access its operations.
+     */
+    private RouteFilterRulesInner routeFilterRules;
+
+    /**
+     * Gets the RouteFilterRulesInner object to access its operations.
+     * @return the RouteFilterRulesInner object.
+     */
+    public RouteFilterRulesInner routeFilterRules() {
+        return this.routeFilterRules;
+    }
+
+    /**
+     * The RouteTablesInner object to access its operations.
+     */
+    private RouteTablesInner routeTables;
+
+    /**
+     * Gets the RouteTablesInner object to access its operations.
+     * @return the RouteTablesInner object.
+     */
+    public RouteTablesInner routeTables() {
+        return this.routeTables;
+    }
+
+    /**
+     * The RoutesInner object to access its operations.
+     */
+    private RoutesInner routes;
+
+    /**
+     * Gets the RoutesInner object to access its operations.
+     * @return the RoutesInner object.
+     */
+    public RoutesInner routes() {
+        return this.routes;
+    }
+
+    /**
+     * The SecurityPartnerProvidersInner object to access its operations.
+     */
+    private SecurityPartnerProvidersInner securityPartnerProviders;
+
+    /**
+     * Gets the SecurityPartnerProvidersInner object to access its operations.
+     * @return the SecurityPartnerProvidersInner object.
+     */
+    public SecurityPartnerProvidersInner securityPartnerProviders() {
+        return this.securityPartnerProviders;
+    }
+
+    /**
+     * The BgpServiceCommunitiesInner object to access its operations.
+     */
+    private BgpServiceCommunitiesInner bgpServiceCommunities;
+
+    /**
+     * Gets the BgpServiceCommunitiesInner object to access its operations.
+     * @return the BgpServiceCommunitiesInner object.
+     */
+    public BgpServiceCommunitiesInner bgpServiceCommunities() {
+        return this.bgpServiceCommunities;
+    }
+
+    /**
+     * The ServiceEndpointPoliciesInner object to access its operations.
+     */
+    private ServiceEndpointPoliciesInner serviceEndpointPolicies;
+
+    /**
+     * Gets the ServiceEndpointPoliciesInner object to access its operations.
+     * @return the ServiceEndpointPoliciesInner object.
+     */
+    public ServiceEndpointPoliciesInner serviceEndpointPolicies() {
+        return this.serviceEndpointPolicies;
+    }
+
+    /**
+     * The ServiceEndpointPolicyDefinitionsInner object to access its operations.
+     */
+    private ServiceEndpointPolicyDefinitionsInner serviceEndpointPolicyDefinitions;
+
+    /**
+     * Gets the ServiceEndpointPolicyDefinitionsInner object to access its operations.
+     * @return the ServiceEndpointPolicyDefinitionsInner object.
+     */
+    public ServiceEndpointPolicyDefinitionsInner serviceEndpointPolicyDefinitions() {
+        return this.serviceEndpointPolicyDefinitions;
+    }
+
+    /**
+     * The ServiceTagsInner object to access its operations.
+     */
+    private ServiceTagsInner serviceTags;
+
+    /**
+     * Gets the ServiceTagsInner object to access its operations.
+     * @return the ServiceTagsInner object.
+     */
+    public ServiceTagsInner serviceTags() {
+        return this.serviceTags;
+    }
+
+    /**
+     * The UsagesInner object to access its operations.
+     */
+    private UsagesInner usages;
+
+    /**
+     * Gets the UsagesInner object to access its operations.
+     * @return the UsagesInner object.
+     */
+    public UsagesInner usages() {
+        return this.usages;
+    }
+
+    /**
+     * The VirtualNetworksInner object to access its operations.
+     */
+    private VirtualNetworksInner virtualNetworks;
+
+    /**
+     * Gets the VirtualNetworksInner object to access its operations.
+     * @return the VirtualNetworksInner object.
+     */
+    public VirtualNetworksInner virtualNetworks() {
+        return this.virtualNetworks;
+    }
+
+    /**
+     * The SubnetsInner object to access its operations.
+     */
+    private SubnetsInner subnets;
+
+    /**
+     * Gets the SubnetsInner object to access its operations.
+     * @return the SubnetsInner object.
+     */
+    public SubnetsInner subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * The ResourceNavigationLinksInner object to access its operations.
+     */
+    private ResourceNavigationLinksInner resourceNavigationLinks;
+
+    /**
+     * Gets the ResourceNavigationLinksInner object to access its operations.
+     * @return the ResourceNavigationLinksInner object.
+     */
+    public ResourceNavigationLinksInner resourceNavigationLinks() {
+        return this.resourceNavigationLinks;
+    }
+
+    /**
+     * The ServiceAssociationLinksInner object to access its operations.
+     */
+    private ServiceAssociationLinksInner serviceAssociationLinks;
+
+    /**
+     * Gets the ServiceAssociationLinksInner object to access its operations.
+     * @return the ServiceAssociationLinksInner object.
+     */
+    public ServiceAssociationLinksInner serviceAssociationLinks() {
+        return this.serviceAssociationLinks;
+    }
+
+    /**
+     * The VirtualNetworkPeeringsInner object to access its operations.
+     */
+    private VirtualNetworkPeeringsInner virtualNetworkPeerings;
+
+    /**
+     * Gets the VirtualNetworkPeeringsInner object to access its operations.
+     * @return the VirtualNetworkPeeringsInner object.
+     */
+    public VirtualNetworkPeeringsInner virtualNetworkPeerings() {
+        return this.virtualNetworkPeerings;
+    }
+
+    /**
+     * The VirtualNetworkGatewaysInner object to access its operations.
+     */
+    private VirtualNetworkGatewaysInner virtualNetworkGateways;
+
+    /**
+     * Gets the VirtualNetworkGatewaysInner object to access its operations.
+     * @return the VirtualNetworkGatewaysInner object.
+     */
+    public VirtualNetworkGatewaysInner virtualNetworkGateways() {
+        return this.virtualNetworkGateways;
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionsInner object to access its operations.
+     */
+    private VirtualNetworkGatewayConnectionsInner virtualNetworkGatewayConnections;
+
+    /**
+     * Gets the VirtualNetworkGatewayConnectionsInner object to access its operations.
+     * @return the VirtualNetworkGatewayConnectionsInner object.
+     */
+    public VirtualNetworkGatewayConnectionsInner virtualNetworkGatewayConnections() {
+        return this.virtualNetworkGatewayConnections;
+    }
+
+    /**
+     * The LocalNetworkGatewaysInner object to access its operations.
+     */
+    private LocalNetworkGatewaysInner localNetworkGateways;
+
+    /**
+     * Gets the LocalNetworkGatewaysInner object to access its operations.
+     * @return the LocalNetworkGatewaysInner object.
+     */
+    public LocalNetworkGatewaysInner localNetworkGateways() {
+        return this.localNetworkGateways;
+    }
+
+    /**
+     * The VirtualNetworkTapsInner object to access its operations.
+     */
+    private VirtualNetworkTapsInner virtualNetworkTaps;
+
+    /**
+     * Gets the VirtualNetworkTapsInner object to access its operations.
+     * @return the VirtualNetworkTapsInner object.
+     */
+    public VirtualNetworkTapsInner virtualNetworkTaps() {
+        return this.virtualNetworkTaps;
+    }
+
+    /**
+     * The VirtualRoutersInner object to access its operations.
+     */
+    private VirtualRoutersInner virtualRouters;
+
+    /**
+     * Gets the VirtualRoutersInner object to access its operations.
+     * @return the VirtualRoutersInner object.
+     */
+    public VirtualRoutersInner virtualRouters() {
+        return this.virtualRouters;
+    }
+
+    /**
+     * The VirtualRouterPeeringsInner object to access its operations.
+     */
+    private VirtualRouterPeeringsInner virtualRouterPeerings;
+
+    /**
+     * Gets the VirtualRouterPeeringsInner object to access its operations.
+     * @return the VirtualRouterPeeringsInner object.
+     */
+    public VirtualRouterPeeringsInner virtualRouterPeerings() {
+        return this.virtualRouterPeerings;
+    }
+
+    /**
+     * The VirtualWansInner object to access its operations.
+     */
+    private VirtualWansInner virtualWans;
+
+    /**
+     * Gets the VirtualWansInner object to access its operations.
+     * @return the VirtualWansInner object.
+     */
+    public VirtualWansInner virtualWans() {
+        return this.virtualWans;
+    }
+
+    /**
+     * The VpnSitesInner object to access its operations.
+     */
+    private VpnSitesInner vpnSites;
+
+    /**
+     * Gets the VpnSitesInner object to access its operations.
+     * @return the VpnSitesInner object.
+     */
+    public VpnSitesInner vpnSites() {
+        return this.vpnSites;
+    }
+
+    /**
+     * The VpnSiteLinksInner object to access its operations.
+     */
+    private VpnSiteLinksInner vpnSiteLinks;
+
+    /**
+     * Gets the VpnSiteLinksInner object to access its operations.
+     * @return the VpnSiteLinksInner object.
+     */
+    public VpnSiteLinksInner vpnSiteLinks() {
+        return this.vpnSiteLinks;
+    }
+
+    /**
+     * The VpnSitesConfigurationsInner object to access its operations.
+     */
+    private VpnSitesConfigurationsInner vpnSitesConfigurations;
+
+    /**
+     * Gets the VpnSitesConfigurationsInner object to access its operations.
+     * @return the VpnSitesConfigurationsInner object.
+     */
+    public VpnSitesConfigurationsInner vpnSitesConfigurations() {
+        return this.vpnSitesConfigurations;
+    }
+
+    /**
+     * The VpnServerConfigurationsInner object to access its operations.
+     */
+    private VpnServerConfigurationsInner vpnServerConfigurations;
+
+    /**
+     * Gets the VpnServerConfigurationsInner object to access its operations.
+     * @return the VpnServerConfigurationsInner object.
+     */
+    public VpnServerConfigurationsInner vpnServerConfigurations() {
+        return this.vpnServerConfigurations;
+    }
+
+    /**
+     * The VirtualHubsInner object to access its operations.
+     */
+    private VirtualHubsInner virtualHubs;
+
+    /**
+     * Gets the VirtualHubsInner object to access its operations.
+     * @return the VirtualHubsInner object.
+     */
+    public VirtualHubsInner virtualHubs() {
+        return this.virtualHubs;
+    }
+
+    /**
+     * The HubVirtualNetworkConnectionsInner object to access its operations.
+     */
+    private HubVirtualNetworkConnectionsInner hubVirtualNetworkConnections;
+
+    /**
+     * Gets the HubVirtualNetworkConnectionsInner object to access its operations.
+     * @return the HubVirtualNetworkConnectionsInner object.
+     */
+    public HubVirtualNetworkConnectionsInner hubVirtualNetworkConnections() {
+        return this.hubVirtualNetworkConnections;
+    }
+
+    /**
+     * The VpnGatewaysInner object to access its operations.
+     */
+    private VpnGatewaysInner vpnGateways;
+
+    /**
+     * Gets the VpnGatewaysInner object to access its operations.
+     * @return the VpnGatewaysInner object.
+     */
+    public VpnGatewaysInner vpnGateways() {
+        return this.vpnGateways;
+    }
+
+    /**
+     * The VpnConnectionsInner object to access its operations.
+     */
+    private VpnConnectionsInner vpnConnections;
+
+    /**
+     * Gets the VpnConnectionsInner object to access its operations.
+     * @return the VpnConnectionsInner object.
+     */
+    public VpnConnectionsInner vpnConnections() {
+        return this.vpnConnections;
+    }
+
+    /**
+     * The VpnSiteLinkConnectionsInner object to access its operations.
+     */
+    private VpnSiteLinkConnectionsInner vpnSiteLinkConnections;
+
+    /**
+     * Gets the VpnSiteLinkConnectionsInner object to access its operations.
+     * @return the VpnSiteLinkConnectionsInner object.
+     */
+    public VpnSiteLinkConnectionsInner vpnSiteLinkConnections() {
+        return this.vpnSiteLinkConnections;
+    }
+
+    /**
+     * The VpnLinkConnectionsInner object to access its operations.
+     */
+    private VpnLinkConnectionsInner vpnLinkConnections;
+
+    /**
+     * Gets the VpnLinkConnectionsInner object to access its operations.
+     * @return the VpnLinkConnectionsInner object.
+     */
+    public VpnLinkConnectionsInner vpnLinkConnections() {
+        return this.vpnLinkConnections;
+    }
+
+    /**
+     * The P2sVpnGatewaysInner object to access its operations.
+     */
+    private P2sVpnGatewaysInner p2sVpnGateways;
+
+    /**
+     * Gets the P2sVpnGatewaysInner object to access its operations.
+     * @return the P2sVpnGatewaysInner object.
+     */
+    public P2sVpnGatewaysInner p2sVpnGateways() {
+        return this.p2sVpnGateways;
+    }
+
+    /**
+     * The VpnServerConfigurationsAssociatedWithVirtualWansInner object to access its operations.
+     */
+    private VpnServerConfigurationsAssociatedWithVirtualWansInner vpnServerConfigurationsAssociatedWithVirtualWans;
+
+    /**
+     * Gets the VpnServerConfigurationsAssociatedWithVirtualWansInner object to access its operations.
+     * @return the VpnServerConfigurationsAssociatedWithVirtualWansInner object.
+     */
+    public VpnServerConfigurationsAssociatedWithVirtualWansInner vpnServerConfigurationsAssociatedWithVirtualWans() {
+        return this.vpnServerConfigurationsAssociatedWithVirtualWans;
+    }
+
+    /**
+     * The VirtualHubRouteTableV2sInner object to access its operations.
+     */
+    private VirtualHubRouteTableV2sInner virtualHubRouteTableV2s;
+
+    /**
+     * Gets the VirtualHubRouteTableV2sInner object to access its operations.
+     * @return the VirtualHubRouteTableV2sInner object.
+     */
+    public VirtualHubRouteTableV2sInner virtualHubRouteTableV2s() {
+        return this.virtualHubRouteTableV2s;
+    }
+
+    /**
+     * The ExpressRouteGatewaysInner object to access its operations.
+     */
+    private ExpressRouteGatewaysInner expressRouteGateways;
+
+    /**
+     * Gets the ExpressRouteGatewaysInner object to access its operations.
+     * @return the ExpressRouteGatewaysInner object.
+     */
+    public ExpressRouteGatewaysInner expressRouteGateways() {
+        return this.expressRouteGateways;
+    }
+
+    /**
+     * The ExpressRouteConnectionsInner object to access its operations.
+     */
+    private ExpressRouteConnectionsInner expressRouteConnections;
+
+    /**
+     * Gets the ExpressRouteConnectionsInner object to access its operations.
+     * @return the ExpressRouteConnectionsInner object.
+     */
+    public ExpressRouteConnectionsInner expressRouteConnections() {
+        return this.expressRouteConnections;
+    }
+
+    /**
+     * The HubRouteTablesInner object to access its operations.
+     */
+    private HubRouteTablesInner hubRouteTables;
+
+    /**
+     * Gets the HubRouteTablesInner object to access its operations.
+     * @return the HubRouteTablesInner object.
+     */
+    public HubRouteTablesInner hubRouteTables() {
+        return this.hubRouteTables;
+    }
+
+    /**
+     * The WebApplicationFirewallPoliciesInner object to access its operations.
+     */
+    private WebApplicationFirewallPoliciesInner webApplicationFirewallPolicies;
+
+    /**
+     * Gets the WebApplicationFirewallPoliciesInner object to access its operations.
+     * @return the WebApplicationFirewallPoliciesInner object.
+     */
+    public WebApplicationFirewallPoliciesInner webApplicationFirewallPolicies() {
+        return this.webApplicationFirewallPolicies;
+    }
+
+    /**
+     * Initializes an instance of NetworkManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public NetworkManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of NetworkManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public NetworkManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of NetworkManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public NetworkManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2020-04-01";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.applicationGateways = new ApplicationGatewaysInner(restClient().retrofit(), this);
+        this.applicationSecurityGroups = new ApplicationSecurityGroupsInner(restClient().retrofit(), this);
+        this.availableDelegations = new AvailableDelegationsInner(restClient().retrofit(), this);
+        this.availableResourceGroupDelegations = new AvailableResourceGroupDelegationsInner(restClient().retrofit(), this);
+        this.availableServiceAliases = new AvailableServiceAliasesInner(restClient().retrofit(), this);
+        this.azureFirewalls = new AzureFirewallsInner(restClient().retrofit(), this);
+        this.azureFirewallFqdnTags = new AzureFirewallFqdnTagsInner(restClient().retrofit(), this);
+        this.bastionHosts = new BastionHostsInner(restClient().retrofit(), this);
+        this.ddosCustomPolicies = new DdosCustomPoliciesInner(restClient().retrofit(), this);
+        this.ddosProtectionPlans = new DdosProtectionPlansInner(restClient().retrofit(), this);
+        this.availableEndpointServices = new AvailableEndpointServicesInner(restClient().retrofit(), this);
+        this.expressRouteCircuitAuthorizations = new ExpressRouteCircuitAuthorizationsInner(restClient().retrofit(), this);
+        this.expressRouteCircuitPeerings = new ExpressRouteCircuitPeeringsInner(restClient().retrofit(), this);
+        this.expressRouteCircuitConnections = new ExpressRouteCircuitConnectionsInner(restClient().retrofit(), this);
+        this.peerExpressRouteCircuitConnections = new PeerExpressRouteCircuitConnectionsInner(restClient().retrofit(), this);
+        this.expressRouteCircuits = new ExpressRouteCircuitsInner(restClient().retrofit(), this);
+        this.expressRouteServiceProviders = new ExpressRouteServiceProvidersInner(restClient().retrofit(), this);
+        this.expressRouteCrossConnections = new ExpressRouteCrossConnectionsInner(restClient().retrofit(), this);
+        this.expressRouteCrossConnectionPeerings = new ExpressRouteCrossConnectionPeeringsInner(restClient().retrofit(), this);
+        this.expressRoutePortsLocations = new ExpressRoutePortsLocationsInner(restClient().retrofit(), this);
+        this.expressRoutePorts = new ExpressRoutePortsInner(restClient().retrofit(), this);
+        this.expressRouteLinks = new ExpressRouteLinksInner(restClient().retrofit(), this);
+        this.firewallPolicies = new FirewallPoliciesInner(restClient().retrofit(), this);
+        this.firewallPolicyRuleGroups = new FirewallPolicyRuleGroupsInner(restClient().retrofit(), this);
+        this.ipAllocations = new IpAllocationsInner(restClient().retrofit(), this);
+        this.ipGroups = new IpGroupsInner(restClient().retrofit(), this);
+        this.loadBalancers = new LoadBalancersInner(restClient().retrofit(), this);
+        this.loadBalancerBackendAddressPools = new LoadBalancerBackendAddressPoolsInner(restClient().retrofit(), this);
+        this.loadBalancerFrontendIPConfigurations = new LoadBalancerFrontendIPConfigurationsInner(restClient().retrofit(), this);
+        this.inboundNatRules = new InboundNatRulesInner(restClient().retrofit(), this);
+        this.loadBalancerLoadBalancingRules = new LoadBalancerLoadBalancingRulesInner(restClient().retrofit(), this);
+        this.loadBalancerOutboundRules = new LoadBalancerOutboundRulesInner(restClient().retrofit(), this);
+        this.loadBalancerNetworkInterfaces = new LoadBalancerNetworkInterfacesInner(restClient().retrofit(), this);
+        this.loadBalancerProbes = new LoadBalancerProbesInner(restClient().retrofit(), this);
+        this.natGateways = new NatGatewaysInner(restClient().retrofit(), this);
+        this.networkInterfaces = new NetworkInterfacesInner(restClient().retrofit(), this);
+        this.networkInterfaceIPConfigurations = new NetworkInterfaceIPConfigurationsInner(restClient().retrofit(), this);
+        this.networkInterfaceLoadBalancers = new NetworkInterfaceLoadBalancersInner(restClient().retrofit(), this);
+        this.networkInterfaceTapConfigurations = new NetworkInterfaceTapConfigurationsInner(restClient().retrofit(), this);
+        this.networkProfiles = new NetworkProfilesInner(restClient().retrofit(), this);
+        this.networkSecurityGroups = new NetworkSecurityGroupsInner(restClient().retrofit(), this);
+        this.securityRules = new SecurityRulesInner(restClient().retrofit(), this);
+        this.defaultSecurityRules = new DefaultSecurityRulesInner(restClient().retrofit(), this);
+        this.networkVirtualAppliances = new NetworkVirtualAppliancesInner(restClient().retrofit(), this);
+        this.networkWatchers = new NetworkWatchersInner(restClient().retrofit(), this);
+        this.packetCaptures = new PacketCapturesInner(restClient().retrofit(), this);
+        this.connectionMonitors = new ConnectionMonitorsInner(restClient().retrofit(), this);
+        this.flowLogs = new FlowLogsInner(restClient().retrofit(), this);
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.privateEndpoints = new PrivateEndpointsInner(restClient().retrofit(), this);
+        this.availablePrivateEndpointTypes = new AvailablePrivateEndpointTypesInner(restClient().retrofit(), this);
+        this.privateDnsZoneGroups = new PrivateDnsZoneGroupsInner(restClient().retrofit(), this);
+        this.privateLinkServices = new PrivateLinkServicesInner(restClient().retrofit(), this);
+        this.publicIPAddresses = new PublicIPAddressesInner(restClient().retrofit(), this);
+        this.publicIPPrefixes = new PublicIPPrefixesInner(restClient().retrofit(), this);
+        this.routeFilters = new RouteFiltersInner(restClient().retrofit(), this);
+        this.routeFilterRules = new RouteFilterRulesInner(restClient().retrofit(), this);
+        this.routeTables = new RouteTablesInner(restClient().retrofit(), this);
+        this.routes = new RoutesInner(restClient().retrofit(), this);
+        this.securityPartnerProviders = new SecurityPartnerProvidersInner(restClient().retrofit(), this);
+        this.bgpServiceCommunities = new BgpServiceCommunitiesInner(restClient().retrofit(), this);
+        this.serviceEndpointPolicies = new ServiceEndpointPoliciesInner(restClient().retrofit(), this);
+        this.serviceEndpointPolicyDefinitions = new ServiceEndpointPolicyDefinitionsInner(restClient().retrofit(), this);
+        this.serviceTags = new ServiceTagsInner(restClient().retrofit(), this);
+        this.usages = new UsagesInner(restClient().retrofit(), this);
+        this.virtualNetworks = new VirtualNetworksInner(restClient().retrofit(), this);
+        this.subnets = new SubnetsInner(restClient().retrofit(), this);
+        this.resourceNavigationLinks = new ResourceNavigationLinksInner(restClient().retrofit(), this);
+        this.serviceAssociationLinks = new ServiceAssociationLinksInner(restClient().retrofit(), this);
+        this.virtualNetworkPeerings = new VirtualNetworkPeeringsInner(restClient().retrofit(), this);
+        this.virtualNetworkGateways = new VirtualNetworkGatewaysInner(restClient().retrofit(), this);
+        this.virtualNetworkGatewayConnections = new VirtualNetworkGatewayConnectionsInner(restClient().retrofit(), this);
+        this.localNetworkGateways = new LocalNetworkGatewaysInner(restClient().retrofit(), this);
+        this.virtualNetworkTaps = new VirtualNetworkTapsInner(restClient().retrofit(), this);
+        this.virtualRouters = new VirtualRoutersInner(restClient().retrofit(), this);
+        this.virtualRouterPeerings = new VirtualRouterPeeringsInner(restClient().retrofit(), this);
+        this.virtualWans = new VirtualWansInner(restClient().retrofit(), this);
+        this.vpnSites = new VpnSitesInner(restClient().retrofit(), this);
+        this.vpnSiteLinks = new VpnSiteLinksInner(restClient().retrofit(), this);
+        this.vpnSitesConfigurations = new VpnSitesConfigurationsInner(restClient().retrofit(), this);
+        this.vpnServerConfigurations = new VpnServerConfigurationsInner(restClient().retrofit(), this);
+        this.virtualHubs = new VirtualHubsInner(restClient().retrofit(), this);
+        this.hubVirtualNetworkConnections = new HubVirtualNetworkConnectionsInner(restClient().retrofit(), this);
+        this.vpnGateways = new VpnGatewaysInner(restClient().retrofit(), this);
+        this.vpnConnections = new VpnConnectionsInner(restClient().retrofit(), this);
+        this.vpnSiteLinkConnections = new VpnSiteLinkConnectionsInner(restClient().retrofit(), this);
+        this.vpnLinkConnections = new VpnLinkConnectionsInner(restClient().retrofit(), this);
+        this.p2sVpnGateways = new P2sVpnGatewaysInner(restClient().retrofit(), this);
+        this.vpnServerConfigurationsAssociatedWithVirtualWans = new VpnServerConfigurationsAssociatedWithVirtualWansInner(restClient().retrofit(), this);
+        this.virtualHubRouteTableV2s = new VirtualHubRouteTableV2sInner(restClient().retrofit(), this);
+        this.expressRouteGateways = new ExpressRouteGatewaysInner(restClient().retrofit(), this);
+        this.expressRouteConnections = new ExpressRouteConnectionsInner(restClient().retrofit(), this);
+        this.hubRouteTables = new HubRouteTablesInner(restClient().retrofit(), this);
+        this.webApplicationFirewallPolicies = new WebApplicationFirewallPoliciesInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+        initializeService();
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "NetworkManagementClient", "2020-04-01");
+    }
+
+    private void initializeService() {
+        service = restClient().retrofit().create(NetworkManagementClientService.class);
+    }
+
+    /**
+     * The interface defining all the services for NetworkManagementClient to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkManagementClientService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient putBastionShareableLink" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/createShareableLinks")
+        Observable<Response<ResponseBody>> putBastionShareableLink(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BastionShareableLinkListRequest bslRequest, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient beginPutBastionShareableLink" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/createShareableLinks")
+        Observable<Response<ResponseBody>> beginPutBastionShareableLink(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BastionShareableLinkListRequest bslRequest, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient deleteBastionShareableLink" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/deleteShareableLinks")
+        Observable<Response<ResponseBody>> deleteBastionShareableLink(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BastionShareableLinkListRequest bslRequest, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient beginDeleteBastionShareableLink" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/deleteShareableLinks")
+        Observable<Response<ResponseBody>> beginDeleteBastionShareableLink(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BastionShareableLinkListRequest bslRequest, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient getBastionShareableLink" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/getShareableLinks")
+        Observable<Response<ResponseBody>> getBastionShareableLink(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BastionShareableLinkListRequest bslRequest, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient getActiveSessions" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/getActiveSessions")
+        Observable<Response<ResponseBody>> getActiveSessions(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @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.network.v2020_04_01.NetworkManagementClient beginGetActiveSessions" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/getActiveSessions")
+        Observable<Response<ResponseBody>> beginGetActiveSessions(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @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.network.v2020_04_01.NetworkManagementClient disconnectActiveSessions" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/disconnectActiveSessions")
+        Observable<Response<ResponseBody>> disconnectActiveSessions(@Path("resourceGroupName") String resourceGroupName, @Path("bastionHostName") String bastionHostName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body SessionIds sessionIds, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkManagementClient checkDnsNameAvailability" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability")
+        Observable<Response<ResponseBody>> checkDnsNameAvailability(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("domainNameLabel") String domainNameLabel, @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.network.v2020_04_01.NetworkManagementClient supportedSecurityProviders" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/supportedSecurityProviders")
+        Observable<Response<ResponseBody>> supportedSecurityProviders(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @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.network.v2020_04_01.NetworkManagementClient generatevirtualwanvpnserverconfigurationvpnprofile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/GenerateVpnProfile")
+        Observable<Response<ResponseBody>> generatevirtualwanvpnserverconfigurationvpnprofile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @Body VirtualWanVpnProfileParameters vpnClientParams, @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.network.v2020_04_01.NetworkManagementClient beginGeneratevirtualwanvpnserverconfigurationvpnprofile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/GenerateVpnProfile")
+        Observable<Response<ResponseBody>> beginGeneratevirtualwanvpnserverconfigurationvpnprofile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @Body VirtualWanVpnProfileParameters vpnClientParams, @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.network.v2020_04_01.NetworkManagementClient putBastionShareableLinkNext" })
+        @GET
+        Observable<Response<ResponseBody>> putBastionShareableLinkNext(@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.network.v2020_04_01.NetworkManagementClient beginPutBastionShareableLinkNext" })
+        @GET
+        Observable<Response<ResponseBody>> beginPutBastionShareableLinkNext(@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.network.v2020_04_01.NetworkManagementClient getBastionShareableLinkNext" })
+        @GET
+        Observable<Response<ResponseBody>> getBastionShareableLinkNext(@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.network.v2020_04_01.NetworkManagementClient getActiveSessionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> getActiveSessionsNext(@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.network.v2020_04_01.NetworkManagementClient beginGetActiveSessionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> beginGetActiveSessionsNext(@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.network.v2020_04_01.NetworkManagementClient disconnectActiveSessionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> disconnectActiveSessionsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> putBastionShareableLink(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return putBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionShareableLinkInner>> putBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return putBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> putBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName) {
+        return putBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(putBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<BastionShareableLinkInner> vms = null;
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(null);
+        return service.putBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = putBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> putBastionShareableLink(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return putBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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<BastionShareableLinkInner>> putBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return putBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> putBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return putBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return putBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(putBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param bastionHostName The name of the Bastion Host.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(vms);
+        final String apiVersion = "2020-04-01";
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(vms);
+        return service.putBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = putBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> putBastionShareableLinkDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException, InterruptedException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> beginPutBastionShareableLink(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionShareableLinkInner>> beginPutBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> beginPutBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName) {
+        return beginPutBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(beginPutBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<BastionShareableLinkInner> vms = null;
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(null);
+        return service.beginPutBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = beginPutBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> beginPutBastionShareableLink(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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<BastionShareableLinkInner>> beginPutBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> beginPutBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return beginPutBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return beginPutBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(beginPutBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param bastionHostName The name of the Bastion Host.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(vms);
+        final String apiVersion = "2020-04-01";
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(vms);
+        return service.beginPutBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = beginPutBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> beginPutBastionShareableLinkDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 deleteBastionShareableLink(String resourceGroupName, String bastionHostName) {
+        deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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> deleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName), serviceCallback);
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName) {
+        return deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteBastionShareableLinkWithServiceResponseAsync(String resourceGroupName, String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String vmsConverted = null;
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(null);
+        Observable<Response<ResponseBody>> observable = service.deleteBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent());
+        return getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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 deleteBastionShareableLink(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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> deleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms), serviceCallback);
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        return deleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteBastionShareableLinkWithServiceResponseAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(vms);
+        final String apiVersion = "2020-04-01";
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(vms);
+        Observable<Response<ResponseBody>> observable = service.deleteBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent());
+        return getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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 beginDeleteBastionShareableLink(String resourceGroupName, String bastionHostName) {
+        beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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> beginDeleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName), serviceCallback);
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName) {
+        return beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteBastionShareableLinkWithServiceResponseAsync(String resourceGroupName, String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<BastionShareableLinkInner> vms = null;
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(null);
+        return service.beginDeleteBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteBastionShareableLinkDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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 beginDeleteBastionShareableLink(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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> beginDeleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms), serviceCallback);
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteBastionShareableLinkAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        return beginDeleteBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteBastionShareableLinkWithServiceResponseAsync(String resourceGroupName, String bastionHostName, List<BastionShareableLinkInner> vms) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(vms);
+        final String apiVersion = "2020-04-01";
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(vms);
+        return service.beginDeleteBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteBastionShareableLinkDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteBastionShareableLinkDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> getBastionShareableLink(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return getBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionShareableLinkInner>> getBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return getBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> getBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName) {
+        return getBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<BastionShareableLinkInner> vms = null;
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(null);
+        return service.getBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = getBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> getBastionShareableLink(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return getBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @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<BastionShareableLinkInner>> getBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return getBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> getBastionShareableLinkAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return getBastionShareableLinkWithServiceResponseAsync(resourceGroupName, bastionHostName, vms)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        return getBastionShareableLinkSinglePageAsync(resourceGroupName, bastionHostName, vms)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param bastionHostName The name of the Bastion Host.
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param vms List of VM references.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkSinglePageAsync(final String resourceGroupName, final String bastionHostName, final List<BastionShareableLinkInner> vms) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(vms);
+        final String apiVersion = "2020-04-01";
+        BastionShareableLinkListRequest bslRequest = new BastionShareableLinkListRequest();
+        bslRequest.withVms(vms);
+        return service.getBastionShareableLink(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), bslRequest, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = getBastionShareableLinkDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> getBastionShareableLinkDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionActiveSessionInner&gt; object if successful.
+     */
+    public PagedList<BastionActiveSessionInner> getActiveSessions(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionActiveSessionInner>> response = getActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionActiveSessionInner>(response.body()) {
+            @Override
+            public Page<BastionActiveSessionInner> nextPage(String nextPageLink) {
+                return getActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionActiveSessionInner>> getActiveSessionsAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionActiveSessionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(String nextPageLink) {
+                    return getActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionActiveSessionInner&gt; object
+     */
+    public Observable<Page<BastionActiveSessionInner>> getActiveSessionsAsync(final String resourceGroupName, final String bastionHostName) {
+        return getActiveSessionsWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Page<BastionActiveSessionInner>>() {
+                @Override
+                public Page<BastionActiveSessionInner> call(ServiceResponse<Page<BastionActiveSessionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionActiveSessionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> getActiveSessionsWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return getActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(ServiceResponse<Page<BastionActiveSessionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionActiveSessionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> getActiveSessionsSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getActiveSessions(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionActiveSessionInner>> result = getActiveSessionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionActiveSessionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionActiveSessionInner>> getActiveSessionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException, InterruptedException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionActiveSessionInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionActiveSessionInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionActiveSessionInner&gt; object if successful.
+     */
+    public PagedList<BastionActiveSessionInner> beginGetActiveSessions(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionActiveSessionInner>> response = beginGetActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionActiveSessionInner>(response.body()) {
+            @Override
+            public Page<BastionActiveSessionInner> nextPage(String nextPageLink) {
+                return beginGetActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionActiveSessionInner>> beginGetActiveSessionsAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionActiveSessionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            beginGetActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(String nextPageLink) {
+                    return beginGetActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionActiveSessionInner&gt; object
+     */
+    public Observable<Page<BastionActiveSessionInner>> beginGetActiveSessionsAsync(final String resourceGroupName, final String bastionHostName) {
+        return beginGetActiveSessionsWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Page<BastionActiveSessionInner>>() {
+                @Override
+                public Page<BastionActiveSessionInner> call(ServiceResponse<Page<BastionActiveSessionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionActiveSessionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> beginGetActiveSessionsWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return beginGetActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(ServiceResponse<Page<BastionActiveSessionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(beginGetActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionActiveSessionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> beginGetActiveSessionsSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetActiveSessions(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionActiveSessionInner>> result = beginGetActiveSessionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionActiveSessionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionActiveSessionInner>> beginGetActiveSessionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionActiveSessionInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionActiveSessionInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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;BastionSessionStateInner&gt; object if successful.
+     */
+    public PagedList<BastionSessionStateInner> disconnectActiveSessions(final String resourceGroupName, final String bastionHostName) {
+        ServiceResponse<Page<BastionSessionStateInner>> response = disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName).toBlocking().single();
+        return new PagedList<BastionSessionStateInner>(response.body()) {
+            @Override
+            public Page<BastionSessionStateInner> nextPage(String nextPageLink) {
+                return disconnectActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @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<BastionSessionStateInner>> disconnectActiveSessionsAsync(final String resourceGroupName, final String bastionHostName, final ListOperationCallback<BastionSessionStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName),
+            new Func1<String, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(String nextPageLink) {
+                    return disconnectActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionSessionStateInner&gt; object
+     */
+    public Observable<Page<BastionSessionStateInner>> disconnectActiveSessionsAsync(final String resourceGroupName, final String bastionHostName) {
+        return disconnectActiveSessionsWithServiceResponseAsync(resourceGroupName, bastionHostName)
+            .map(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Page<BastionSessionStateInner>>() {
+                @Override
+                public Page<BastionSessionStateInner> call(ServiceResponse<Page<BastionSessionStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionSessionStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName) {
+        return disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName)
+            .concatMap(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(ServiceResponse<Page<BastionSessionStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(disconnectActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionSessionStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsSinglePageAsync(final String resourceGroupName, final String bastionHostName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<String> sessionIds = null;
+        SessionIds sessionIds1 = new SessionIds();
+        sessionIds1.withSessionIds(null);
+        return service.disconnectActiveSessions(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), sessionIds1, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionSessionStateInner>> result = disconnectActiveSessionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionSessionStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param sessionIds List of session IDs.
+     * @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;BastionSessionStateInner&gt; object if successful.
+     */
+    public PagedList<BastionSessionStateInner> disconnectActiveSessions(final String resourceGroupName, final String bastionHostName, final List<String> sessionIds) {
+        ServiceResponse<Page<BastionSessionStateInner>> response = disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName, sessionIds).toBlocking().single();
+        return new PagedList<BastionSessionStateInner>(response.body()) {
+            @Override
+            public Page<BastionSessionStateInner> nextPage(String nextPageLink) {
+                return disconnectActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param sessionIds List of session IDs.
+     * @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<BastionSessionStateInner>> disconnectActiveSessionsAsync(final String resourceGroupName, final String bastionHostName, final List<String> sessionIds, final ListOperationCallback<BastionSessionStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName, sessionIds),
+            new Func1<String, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(String nextPageLink) {
+                    return disconnectActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param sessionIds List of session IDs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionSessionStateInner&gt; object
+     */
+    public Observable<Page<BastionSessionStateInner>> disconnectActiveSessionsAsync(final String resourceGroupName, final String bastionHostName, final List<String> sessionIds) {
+        return disconnectActiveSessionsWithServiceResponseAsync(resourceGroupName, bastionHostName, sessionIds)
+            .map(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Page<BastionSessionStateInner>>() {
+                @Override
+                public Page<BastionSessionStateInner> call(ServiceResponse<Page<BastionSessionStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param bastionHostName The name of the Bastion Host.
+     * @param sessionIds List of session IDs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;BastionSessionStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsWithServiceResponseAsync(final String resourceGroupName, final String bastionHostName, final List<String> sessionIds) {
+        return disconnectActiveSessionsSinglePageAsync(resourceGroupName, bastionHostName, sessionIds)
+            .concatMap(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(ServiceResponse<Page<BastionSessionStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(disconnectActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionSessionStateInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<BastionSessionStateInner>> * @param bastionHostName The name of the Bastion Host.
+    ServiceResponse<PageImpl<BastionSessionStateInner>> * @param sessionIds List of session IDs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionSessionStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsSinglePageAsync(final String resourceGroupName, final String bastionHostName, final List<String> sessionIds) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (bastionHostName == null) {
+            throw new IllegalArgumentException("Parameter bastionHostName is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(sessionIds);
+        final String apiVersion = "2020-04-01";
+        SessionIds sessionIds1 = new SessionIds();
+        sessionIds1.withSessionIds(sessionIds);
+        return service.disconnectActiveSessions(resourceGroupName, bastionHostName, this.subscriptionId(), apiVersion, this.acceptLanguage(), sessionIds1, this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionSessionStateInner>> result = disconnectActiveSessionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionSessionStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionSessionStateInner>> disconnectActiveSessionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionSessionStateInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionSessionStateInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Checks whether a domain name in the cloudapp.azure.com zone is available for use.
+     *
+     * @param location The location of the domain name.
+     * @param domainNameLabel The domain name to be verified. It must conform to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+     * @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 DnsNameAvailabilityResultInner object if successful.
+     */
+    public DnsNameAvailabilityResultInner checkDnsNameAvailability(String location, String domainNameLabel) {
+        return checkDnsNameAvailabilityWithServiceResponseAsync(location, domainNameLabel).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether a domain name in the cloudapp.azure.com zone is available for use.
+     *
+     * @param location The location of the domain name.
+     * @param domainNameLabel The domain name to be verified. It must conform to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+     * @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<DnsNameAvailabilityResultInner> checkDnsNameAvailabilityAsync(String location, String domainNameLabel, final ServiceCallback<DnsNameAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkDnsNameAvailabilityWithServiceResponseAsync(location, domainNameLabel), serviceCallback);
+    }
+
+    /**
+     * Checks whether a domain name in the cloudapp.azure.com zone is available for use.
+     *
+     * @param location The location of the domain name.
+     * @param domainNameLabel The domain name to be verified. It must conform to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DnsNameAvailabilityResultInner object
+     */
+    public Observable<DnsNameAvailabilityResultInner> checkDnsNameAvailabilityAsync(String location, String domainNameLabel) {
+        return checkDnsNameAvailabilityWithServiceResponseAsync(location, domainNameLabel).map(new Func1<ServiceResponse<DnsNameAvailabilityResultInner>, DnsNameAvailabilityResultInner>() {
+            @Override
+            public DnsNameAvailabilityResultInner call(ServiceResponse<DnsNameAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether a domain name in the cloudapp.azure.com zone is available for use.
+     *
+     * @param location The location of the domain name.
+     * @param domainNameLabel The domain name to be verified. It must conform to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DnsNameAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<DnsNameAvailabilityResultInner>> checkDnsNameAvailabilityWithServiceResponseAsync(String location, String domainNameLabel) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        if (domainNameLabel == null) {
+            throw new IllegalArgumentException("Parameter domainNameLabel is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.checkDnsNameAvailability(location, this.subscriptionId(), domainNameLabel, apiVersion, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DnsNameAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DnsNameAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DnsNameAvailabilityResultInner> clientResponse = checkDnsNameAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DnsNameAvailabilityResultInner> checkDnsNameAvailabilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<DnsNameAvailabilityResultInner, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<DnsNameAvailabilityResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gives the supported security providers for the virtual wan.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which supported security providers are needed.
+     * @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 VirtualWanSecurityProvidersInner object if successful.
+     */
+    public VirtualWanSecurityProvidersInner supportedSecurityProviders(String resourceGroupName, String virtualWANName) {
+        return supportedSecurityProvidersWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().single().body();
+    }
+
+    /**
+     * Gives the supported security providers for the virtual wan.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which supported security providers are needed.
+     * @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<VirtualWanSecurityProvidersInner> supportedSecurityProvidersAsync(String resourceGroupName, String virtualWANName, final ServiceCallback<VirtualWanSecurityProvidersInner> serviceCallback) {
+        return ServiceFuture.fromResponse(supportedSecurityProvidersWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Gives the supported security providers for the virtual wan.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which supported security providers are needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWanSecurityProvidersInner object
+     */
+    public Observable<VirtualWanSecurityProvidersInner> supportedSecurityProvidersAsync(String resourceGroupName, String virtualWANName) {
+        return supportedSecurityProvidersWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<VirtualWanSecurityProvidersInner>, VirtualWanSecurityProvidersInner>() {
+            @Override
+            public VirtualWanSecurityProvidersInner call(ServiceResponse<VirtualWanSecurityProvidersInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gives the supported security providers for the virtual wan.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which supported security providers are needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWanSecurityProvidersInner object
+     */
+    public Observable<ServiceResponse<VirtualWanSecurityProvidersInner>> supportedSecurityProvidersWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.supportedSecurityProviders(this.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualWanSecurityProvidersInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualWanSecurityProvidersInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualWanSecurityProvidersInner> clientResponse = supportedSecurityProvidersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualWanSecurityProvidersInner> supportedSecurityProvidersDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<VirtualWanSecurityProvidersInner, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<VirtualWanSecurityProvidersInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation 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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner generatevirtualwanvpnserverconfigurationvpnprofile(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        return generatevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams).toBlocking().last().body();
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @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<VpnProfileResponseInner> generatevirtualwanvpnserverconfigurationvpnprofileAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(generatevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams), serviceCallback);
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnProfileResponseInner> generatevirtualwanvpnserverconfigurationvpnprofileAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        return generatevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> generatevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (vpnClientParams == null) {
+            throw new IllegalArgumentException("Parameter vpnClientParams is required and cannot be null.");
+        }
+        Validator.validate(vpnClientParams);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.generatevirtualwanvpnserverconfigurationvpnprofile(this.subscriptionId(), resourceGroupName, virtualWANName, vpnClientParams, apiVersion, this.acceptLanguage(), this.userAgent());
+        return getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnProfileResponseInner>() { }.getType());
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation 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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner beginGeneratevirtualwanvpnserverconfigurationvpnprofile(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        return beginGeneratevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams).toBlocking().single().body();
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @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<VpnProfileResponseInner> beginGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGeneratevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams), serviceCallback);
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<VpnProfileResponseInner> beginGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        return beginGeneratevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(resourceGroupName, virtualWANName, vpnClientParams).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates a unique VPN profile for P2S clients for VirtualWan and associated VpnServerConfiguration combination in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @param vpnClientParams Parameters supplied to the generate VirtualWan VPN profile generation operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> beginGeneratevirtualwanvpnserverconfigurationvpnprofileWithServiceResponseAsync(String resourceGroupName, String virtualWANName, VirtualWanVpnProfileParameters vpnClientParams) {
+        if (this.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (vpnClientParams == null) {
+            throw new IllegalArgumentException("Parameter vpnClientParams is required and cannot be null.");
+        }
+        Validator.validate(vpnClientParams);
+        final String apiVersion = "2020-04-01";
+        return service.beginGeneratevirtualwanvpnserverconfigurationvpnprofile(this.subscriptionId(), resourceGroupName, virtualWANName, vpnClientParams, apiVersion, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnProfileResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnProfileResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnProfileResponseInner> clientResponse = beginGeneratevirtualwanvpnserverconfigurationvpnprofileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnProfileResponseInner> beginGeneratevirtualwanvpnserverconfigurationvpnprofileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<VpnProfileResponseInner, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<VpnProfileResponseInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> putBastionShareableLinkNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = putBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return putBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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<BastionShareableLinkInner>> putBastionShareableLinkNextAsync(final String nextPageLink, final ServiceFuture<List<BastionShareableLinkInner>> serviceFuture, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            putBastionShareableLinkNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return putBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> putBastionShareableLinkNextAsync(final String nextPageLink) {
+        return putBastionShareableLinkNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkNextWithServiceResponseAsync(final String nextPageLink) {
+        return putBastionShareableLinkNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(putBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> putBastionShareableLinkNextSinglePageAsync(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.putBastionShareableLinkNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = putBastionShareableLinkNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> putBastionShareableLinkNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException, InterruptedException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> beginPutBastionShareableLinkNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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<BastionShareableLinkInner>> beginPutBastionShareableLinkNextAsync(final String nextPageLink, final ServiceFuture<List<BastionShareableLinkInner>> serviceFuture, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> beginPutBastionShareableLinkNextAsync(final String nextPageLink) {
+        return beginPutBastionShareableLinkNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkNextWithServiceResponseAsync(final String nextPageLink) {
+        return beginPutBastionShareableLinkNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(beginPutBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Creates a Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> beginPutBastionShareableLinkNextSinglePageAsync(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.beginPutBastionShareableLinkNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = beginPutBastionShareableLinkNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> beginPutBastionShareableLinkNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object if successful.
+     */
+    public PagedList<BastionShareableLinkInner> getBastionShareableLinkNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionShareableLinkInner>> response = getBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionShareableLinkInner>(response.body()) {
+            @Override
+            public Page<BastionShareableLinkInner> nextPage(String nextPageLink) {
+                return getBastionShareableLinkNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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<BastionShareableLinkInner>> getBastionShareableLinkNextAsync(final String nextPageLink, final ServiceFuture<List<BastionShareableLinkInner>> serviceFuture, final ListOperationCallback<BastionShareableLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getBastionShareableLinkNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(String nextPageLink) {
+                    return getBastionShareableLinkNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<Page<BastionShareableLinkInner>> getBastionShareableLinkNextAsync(final String nextPageLink) {
+        return getBastionShareableLinkNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Page<BastionShareableLinkInner>>() {
+                @Override
+                public Page<BastionShareableLinkInner> call(ServiceResponse<Page<BastionShareableLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+     * @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;BastionShareableLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkNextWithServiceResponseAsync(final String nextPageLink) {
+        return getBastionShareableLinkNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionShareableLinkInner>>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(ServiceResponse<Page<BastionShareableLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getBastionShareableLinkNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Return the Bastion Shareable Links for all the VMs specified in the request.
+     *
+    ServiceResponse<PageImpl<BastionShareableLinkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionShareableLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> getBastionShareableLinkNextSinglePageAsync(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.getBastionShareableLinkNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionShareableLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionShareableLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionShareableLinkInner>> result = getBastionShareableLinkNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionShareableLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionShareableLinkInner>> getBastionShareableLinkNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionShareableLinkInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionShareableLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object if successful.
+     */
+    public PagedList<BastionActiveSessionInner> getActiveSessionsNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionActiveSessionInner>> response = getActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionActiveSessionInner>(response.body()) {
+            @Override
+            public Page<BastionActiveSessionInner> nextPage(String nextPageLink) {
+                return getActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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<BastionActiveSessionInner>> getActiveSessionsNextAsync(final String nextPageLink, final ServiceFuture<List<BastionActiveSessionInner>> serviceFuture, final ListOperationCallback<BastionActiveSessionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getActiveSessionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(String nextPageLink) {
+                    return getActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object
+     */
+    public Observable<Page<BastionActiveSessionInner>> getActiveSessionsNextAsync(final String nextPageLink) {
+        return getActiveSessionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Page<BastionActiveSessionInner>>() {
+                @Override
+                public Page<BastionActiveSessionInner> call(ServiceResponse<Page<BastionActiveSessionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> getActiveSessionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return getActiveSessionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(ServiceResponse<Page<BastionActiveSessionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionActiveSessionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> getActiveSessionsNextSinglePageAsync(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.getActiveSessionsNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionActiveSessionInner>> result = getActiveSessionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionActiveSessionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionActiveSessionInner>> getActiveSessionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException, InterruptedException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionActiveSessionInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionActiveSessionInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object if successful.
+     */
+    public PagedList<BastionActiveSessionInner> beginGetActiveSessionsNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionActiveSessionInner>> response = beginGetActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionActiveSessionInner>(response.body()) {
+            @Override
+            public Page<BastionActiveSessionInner> nextPage(String nextPageLink) {
+                return beginGetActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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<BastionActiveSessionInner>> beginGetActiveSessionsNextAsync(final String nextPageLink, final ServiceFuture<List<BastionActiveSessionInner>> serviceFuture, final ListOperationCallback<BastionActiveSessionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            beginGetActiveSessionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(String nextPageLink) {
+                    return beginGetActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object
+     */
+    public Observable<Page<BastionActiveSessionInner>> beginGetActiveSessionsNextAsync(final String nextPageLink) {
+        return beginGetActiveSessionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Page<BastionActiveSessionInner>>() {
+                @Override
+                public Page<BastionActiveSessionInner> call(ServiceResponse<Page<BastionActiveSessionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionActiveSessionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> beginGetActiveSessionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return beginGetActiveSessionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionActiveSessionInner>>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(ServiceResponse<Page<BastionActiveSessionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(beginGetActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionActiveSessionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionActiveSessionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> beginGetActiveSessionsNextSinglePageAsync(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.beginGetActiveSessionsNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionActiveSessionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionActiveSessionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionActiveSessionInner>> result = beginGetActiveSessionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionActiveSessionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionActiveSessionInner>> beginGetActiveSessionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionActiveSessionInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionActiveSessionInner>>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionSessionStateInner&gt; object if successful.
+     */
+    public PagedList<BastionSessionStateInner> disconnectActiveSessionsNext(final String nextPageLink) {
+        ServiceResponse<Page<BastionSessionStateInner>> response = disconnectActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<BastionSessionStateInner>(response.body()) {
+            @Override
+            public Page<BastionSessionStateInner> nextPage(String nextPageLink) {
+                return disconnectActiveSessionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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<BastionSessionStateInner>> disconnectActiveSessionsNextAsync(final String nextPageLink, final ServiceFuture<List<BastionSessionStateInner>> serviceFuture, final ListOperationCallback<BastionSessionStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            disconnectActiveSessionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(String nextPageLink) {
+                    return disconnectActiveSessionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionSessionStateInner&gt; object
+     */
+    public Observable<Page<BastionSessionStateInner>> disconnectActiveSessionsNextAsync(final String nextPageLink) {
+        return disconnectActiveSessionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Page<BastionSessionStateInner>>() {
+                @Override
+                public Page<BastionSessionStateInner> call(ServiceResponse<Page<BastionSessionStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+     * @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;BastionSessionStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return disconnectActiveSessionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<BastionSessionStateInner>>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(ServiceResponse<Page<BastionSessionStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(disconnectActiveSessionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns the list of currently active sessions on the Bastion.
+     *
+    ServiceResponse<PageImpl<BastionSessionStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;BastionSessionStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<BastionSessionStateInner>>> disconnectActiveSessionsNextSinglePageAsync(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.disconnectActiveSessionsNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BastionSessionStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<BastionSessionStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<BastionSessionStateInner>> result = disconnectActiveSessionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<BastionSessionStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<BastionSessionStateInner>> disconnectActiveSessionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<BastionSessionStateInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<BastionSessionStateInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManager.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManager.java
new file mode 100644
index 000000000000..c0fe7142c956
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkManager.java
@@ -0,0 +1,1215 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.ApplicationGateways;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroups;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableDelegations;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableResourceGroupDelegations;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableServiceAliases;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewalls;
+import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallFqdnTags;
+import com.microsoft.azure.management.network.v2020_04_01.BastionHosts;
+import com.microsoft.azure.management.network.v2020_04_01.DdosCustomPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.DdosProtectionPlans;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableEndpointServices;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitAuthorizations;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeerings;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitConnections;
+import com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnections;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuits;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteServiceProviders;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnections;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCrossConnectionPeerings;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePortsLocations;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRoutePorts;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteLinks;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyRuleGroups;
+import com.microsoft.azure.management.network.v2020_04_01.IpAllocations;
+import com.microsoft.azure.management.network.v2020_04_01.IpGroups;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancers;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerBackendAddressPools;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerFrontendIPConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRules;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerLoadBalancingRules;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerOutboundRules;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerNetworkInterfaces;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerProbes;
+import com.microsoft.azure.management.network.v2020_04_01.NatGateways;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaces;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceLoadBalancers;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkProfiles;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroups;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRules;
+import com.microsoft.azure.management.network.v2020_04_01.DefaultSecurityRules;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliances;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptures;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionMonitors;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogs;
+import com.microsoft.azure.management.network.v2020_04_01.Operations;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoints;
+import com.microsoft.azure.management.network.v2020_04_01.AvailablePrivateEndpointTypes;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneGroups;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddresses;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixes;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilters;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilterRules;
+import com.microsoft.azure.management.network.v2020_04_01.RouteTables;
+import com.microsoft.azure.management.network.v2020_04_01.Routes;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviders;
+import com.microsoft.azure.management.network.v2020_04_01.BgpServiceCommunities;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinitions;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTags;
+import com.microsoft.azure.management.network.v2020_04_01.Usages;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworks;
+import com.microsoft.azure.management.network.v2020_04_01.Subnets;
+import com.microsoft.azure.management.network.v2020_04_01.ResourceNavigationLinks;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceAssociationLinks;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeerings;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections;
+import com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTaps;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouters;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouterPeerings;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWans;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSites;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinks;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSitesConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubs;
+import com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnections;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnections;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinkConnections;
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkConnections;
+import com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurationsAssociatedWithVirtualWans;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2s;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteGateways;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteConnections;
+import com.microsoft.azure.management.network.v2020_04_01.HubRouteTables;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicies;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Network resource management.
+ */
+public final class NetworkManager extends ManagerCore<NetworkManager, NetworkManagementClientImpl> {
+    private ApplicationGateways applicationGateways;
+    private ApplicationSecurityGroups applicationSecurityGroups;
+    private AvailableDelegations availableDelegations;
+    private AvailableResourceGroupDelegations availableResourceGroupDelegations;
+    private AvailableServiceAliases availableServiceAliases;
+    private AzureFirewalls azureFirewalls;
+    private AzureFirewallFqdnTags azureFirewallFqdnTags;
+    private BastionHosts bastionHosts;
+    private DdosCustomPolicies ddosCustomPolicies;
+    private DdosProtectionPlans ddosProtectionPlans;
+    private AvailableEndpointServices availableEndpointServices;
+    private ExpressRouteCircuitAuthorizations expressRouteCircuitAuthorizations;
+    private ExpressRouteCircuitPeerings expressRouteCircuitPeerings;
+    private ExpressRouteCircuitConnections expressRouteCircuitConnections;
+    private PeerExpressRouteCircuitConnections peerExpressRouteCircuitConnections;
+    private ExpressRouteCircuits expressRouteCircuits;
+    private ExpressRouteServiceProviders expressRouteServiceProviders;
+    private ExpressRouteCrossConnections expressRouteCrossConnections;
+    private ExpressRouteCrossConnectionPeerings expressRouteCrossConnectionPeerings;
+    private ExpressRoutePortsLocations expressRoutePortsLocations;
+    private ExpressRoutePorts expressRoutePorts;
+    private ExpressRouteLinks expressRouteLinks;
+    private FirewallPolicies firewallPolicies;
+    private FirewallPolicyRuleGroups firewallPolicyRuleGroups;
+    private IpAllocations ipAllocations;
+    private IpGroups ipGroups;
+    private LoadBalancers loadBalancers;
+    private LoadBalancerBackendAddressPools loadBalancerBackendAddressPools;
+    private LoadBalancerFrontendIPConfigurations loadBalancerFrontendIPConfigurations;
+    private InboundNatRules inboundNatRules;
+    private LoadBalancerLoadBalancingRules loadBalancerLoadBalancingRules;
+    private LoadBalancerOutboundRules loadBalancerOutboundRules;
+    private LoadBalancerNetworkInterfaces loadBalancerNetworkInterfaces;
+    private LoadBalancerProbes loadBalancerProbes;
+    private NatGateways natGateways;
+    private NetworkInterfaces networkInterfaces;
+    private NetworkInterfaceIPConfigurations networkInterfaceIPConfigurations;
+    private NetworkInterfaceLoadBalancers networkInterfaceLoadBalancers;
+    private NetworkInterfaceTapConfigurations networkInterfaceTapConfigurations;
+    private NetworkProfiles networkProfiles;
+    private NetworkSecurityGroups networkSecurityGroups;
+    private SecurityRules securityRules;
+    private DefaultSecurityRules defaultSecurityRules;
+    private NetworkVirtualAppliances networkVirtualAppliances;
+    private NetworkWatchers networkWatchers;
+    private PacketCaptures packetCaptures;
+    private ConnectionMonitors connectionMonitors;
+    private FlowLogs flowLogs;
+    private Operations operations;
+    private PrivateEndpoints privateEndpoints;
+    private AvailablePrivateEndpointTypes availablePrivateEndpointTypes;
+    private PrivateDnsZoneGroups privateDnsZoneGroups;
+    private PrivateLinkServices privateLinkServices;
+    private PublicIPAddresses publicIPAddresses;
+    private PublicIPPrefixes publicIPPrefixes;
+    private RouteFilters routeFilters;
+    private RouteFilterRules routeFilterRules;
+    private RouteTables routeTables;
+    private Routes routes;
+    private SecurityPartnerProviders securityPartnerProviders;
+    private BgpServiceCommunities bgpServiceCommunities;
+    private ServiceEndpointPolicies serviceEndpointPolicies;
+    private ServiceEndpointPolicyDefinitions serviceEndpointPolicyDefinitions;
+    private ServiceTags serviceTags;
+    private Usages usages;
+    private VirtualNetworks virtualNetworks;
+    private Subnets subnets;
+    private ResourceNavigationLinks resourceNavigationLinks;
+    private ServiceAssociationLinks serviceAssociationLinks;
+    private VirtualNetworkPeerings virtualNetworkPeerings;
+    private VirtualNetworkGateways virtualNetworkGateways;
+    private VirtualNetworkGatewayConnections virtualNetworkGatewayConnections;
+    private LocalNetworkGateways localNetworkGateways;
+    private VirtualNetworkTaps virtualNetworkTaps;
+    private VirtualRouters virtualRouters;
+    private VirtualRouterPeerings virtualRouterPeerings;
+    private VirtualWans virtualWans;
+    private VpnSites vpnSites;
+    private VpnSiteLinks vpnSiteLinks;
+    private VpnSitesConfigurations vpnSitesConfigurations;
+    private VpnServerConfigurations vpnServerConfigurations;
+    private VirtualHubs virtualHubs;
+    private HubVirtualNetworkConnections hubVirtualNetworkConnections;
+    private VpnGateways vpnGateways;
+    private VpnConnections vpnConnections;
+    private VpnSiteLinkConnections vpnSiteLinkConnections;
+    private VpnLinkConnections vpnLinkConnections;
+    private P2sVpnGateways p2sVpnGateways;
+    private VpnServerConfigurationsAssociatedWithVirtualWans vpnServerConfigurationsAssociatedWithVirtualWans;
+    private VirtualHubRouteTableV2s virtualHubRouteTableV2s;
+    private ExpressRouteGateways expressRouteGateways;
+    private ExpressRouteConnections expressRouteConnections;
+    private HubRouteTables hubRouteTables;
+    private WebApplicationFirewallPolicies webApplicationFirewallPolicies;
+    /**
+    * Get a Configurable instance that can be used to create NetworkManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new NetworkManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of NetworkManager that exposes Network resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the NetworkManager
+    */
+    public static NetworkManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new NetworkManager(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 NetworkManager that exposes Network resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the NetworkManager
+    */
+    public static NetworkManager authenticate(RestClient restClient, String subscriptionId) {
+        return new NetworkManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of NetworkManager that exposes Network management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Network management API entry points that work across subscriptions
+        */
+        NetworkManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage ApplicationGateways.
+     */
+    public ApplicationGateways applicationGateways() {
+        if (this.applicationGateways == null) {
+            this.applicationGateways = new ApplicationGatewaysImpl(this);
+        }
+        return this.applicationGateways;
+    }
+
+    /**
+     * @return Entry point to manage ApplicationSecurityGroups.
+     */
+    public ApplicationSecurityGroups applicationSecurityGroups() {
+        if (this.applicationSecurityGroups == null) {
+            this.applicationSecurityGroups = new ApplicationSecurityGroupsImpl(this);
+        }
+        return this.applicationSecurityGroups;
+    }
+
+    /**
+     * @return Entry point to manage AvailableDelegations.
+     */
+    public AvailableDelegations availableDelegations() {
+        if (this.availableDelegations == null) {
+            this.availableDelegations = new AvailableDelegationsImpl(this);
+        }
+        return this.availableDelegations;
+    }
+
+    /**
+     * @return Entry point to manage AvailableResourceGroupDelegations.
+     */
+    public AvailableResourceGroupDelegations availableResourceGroupDelegations() {
+        if (this.availableResourceGroupDelegations == null) {
+            this.availableResourceGroupDelegations = new AvailableResourceGroupDelegationsImpl(this);
+        }
+        return this.availableResourceGroupDelegations;
+    }
+
+    /**
+     * @return Entry point to manage AvailableServiceAliases.
+     */
+    public AvailableServiceAliases availableServiceAliases() {
+        if (this.availableServiceAliases == null) {
+            this.availableServiceAliases = new AvailableServiceAliasesImpl(this);
+        }
+        return this.availableServiceAliases;
+    }
+
+    /**
+     * @return Entry point to manage AzureFirewalls.
+     */
+    public AzureFirewalls azureFirewalls() {
+        if (this.azureFirewalls == null) {
+            this.azureFirewalls = new AzureFirewallsImpl(this);
+        }
+        return this.azureFirewalls;
+    }
+
+    /**
+     * @return Entry point to manage AzureFirewallFqdnTags.
+     */
+    public AzureFirewallFqdnTags azureFirewallFqdnTags() {
+        if (this.azureFirewallFqdnTags == null) {
+            this.azureFirewallFqdnTags = new AzureFirewallFqdnTagsImpl(this);
+        }
+        return this.azureFirewallFqdnTags;
+    }
+
+    /**
+     * @return Entry point to manage BastionHosts.
+     */
+    public BastionHosts bastionHosts() {
+        if (this.bastionHosts == null) {
+            this.bastionHosts = new BastionHostsImpl(this);
+        }
+        return this.bastionHosts;
+    }
+
+    /**
+     * @return Entry point to manage DdosCustomPolicies.
+     */
+    public DdosCustomPolicies ddosCustomPolicies() {
+        if (this.ddosCustomPolicies == null) {
+            this.ddosCustomPolicies = new DdosCustomPoliciesImpl(this);
+        }
+        return this.ddosCustomPolicies;
+    }
+
+    /**
+     * @return Entry point to manage DdosProtectionPlans.
+     */
+    public DdosProtectionPlans ddosProtectionPlans() {
+        if (this.ddosProtectionPlans == null) {
+            this.ddosProtectionPlans = new DdosProtectionPlansImpl(this);
+        }
+        return this.ddosProtectionPlans;
+    }
+
+    /**
+     * @return Entry point to manage AvailableEndpointServices.
+     */
+    public AvailableEndpointServices availableEndpointServices() {
+        if (this.availableEndpointServices == null) {
+            this.availableEndpointServices = new AvailableEndpointServicesImpl(this);
+        }
+        return this.availableEndpointServices;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCircuitAuthorizations.
+     */
+    public ExpressRouteCircuitAuthorizations expressRouteCircuitAuthorizations() {
+        if (this.expressRouteCircuitAuthorizations == null) {
+            this.expressRouteCircuitAuthorizations = new ExpressRouteCircuitAuthorizationsImpl(this);
+        }
+        return this.expressRouteCircuitAuthorizations;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCircuitPeerings.
+     */
+    public ExpressRouteCircuitPeerings expressRouteCircuitPeerings() {
+        if (this.expressRouteCircuitPeerings == null) {
+            this.expressRouteCircuitPeerings = new ExpressRouteCircuitPeeringsImpl(this);
+        }
+        return this.expressRouteCircuitPeerings;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCircuitConnections.
+     */
+    public ExpressRouteCircuitConnections expressRouteCircuitConnections() {
+        if (this.expressRouteCircuitConnections == null) {
+            this.expressRouteCircuitConnections = new ExpressRouteCircuitConnectionsImpl(this);
+        }
+        return this.expressRouteCircuitConnections;
+    }
+
+    /**
+     * @return Entry point to manage PeerExpressRouteCircuitConnections.
+     */
+    public PeerExpressRouteCircuitConnections peerExpressRouteCircuitConnections() {
+        if (this.peerExpressRouteCircuitConnections == null) {
+            this.peerExpressRouteCircuitConnections = new PeerExpressRouteCircuitConnectionsImpl(this);
+        }
+        return this.peerExpressRouteCircuitConnections;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCircuits.
+     */
+    public ExpressRouteCircuits expressRouteCircuits() {
+        if (this.expressRouteCircuits == null) {
+            this.expressRouteCircuits = new ExpressRouteCircuitsImpl(this);
+        }
+        return this.expressRouteCircuits;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteServiceProviders.
+     */
+    public ExpressRouteServiceProviders expressRouteServiceProviders() {
+        if (this.expressRouteServiceProviders == null) {
+            this.expressRouteServiceProviders = new ExpressRouteServiceProvidersImpl(this);
+        }
+        return this.expressRouteServiceProviders;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCrossConnections.
+     */
+    public ExpressRouteCrossConnections expressRouteCrossConnections() {
+        if (this.expressRouteCrossConnections == null) {
+            this.expressRouteCrossConnections = new ExpressRouteCrossConnectionsImpl(this);
+        }
+        return this.expressRouteCrossConnections;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteCrossConnectionPeerings.
+     */
+    public ExpressRouteCrossConnectionPeerings expressRouteCrossConnectionPeerings() {
+        if (this.expressRouteCrossConnectionPeerings == null) {
+            this.expressRouteCrossConnectionPeerings = new ExpressRouteCrossConnectionPeeringsImpl(this);
+        }
+        return this.expressRouteCrossConnectionPeerings;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRoutePortsLocations.
+     */
+    public ExpressRoutePortsLocations expressRoutePortsLocations() {
+        if (this.expressRoutePortsLocations == null) {
+            this.expressRoutePortsLocations = new ExpressRoutePortsLocationsImpl(this);
+        }
+        return this.expressRoutePortsLocations;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRoutePorts.
+     */
+    public ExpressRoutePorts expressRoutePorts() {
+        if (this.expressRoutePorts == null) {
+            this.expressRoutePorts = new ExpressRoutePortsImpl(this);
+        }
+        return this.expressRoutePorts;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteLinks.
+     */
+    public ExpressRouteLinks expressRouteLinks() {
+        if (this.expressRouteLinks == null) {
+            this.expressRouteLinks = new ExpressRouteLinksImpl(this);
+        }
+        return this.expressRouteLinks;
+    }
+
+    /**
+     * @return Entry point to manage FirewallPolicies.
+     */
+    public FirewallPolicies firewallPolicies() {
+        if (this.firewallPolicies == null) {
+            this.firewallPolicies = new FirewallPoliciesImpl(this);
+        }
+        return this.firewallPolicies;
+    }
+
+    /**
+     * @return Entry point to manage FirewallPolicyRuleGroups.
+     */
+    public FirewallPolicyRuleGroups firewallPolicyRuleGroups() {
+        if (this.firewallPolicyRuleGroups == null) {
+            this.firewallPolicyRuleGroups = new FirewallPolicyRuleGroupsImpl(this);
+        }
+        return this.firewallPolicyRuleGroups;
+    }
+
+    /**
+     * @return Entry point to manage IpAllocations.
+     */
+    public IpAllocations ipAllocations() {
+        if (this.ipAllocations == null) {
+            this.ipAllocations = new IpAllocationsImpl(this);
+        }
+        return this.ipAllocations;
+    }
+
+    /**
+     * @return Entry point to manage IpGroups.
+     */
+    public IpGroups ipGroups() {
+        if (this.ipGroups == null) {
+            this.ipGroups = new IpGroupsImpl(this);
+        }
+        return this.ipGroups;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancers.
+     */
+    public LoadBalancers loadBalancers() {
+        if (this.loadBalancers == null) {
+            this.loadBalancers = new LoadBalancersImpl(this);
+        }
+        return this.loadBalancers;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerBackendAddressPools.
+     */
+    public LoadBalancerBackendAddressPools loadBalancerBackendAddressPools() {
+        if (this.loadBalancerBackendAddressPools == null) {
+            this.loadBalancerBackendAddressPools = new LoadBalancerBackendAddressPoolsImpl(this);
+        }
+        return this.loadBalancerBackendAddressPools;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerFrontendIPConfigurations.
+     */
+    public LoadBalancerFrontendIPConfigurations loadBalancerFrontendIPConfigurations() {
+        if (this.loadBalancerFrontendIPConfigurations == null) {
+            this.loadBalancerFrontendIPConfigurations = new LoadBalancerFrontendIPConfigurationsImpl(this);
+        }
+        return this.loadBalancerFrontendIPConfigurations;
+    }
+
+    /**
+     * @return Entry point to manage InboundNatRules.
+     */
+    public InboundNatRules inboundNatRules() {
+        if (this.inboundNatRules == null) {
+            this.inboundNatRules = new InboundNatRulesImpl(this);
+        }
+        return this.inboundNatRules;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerLoadBalancingRules.
+     */
+    public LoadBalancerLoadBalancingRules loadBalancerLoadBalancingRules() {
+        if (this.loadBalancerLoadBalancingRules == null) {
+            this.loadBalancerLoadBalancingRules = new LoadBalancerLoadBalancingRulesImpl(this);
+        }
+        return this.loadBalancerLoadBalancingRules;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerOutboundRules.
+     */
+    public LoadBalancerOutboundRules loadBalancerOutboundRules() {
+        if (this.loadBalancerOutboundRules == null) {
+            this.loadBalancerOutboundRules = new LoadBalancerOutboundRulesImpl(this);
+        }
+        return this.loadBalancerOutboundRules;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerNetworkInterfaces.
+     */
+    public LoadBalancerNetworkInterfaces loadBalancerNetworkInterfaces() {
+        if (this.loadBalancerNetworkInterfaces == null) {
+            this.loadBalancerNetworkInterfaces = new LoadBalancerNetworkInterfacesImpl(this);
+        }
+        return this.loadBalancerNetworkInterfaces;
+    }
+
+    /**
+     * @return Entry point to manage LoadBalancerProbes.
+     */
+    public LoadBalancerProbes loadBalancerProbes() {
+        if (this.loadBalancerProbes == null) {
+            this.loadBalancerProbes = new LoadBalancerProbesImpl(this);
+        }
+        return this.loadBalancerProbes;
+    }
+
+    /**
+     * @return Entry point to manage NatGateways.
+     */
+    public NatGateways natGateways() {
+        if (this.natGateways == null) {
+            this.natGateways = new NatGatewaysImpl(this);
+        }
+        return this.natGateways;
+    }
+
+    /**
+     * @return Entry point to manage NetworkInterfaces.
+     */
+    public NetworkInterfaces networkInterfaces() {
+        if (this.networkInterfaces == null) {
+            this.networkInterfaces = new NetworkInterfacesImpl(this);
+        }
+        return this.networkInterfaces;
+    }
+
+    /**
+     * @return Entry point to manage NetworkInterfaceIPConfigurations.
+     */
+    public NetworkInterfaceIPConfigurations networkInterfaceIPConfigurations() {
+        if (this.networkInterfaceIPConfigurations == null) {
+            this.networkInterfaceIPConfigurations = new NetworkInterfaceIPConfigurationsImpl(this);
+        }
+        return this.networkInterfaceIPConfigurations;
+    }
+
+    /**
+     * @return Entry point to manage NetworkInterfaceLoadBalancers.
+     */
+    public NetworkInterfaceLoadBalancers networkInterfaceLoadBalancers() {
+        if (this.networkInterfaceLoadBalancers == null) {
+            this.networkInterfaceLoadBalancers = new NetworkInterfaceLoadBalancersImpl(this);
+        }
+        return this.networkInterfaceLoadBalancers;
+    }
+
+    /**
+     * @return Entry point to manage NetworkInterfaceTapConfigurations.
+     */
+    public NetworkInterfaceTapConfigurations networkInterfaceTapConfigurations() {
+        if (this.networkInterfaceTapConfigurations == null) {
+            this.networkInterfaceTapConfigurations = new NetworkInterfaceTapConfigurationsImpl(this);
+        }
+        return this.networkInterfaceTapConfigurations;
+    }
+
+    /**
+     * @return Entry point to manage NetworkProfiles.
+     */
+    public NetworkProfiles networkProfiles() {
+        if (this.networkProfiles == null) {
+            this.networkProfiles = new NetworkProfilesImpl(this);
+        }
+        return this.networkProfiles;
+    }
+
+    /**
+     * @return Entry point to manage NetworkSecurityGroups.
+     */
+    public NetworkSecurityGroups networkSecurityGroups() {
+        if (this.networkSecurityGroups == null) {
+            this.networkSecurityGroups = new NetworkSecurityGroupsImpl(this);
+        }
+        return this.networkSecurityGroups;
+    }
+
+    /**
+     * @return Entry point to manage SecurityRules.
+     */
+    public SecurityRules securityRules() {
+        if (this.securityRules == null) {
+            this.securityRules = new SecurityRulesImpl(this);
+        }
+        return this.securityRules;
+    }
+
+    /**
+     * @return Entry point to manage DefaultSecurityRules.
+     */
+    public DefaultSecurityRules defaultSecurityRules() {
+        if (this.defaultSecurityRules == null) {
+            this.defaultSecurityRules = new DefaultSecurityRulesImpl(this);
+        }
+        return this.defaultSecurityRules;
+    }
+
+    /**
+     * @return Entry point to manage NetworkVirtualAppliances.
+     */
+    public NetworkVirtualAppliances networkVirtualAppliances() {
+        if (this.networkVirtualAppliances == null) {
+            this.networkVirtualAppliances = new NetworkVirtualAppliancesImpl(this);
+        }
+        return this.networkVirtualAppliances;
+    }
+
+    /**
+     * @return Entry point to manage NetworkWatchers.
+     */
+    public NetworkWatchers networkWatchers() {
+        if (this.networkWatchers == null) {
+            this.networkWatchers = new NetworkWatchersImpl(this);
+        }
+        return this.networkWatchers;
+    }
+
+    /**
+     * @return Entry point to manage PacketCaptures.
+     */
+    public PacketCaptures packetCaptures() {
+        if (this.packetCaptures == null) {
+            this.packetCaptures = new PacketCapturesImpl(this);
+        }
+        return this.packetCaptures;
+    }
+
+    /**
+     * @return Entry point to manage ConnectionMonitors.
+     */
+    public ConnectionMonitors connectionMonitors() {
+        if (this.connectionMonitors == null) {
+            this.connectionMonitors = new ConnectionMonitorsImpl(this);
+        }
+        return this.connectionMonitors;
+    }
+
+    /**
+     * @return Entry point to manage FlowLogs.
+     */
+    public FlowLogs flowLogs() {
+        if (this.flowLogs == null) {
+            this.flowLogs = new FlowLogsImpl(this);
+        }
+        return this.flowLogs;
+    }
+
+    /**
+     * @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 PrivateEndpoints.
+     */
+    public PrivateEndpoints privateEndpoints() {
+        if (this.privateEndpoints == null) {
+            this.privateEndpoints = new PrivateEndpointsImpl(this);
+        }
+        return this.privateEndpoints;
+    }
+
+    /**
+     * @return Entry point to manage AvailablePrivateEndpointTypes.
+     */
+    public AvailablePrivateEndpointTypes availablePrivateEndpointTypes() {
+        if (this.availablePrivateEndpointTypes == null) {
+            this.availablePrivateEndpointTypes = new AvailablePrivateEndpointTypesImpl(this);
+        }
+        return this.availablePrivateEndpointTypes;
+    }
+
+    /**
+     * @return Entry point to manage PrivateDnsZoneGroups.
+     */
+    public PrivateDnsZoneGroups privateDnsZoneGroups() {
+        if (this.privateDnsZoneGroups == null) {
+            this.privateDnsZoneGroups = new PrivateDnsZoneGroupsImpl(this);
+        }
+        return this.privateDnsZoneGroups;
+    }
+
+    /**
+     * @return Entry point to manage PrivateLinkServices.
+     */
+    public PrivateLinkServices privateLinkServices() {
+        if (this.privateLinkServices == null) {
+            this.privateLinkServices = new PrivateLinkServicesImpl(this);
+        }
+        return this.privateLinkServices;
+    }
+
+    /**
+     * @return Entry point to manage PublicIPAddresses.
+     */
+    public PublicIPAddresses publicIPAddresses() {
+        if (this.publicIPAddresses == null) {
+            this.publicIPAddresses = new PublicIPAddressesImpl(this);
+        }
+        return this.publicIPAddresses;
+    }
+
+    /**
+     * @return Entry point to manage PublicIPPrefixes.
+     */
+    public PublicIPPrefixes publicIPPrefixes() {
+        if (this.publicIPPrefixes == null) {
+            this.publicIPPrefixes = new PublicIPPrefixesImpl(this);
+        }
+        return this.publicIPPrefixes;
+    }
+
+    /**
+     * @return Entry point to manage RouteFilters.
+     */
+    public RouteFilters routeFilters() {
+        if (this.routeFilters == null) {
+            this.routeFilters = new RouteFiltersImpl(this);
+        }
+        return this.routeFilters;
+    }
+
+    /**
+     * @return Entry point to manage RouteFilterRules.
+     */
+    public RouteFilterRules routeFilterRules() {
+        if (this.routeFilterRules == null) {
+            this.routeFilterRules = new RouteFilterRulesImpl(this);
+        }
+        return this.routeFilterRules;
+    }
+
+    /**
+     * @return Entry point to manage RouteTables.
+     */
+    public RouteTables routeTables() {
+        if (this.routeTables == null) {
+            this.routeTables = new RouteTablesImpl(this);
+        }
+        return this.routeTables;
+    }
+
+    /**
+     * @return Entry point to manage Routes.
+     */
+    public Routes routes() {
+        if (this.routes == null) {
+            this.routes = new RoutesImpl(this);
+        }
+        return this.routes;
+    }
+
+    /**
+     * @return Entry point to manage SecurityPartnerProviders.
+     */
+    public SecurityPartnerProviders securityPartnerProviders() {
+        if (this.securityPartnerProviders == null) {
+            this.securityPartnerProviders = new SecurityPartnerProvidersImpl(this);
+        }
+        return this.securityPartnerProviders;
+    }
+
+    /**
+     * @return Entry point to manage BgpServiceCommunities.
+     */
+    public BgpServiceCommunities bgpServiceCommunities() {
+        if (this.bgpServiceCommunities == null) {
+            this.bgpServiceCommunities = new BgpServiceCommunitiesImpl(this);
+        }
+        return this.bgpServiceCommunities;
+    }
+
+    /**
+     * @return Entry point to manage ServiceEndpointPolicies.
+     */
+    public ServiceEndpointPolicies serviceEndpointPolicies() {
+        if (this.serviceEndpointPolicies == null) {
+            this.serviceEndpointPolicies = new ServiceEndpointPoliciesImpl(this);
+        }
+        return this.serviceEndpointPolicies;
+    }
+
+    /**
+     * @return Entry point to manage ServiceEndpointPolicyDefinitions.
+     */
+    public ServiceEndpointPolicyDefinitions serviceEndpointPolicyDefinitions() {
+        if (this.serviceEndpointPolicyDefinitions == null) {
+            this.serviceEndpointPolicyDefinitions = new ServiceEndpointPolicyDefinitionsImpl(this);
+        }
+        return this.serviceEndpointPolicyDefinitions;
+    }
+
+    /**
+     * @return Entry point to manage ServiceTags.
+     */
+    public ServiceTags serviceTags() {
+        if (this.serviceTags == null) {
+            this.serviceTags = new ServiceTagsImpl(this);
+        }
+        return this.serviceTags;
+    }
+
+    /**
+     * @return Entry point to manage Usages.
+     */
+    public Usages usages() {
+        if (this.usages == null) {
+            this.usages = new UsagesImpl(this);
+        }
+        return this.usages;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworks.
+     */
+    public VirtualNetworks virtualNetworks() {
+        if (this.virtualNetworks == null) {
+            this.virtualNetworks = new VirtualNetworksImpl(this);
+        }
+        return this.virtualNetworks;
+    }
+
+    /**
+     * @return Entry point to manage Subnets.
+     */
+    public Subnets subnets() {
+        if (this.subnets == null) {
+            this.subnets = new SubnetsImpl(this);
+        }
+        return this.subnets;
+    }
+
+    /**
+     * @return Entry point to manage ResourceNavigationLinks.
+     */
+    public ResourceNavigationLinks resourceNavigationLinks() {
+        if (this.resourceNavigationLinks == null) {
+            this.resourceNavigationLinks = new ResourceNavigationLinksImpl(this);
+        }
+        return this.resourceNavigationLinks;
+    }
+
+    /**
+     * @return Entry point to manage ServiceAssociationLinks.
+     */
+    public ServiceAssociationLinks serviceAssociationLinks() {
+        if (this.serviceAssociationLinks == null) {
+            this.serviceAssociationLinks = new ServiceAssociationLinksImpl(this);
+        }
+        return this.serviceAssociationLinks;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkPeerings.
+     */
+    public VirtualNetworkPeerings virtualNetworkPeerings() {
+        if (this.virtualNetworkPeerings == null) {
+            this.virtualNetworkPeerings = new VirtualNetworkPeeringsImpl(this);
+        }
+        return this.virtualNetworkPeerings;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkGateways.
+     */
+    public VirtualNetworkGateways virtualNetworkGateways() {
+        if (this.virtualNetworkGateways == null) {
+            this.virtualNetworkGateways = new VirtualNetworkGatewaysImpl(this);
+        }
+        return this.virtualNetworkGateways;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkGatewayConnections.
+     */
+    public VirtualNetworkGatewayConnections virtualNetworkGatewayConnections() {
+        if (this.virtualNetworkGatewayConnections == null) {
+            this.virtualNetworkGatewayConnections = new VirtualNetworkGatewayConnectionsImpl(this);
+        }
+        return this.virtualNetworkGatewayConnections;
+    }
+
+    /**
+     * @return Entry point to manage LocalNetworkGateways.
+     */
+    public LocalNetworkGateways localNetworkGateways() {
+        if (this.localNetworkGateways == null) {
+            this.localNetworkGateways = new LocalNetworkGatewaysImpl(this);
+        }
+        return this.localNetworkGateways;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkTaps.
+     */
+    public VirtualNetworkTaps virtualNetworkTaps() {
+        if (this.virtualNetworkTaps == null) {
+            this.virtualNetworkTaps = new VirtualNetworkTapsImpl(this);
+        }
+        return this.virtualNetworkTaps;
+    }
+
+    /**
+     * @return Entry point to manage VirtualRouters.
+     */
+    public VirtualRouters virtualRouters() {
+        if (this.virtualRouters == null) {
+            this.virtualRouters = new VirtualRoutersImpl(this);
+        }
+        return this.virtualRouters;
+    }
+
+    /**
+     * @return Entry point to manage VirtualRouterPeerings.
+     */
+    public VirtualRouterPeerings virtualRouterPeerings() {
+        if (this.virtualRouterPeerings == null) {
+            this.virtualRouterPeerings = new VirtualRouterPeeringsImpl(this);
+        }
+        return this.virtualRouterPeerings;
+    }
+
+    /**
+     * @return Entry point to manage VirtualWans.
+     */
+    public VirtualWans virtualWans() {
+        if (this.virtualWans == null) {
+            this.virtualWans = new VirtualWansImpl(this);
+        }
+        return this.virtualWans;
+    }
+
+    /**
+     * @return Entry point to manage VpnSites.
+     */
+    public VpnSites vpnSites() {
+        if (this.vpnSites == null) {
+            this.vpnSites = new VpnSitesImpl(this);
+        }
+        return this.vpnSites;
+    }
+
+    /**
+     * @return Entry point to manage VpnSiteLinks.
+     */
+    public VpnSiteLinks vpnSiteLinks() {
+        if (this.vpnSiteLinks == null) {
+            this.vpnSiteLinks = new VpnSiteLinksImpl(this);
+        }
+        return this.vpnSiteLinks;
+    }
+
+    /**
+     * @return Entry point to manage VpnSitesConfigurations.
+     */
+    public VpnSitesConfigurations vpnSitesConfigurations() {
+        if (this.vpnSitesConfigurations == null) {
+            this.vpnSitesConfigurations = new VpnSitesConfigurationsImpl(this);
+        }
+        return this.vpnSitesConfigurations;
+    }
+
+    /**
+     * @return Entry point to manage VpnServerConfigurations.
+     */
+    public VpnServerConfigurations vpnServerConfigurations() {
+        if (this.vpnServerConfigurations == null) {
+            this.vpnServerConfigurations = new VpnServerConfigurationsImpl(this);
+        }
+        return this.vpnServerConfigurations;
+    }
+
+    /**
+     * @return Entry point to manage VirtualHubs.
+     */
+    public VirtualHubs virtualHubs() {
+        if (this.virtualHubs == null) {
+            this.virtualHubs = new VirtualHubsImpl(this);
+        }
+        return this.virtualHubs;
+    }
+
+    /**
+     * @return Entry point to manage HubVirtualNetworkConnections.
+     */
+    public HubVirtualNetworkConnections hubVirtualNetworkConnections() {
+        if (this.hubVirtualNetworkConnections == null) {
+            this.hubVirtualNetworkConnections = new HubVirtualNetworkConnectionsImpl(this);
+        }
+        return this.hubVirtualNetworkConnections;
+    }
+
+    /**
+     * @return Entry point to manage VpnGateways.
+     */
+    public VpnGateways vpnGateways() {
+        if (this.vpnGateways == null) {
+            this.vpnGateways = new VpnGatewaysImpl(this);
+        }
+        return this.vpnGateways;
+    }
+
+    /**
+     * @return Entry point to manage VpnConnections.
+     */
+    public VpnConnections vpnConnections() {
+        if (this.vpnConnections == null) {
+            this.vpnConnections = new VpnConnectionsImpl(this);
+        }
+        return this.vpnConnections;
+    }
+
+    /**
+     * @return Entry point to manage VpnSiteLinkConnections.
+     */
+    public VpnSiteLinkConnections vpnSiteLinkConnections() {
+        if (this.vpnSiteLinkConnections == null) {
+            this.vpnSiteLinkConnections = new VpnSiteLinkConnectionsImpl(this);
+        }
+        return this.vpnSiteLinkConnections;
+    }
+
+    /**
+     * @return Entry point to manage VpnLinkConnections.
+     */
+    public VpnLinkConnections vpnLinkConnections() {
+        if (this.vpnLinkConnections == null) {
+            this.vpnLinkConnections = new VpnLinkConnectionsImpl(this);
+        }
+        return this.vpnLinkConnections;
+    }
+
+    /**
+     * @return Entry point to manage P2sVpnGateways.
+     */
+    public P2sVpnGateways p2sVpnGateways() {
+        if (this.p2sVpnGateways == null) {
+            this.p2sVpnGateways = new P2sVpnGatewaysImpl(this);
+        }
+        return this.p2sVpnGateways;
+    }
+
+    /**
+     * @return Entry point to manage VpnServerConfigurationsAssociatedWithVirtualWans.
+     */
+    public VpnServerConfigurationsAssociatedWithVirtualWans vpnServerConfigurationsAssociatedWithVirtualWans() {
+        if (this.vpnServerConfigurationsAssociatedWithVirtualWans == null) {
+            this.vpnServerConfigurationsAssociatedWithVirtualWans = new VpnServerConfigurationsAssociatedWithVirtualWansImpl(this);
+        }
+        return this.vpnServerConfigurationsAssociatedWithVirtualWans;
+    }
+
+    /**
+     * @return Entry point to manage VirtualHubRouteTableV2s.
+     */
+    public VirtualHubRouteTableV2s virtualHubRouteTableV2s() {
+        if (this.virtualHubRouteTableV2s == null) {
+            this.virtualHubRouteTableV2s = new VirtualHubRouteTableV2sImpl(this);
+        }
+        return this.virtualHubRouteTableV2s;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteGateways.
+     */
+    public ExpressRouteGateways expressRouteGateways() {
+        if (this.expressRouteGateways == null) {
+            this.expressRouteGateways = new ExpressRouteGatewaysImpl(this);
+        }
+        return this.expressRouteGateways;
+    }
+
+    /**
+     * @return Entry point to manage ExpressRouteConnections.
+     */
+    public ExpressRouteConnections expressRouteConnections() {
+        if (this.expressRouteConnections == null) {
+            this.expressRouteConnections = new ExpressRouteConnectionsImpl(this);
+        }
+        return this.expressRouteConnections;
+    }
+
+    /**
+     * @return Entry point to manage HubRouteTables.
+     */
+    public HubRouteTables hubRouteTables() {
+        if (this.hubRouteTables == null) {
+            this.hubRouteTables = new HubRouteTablesImpl(this);
+        }
+        return this.hubRouteTables;
+    }
+
+    /**
+     * @return Entry point to manage WebApplicationFirewallPolicies.
+     */
+    public WebApplicationFirewallPolicies webApplicationFirewallPolicies() {
+        if (this.webApplicationFirewallPolicies == null) {
+            this.webApplicationFirewallPolicies = new WebApplicationFirewallPoliciesImpl(this);
+        }
+        return this.webApplicationFirewallPolicies;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public NetworkManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return NetworkManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private NetworkManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new NetworkManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileImpl.java
new file mode 100644
index 000000000000..1b1a601df452
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkProfile;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ContainerNetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.ContainerNetworkInterfaceConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class NetworkProfileImpl extends GroupableResourceCoreImpl<NetworkProfile, NetworkProfileInner, NetworkProfileImpl, NetworkManager> implements NetworkProfile, NetworkProfile.Definition, NetworkProfile.Update {
+    NetworkProfileImpl(String name, NetworkProfileInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NetworkProfile> createResourceAsync() {
+        NetworkProfilesInner client = this.manager().inner().networkProfiles();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkProfile> updateResourceAsync() {
+        NetworkProfilesInner client = this.manager().inner().networkProfiles();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkProfileInner> getInnerAsync() {
+        NetworkProfilesInner client = this.manager().inner().networkProfiles();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations() {
+        return this.inner().containerNetworkInterfaceConfigurations();
+    }
+
+    @Override
+    public List<ContainerNetworkInterface> containerNetworkInterfaces() {
+        return this.inner().containerNetworkInterfaces();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public NetworkProfileImpl withContainerNetworkInterfaceConfigurations(List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations) {
+        this.inner().withContainerNetworkInterfaceConfigurations(containerNetworkInterfaceConfigurations);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileInner.java
new file mode 100644
index 000000000000..e64af8d9d373
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfileInner.java
@@ -0,0 +1,139 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ContainerNetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.ContainerNetworkInterfaceConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Network profile resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NetworkProfileInner extends Resource {
+    /**
+     * List of child container network interfaces.
+     */
+    @JsonProperty(value = "properties.containerNetworkInterfaces", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ContainerNetworkInterface> containerNetworkInterfaces;
+
+    /**
+     * List of chid container network interface configurations.
+     */
+    @JsonProperty(value = "properties.containerNetworkInterfaceConfigurations")
+    private List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations;
+
+    /**
+     * The resource GUID property of the network profile resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the network profile resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get list of child container network interfaces.
+     *
+     * @return the containerNetworkInterfaces value
+     */
+    public List<ContainerNetworkInterface> containerNetworkInterfaces() {
+        return this.containerNetworkInterfaces;
+    }
+
+    /**
+     * Get list of chid container network interface configurations.
+     *
+     * @return the containerNetworkInterfaceConfigurations value
+     */
+    public List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations() {
+        return this.containerNetworkInterfaceConfigurations;
+    }
+
+    /**
+     * Set list of chid container network interface configurations.
+     *
+     * @param containerNetworkInterfaceConfigurations the containerNetworkInterfaceConfigurations value to set
+     * @return the NetworkProfileInner object itself.
+     */
+    public NetworkProfileInner withContainerNetworkInterfaceConfigurations(List<ContainerNetworkInterfaceConfiguration> containerNetworkInterfaceConfigurations) {
+        this.containerNetworkInterfaceConfigurations = containerNetworkInterfaceConfigurations;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the network profile resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the network profile resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkProfileInner object itself.
+     */
+    public NetworkProfileInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesImpl.java
new file mode 100644
index 000000000000..7a06278fbd05
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkProfiles;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkProfile;
+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;
+
+class NetworkProfilesImpl extends GroupableResourcesCoreImpl<NetworkProfile, NetworkProfileImpl, NetworkProfileInner, NetworkProfilesInner, NetworkManager>  implements NetworkProfiles {
+    protected NetworkProfilesImpl(NetworkManager manager) {
+        super(manager.inner().networkProfiles(), manager);
+    }
+
+    @Override
+    protected Observable<NetworkProfileInner> getInnerAsync(String resourceGroupName, String name) {
+        NetworkProfilesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NetworkProfilesInner 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<NetworkProfile> listByResourceGroup(String resourceGroupName) {
+        NetworkProfilesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NetworkProfile> listByResourceGroupAsync(String resourceGroupName) {
+        NetworkProfilesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NetworkProfileInner>, Iterable<NetworkProfileInner>>() {
+            @Override
+            public Iterable<NetworkProfileInner> call(Page<NetworkProfileInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkProfileInner, NetworkProfile>() {
+            @Override
+            public NetworkProfile call(NetworkProfileInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NetworkProfile> list() {
+        NetworkProfilesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NetworkProfile> listAsync() {
+        NetworkProfilesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NetworkProfileInner>, Iterable<NetworkProfileInner>>() {
+            @Override
+            public Iterable<NetworkProfileInner> call(Page<NetworkProfileInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkProfileInner, NetworkProfile>() {
+            @Override
+            public NetworkProfile call(NetworkProfileInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NetworkProfileImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected NetworkProfileImpl wrapModel(NetworkProfileInner inner) {
+        return  new NetworkProfileImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NetworkProfileImpl wrapModel(String name) {
+        return new NetworkProfileImpl(name, new NetworkProfileInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesInner.java
new file mode 100644
index 000000000000..fb563d411f74
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkProfilesInner.java
@@ -0,0 +1,1111 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 NetworkProfiles.
+ */
+public class NetworkProfilesInner implements InnerSupportsGet<NetworkProfileInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NetworkProfileInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkProfilesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkProfilesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkProfilesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkProfilesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkProfiles to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkProfilesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkProfiles delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkProfileName") String networkProfileName, @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.network.v2020_04_01.NetworkProfiles beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkProfileName") String networkProfileName, @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.network.v2020_04_01.NetworkProfiles getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("networkProfileName") String networkProfileName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkProfiles createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkProfileName") String networkProfileName, @Path("subscriptionId") String subscriptionId, @Body NetworkProfileInner 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.network.v2020_04_01.NetworkProfiles updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("networkProfileName") String networkProfileName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkProfiles list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/networkProfiles")
+        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.network.v2020_04_01.NetworkProfiles listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles")
+        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.network.v2020_04_01.NetworkProfiles 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.network.v2020_04_01.NetworkProfiles listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @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 networkProfileName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkProfileName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @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 networkProfileName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkProfileName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkProfileName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkProfileName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkProfileName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkProfileName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @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 networkProfileName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkProfileName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @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 networkProfileName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkProfileName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkProfileName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkProfileName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the NetworkProfile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkProfileName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkProfileName, this.client.subscriptionId(), 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 specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @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 NetworkProfileInner object if successful.
+     */
+    public NetworkProfileInner getByResourceGroup(String resourceGroupName, String networkProfileName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @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<NetworkProfileInner> getByResourceGroupAsync(String resourceGroupName, String networkProfileName, final ServiceCallback<NetworkProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<NetworkProfileInner> getByResourceGroupAsync(String resourceGroupName, String networkProfileName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName).map(new Func1<ServiceResponse<NetworkProfileInner>, NetworkProfileInner>() {
+            @Override
+            public NetworkProfileInner call(ServiceResponse<NetworkProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<ServiceResponse<NetworkProfileInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkProfileName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, networkProfileName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkProfileInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @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 NetworkProfileInner object if successful.
+     */
+    public NetworkProfileInner getByResourceGroup(String resourceGroupName, String networkProfileName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @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<NetworkProfileInner> getByResourceGroupAsync(String resourceGroupName, String networkProfileName, String expand, final ServiceCallback<NetworkProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<NetworkProfileInner> getByResourceGroupAsync(String resourceGroupName, String networkProfileName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkProfileName, expand).map(new Func1<ServiceResponse<NetworkProfileInner>, NetworkProfileInner>() {
+            @Override
+            public NetworkProfileInner call(ServiceResponse<NetworkProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network profile in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<ServiceResponse<NetworkProfileInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkProfileName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, networkProfileName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkProfileInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkProfileInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkProfileInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkProfileInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param parameters Parameters supplied to the create or update network profile 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 NetworkProfileInner object if successful.
+     */
+    public NetworkProfileInner createOrUpdate(String resourceGroupName, String networkProfileName, NetworkProfileInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkProfileName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param parameters Parameters supplied to the create or update network profile operation.
+     * @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<NetworkProfileInner> createOrUpdateAsync(String resourceGroupName, String networkProfileName, NetworkProfileInner parameters, final ServiceCallback<NetworkProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkProfileName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param parameters Parameters supplied to the create or update network profile operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkProfileInner> createOrUpdateAsync(String resourceGroupName, String networkProfileName, NetworkProfileInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkProfileName, parameters).map(new Func1<ServiceResponse<NetworkProfileInner>, NetworkProfileInner>() {
+            @Override
+            public NetworkProfileInner call(ServiceResponse<NetworkProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network profile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param parameters Parameters supplied to the create or update network profile operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkProfileInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkProfileName, NetworkProfileInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkProfileName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NetworkProfileInner>() { }.getType());
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @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 NetworkProfileInner object if successful.
+     */
+    public NetworkProfileInner updateTags(String resourceGroupName, String networkProfileName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @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<NetworkProfileInner> updateTagsAsync(String resourceGroupName, String networkProfileName, final ServiceCallback<NetworkProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName), serviceCallback);
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<NetworkProfileInner> updateTagsAsync(String resourceGroupName, String networkProfileName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName).map(new Func1<ServiceResponse<NetworkProfileInner>, NetworkProfileInner>() {
+            @Override
+            public NetworkProfileInner call(ServiceResponse<NetworkProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<ServiceResponse<NetworkProfileInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkProfileName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, networkProfileName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkProfileInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param tags Resource tags.
+     * @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 NetworkProfileInner object if successful.
+     */
+    public NetworkProfileInner updateTags(String resourceGroupName, String networkProfileName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param tags Resource tags.
+     * @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<NetworkProfileInner> updateTagsAsync(String resourceGroupName, String networkProfileName, Map<String, String> tags, final ServiceCallback<NetworkProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<NetworkProfileInner> updateTagsAsync(String resourceGroupName, String networkProfileName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkProfileName, tags).map(new Func1<ServiceResponse<NetworkProfileInner>, NetworkProfileInner>() {
+            @Override
+            public NetworkProfileInner call(ServiceResponse<NetworkProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates network profile tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkProfileName The name of the network profile.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkProfileInner object
+     */
+    public Observable<ServiceResponse<NetworkProfileInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkProfileName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkProfileName == null) {
+            throw new IllegalArgumentException("Parameter networkProfileName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, networkProfileName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkProfileInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkProfileInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkProfileInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkProfileInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the network profiles in a 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;NetworkProfileInner&gt; object if successful.
+     */
+    public PagedList<NetworkProfileInner> list() {
+        ServiceResponse<Page<NetworkProfileInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NetworkProfileInner>(response.body()) {
+            @Override
+            public Page<NetworkProfileInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the network profiles in a 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<NetworkProfileInner>> listAsync(final ListOperationCallback<NetworkProfileInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkProfileInner&gt; object
+     */
+    public Observable<Page<NetworkProfileInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Page<NetworkProfileInner>>() {
+                @Override
+                public Page<NetworkProfileInner> call(ServiceResponse<Page<NetworkProfileInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkProfileInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(ServiceResponse<Page<NetworkProfileInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkProfileInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkProfileInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkProfileInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkProfileInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkProfileInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkProfileInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;NetworkProfileInner&gt; object if successful.
+     */
+    public PagedList<NetworkProfileInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NetworkProfileInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NetworkProfileInner>(response.body()) {
+            @Override
+            public Page<NetworkProfileInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<NetworkProfileInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NetworkProfileInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkProfileInner&gt; object
+     */
+    public Observable<Page<NetworkProfileInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Page<NetworkProfileInner>>() {
+                @Override
+                public Page<NetworkProfileInner> call(ServiceResponse<Page<NetworkProfileInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkProfileInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(ServiceResponse<Page<NetworkProfileInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkProfileInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkProfileInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkProfileInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkProfileInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkProfileInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkProfileInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkProfileInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @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;NetworkProfileInner&gt; object if successful.
+     */
+    public PagedList<NetworkProfileInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkProfileInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkProfileInner>(response.body()) {
+            @Override
+            public Page<NetworkProfileInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @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<NetworkProfileInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkProfileInner>> serviceFuture, final ListOperationCallback<NetworkProfileInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @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;NetworkProfileInner&gt; object
+     */
+    public Observable<Page<NetworkProfileInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Page<NetworkProfileInner>>() {
+                @Override
+                public Page<NetworkProfileInner> call(ServiceResponse<Page<NetworkProfileInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+     * @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;NetworkProfileInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(ServiceResponse<Page<NetworkProfileInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the network profiles in a subscription.
+     *
+    ServiceResponse<PageImpl<NetworkProfileInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkProfileInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> 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<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkProfileInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkProfileInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkProfileInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkProfileInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkProfileInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network profiles in 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;NetworkProfileInner&gt; object if successful.
+     */
+    public PagedList<NetworkProfileInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkProfileInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkProfileInner>(response.body()) {
+            @Override
+            public Page<NetworkProfileInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network profiles in 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<NetworkProfileInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkProfileInner>> serviceFuture, final ListOperationCallback<NetworkProfileInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network profiles in 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;NetworkProfileInner&gt; object
+     */
+    public Observable<Page<NetworkProfileInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Page<NetworkProfileInner>>() {
+                @Override
+                public Page<NetworkProfileInner> call(ServiceResponse<Page<NetworkProfileInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network profiles in 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;NetworkProfileInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkProfileInner>>, Observable<ServiceResponse<Page<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(ServiceResponse<Page<NetworkProfileInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network profiles in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkProfileInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkProfileInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkProfileInner>>> 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<NetworkProfileInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkProfileInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkProfileInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkProfileInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkProfileInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkProfileInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkProfileInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupImpl.java
new file mode 100644
index 000000000000..113bcf2f47c5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupImpl.java
@@ -0,0 +1,129 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroup;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroupSecurityRule;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLog;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class NetworkSecurityGroupImpl extends GroupableResourceCoreImpl<NetworkSecurityGroup, NetworkSecurityGroupInner, NetworkSecurityGroupImpl, NetworkManager> implements NetworkSecurityGroup, NetworkSecurityGroup.Definition, NetworkSecurityGroup.Update {
+    NetworkSecurityGroupImpl(String name, NetworkSecurityGroupInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroup> createResourceAsync() {
+        NetworkSecurityGroupsInner client = this.manager().inner().networkSecurityGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroup> updateResourceAsync() {
+        NetworkSecurityGroupsInner client = this.manager().inner().networkSecurityGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkSecurityGroupInner> getInnerAsync() {
+        NetworkSecurityGroupsInner client = this.manager().inner().networkSecurityGroups();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<NetworkSecurityGroupSecurityRule> defaultSecurityRules() {
+        List<NetworkSecurityGroupSecurityRule> lst = new ArrayList<NetworkSecurityGroupSecurityRule>();
+        if (this.inner().defaultSecurityRules() != null) {
+            for (SecurityRuleInner inner : this.inner().defaultSecurityRules()) {
+                lst.add( new NetworkSecurityGroupSecurityRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<FlowLog> flowLogs() {
+        List<FlowLog> lst = new ArrayList<FlowLog>();
+        if (this.inner().flowLogs() != null) {
+            for (FlowLogInner inner : this.inner().flowLogs()) {
+                lst.add( new FlowLogImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<NetworkInterface> networkInterfaces() {
+        List<NetworkInterface> lst = new ArrayList<NetworkInterface>();
+        if (this.inner().networkInterfaces() != null) {
+            for (NetworkInterfaceInner inner : this.inner().networkInterfaces()) {
+                lst.add( new NetworkInterfaceImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<NetworkSecurityGroupSecurityRule> securityRules() {
+        List<NetworkSecurityGroupSecurityRule> lst = new ArrayList<NetworkSecurityGroupSecurityRule>();
+        if (this.inner().securityRules() != null) {
+            for (SecurityRuleInner inner : this.inner().securityRules()) {
+                lst.add( new NetworkSecurityGroupSecurityRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<Subnet> subnets() {
+        List<Subnet> lst = new ArrayList<Subnet>();
+        if (this.inner().subnets() != null) {
+            for (SubnetInner inner : this.inner().subnets()) {
+                lst.add( new SubnetImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public NetworkSecurityGroupImpl withSecurityRules(List<SecurityRuleInner> securityRules) {
+        this.inner().withSecurityRules(securityRules);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupInner.java
new file mode 100644
index 000000000000..9534f1988c5d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupInner.java
@@ -0,0 +1,182 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * NetworkSecurityGroup resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NetworkSecurityGroupInner extends Resource {
+    /**
+     * A collection of security rules of the network security group.
+     */
+    @JsonProperty(value = "properties.securityRules")
+    private List<SecurityRuleInner> securityRules;
+
+    /**
+     * The default security rules of network security group.
+     */
+    @JsonProperty(value = "properties.defaultSecurityRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SecurityRuleInner> defaultSecurityRules;
+
+    /**
+     * A collection of references to network interfaces.
+     */
+    @JsonProperty(value = "properties.networkInterfaces", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceInner> networkInterfaces;
+
+    /**
+     * A collection of references to subnets.
+     */
+    @JsonProperty(value = "properties.subnets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubnetInner> subnets;
+
+    /**
+     * A collection of references to flow log resources.
+     */
+    @JsonProperty(value = "properties.flowLogs", access = JsonProperty.Access.WRITE_ONLY)
+    private List<FlowLogInner> flowLogs;
+
+    /**
+     * The resource GUID property of the network security group resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the network security group resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get a collection of security rules of the network security group.
+     *
+     * @return the securityRules value
+     */
+    public List<SecurityRuleInner> securityRules() {
+        return this.securityRules;
+    }
+
+    /**
+     * Set a collection of security rules of the network security group.
+     *
+     * @param securityRules the securityRules value to set
+     * @return the NetworkSecurityGroupInner object itself.
+     */
+    public NetworkSecurityGroupInner withSecurityRules(List<SecurityRuleInner> securityRules) {
+        this.securityRules = securityRules;
+        return this;
+    }
+
+    /**
+     * Get the default security rules of network security group.
+     *
+     * @return the defaultSecurityRules value
+     */
+    public List<SecurityRuleInner> defaultSecurityRules() {
+        return this.defaultSecurityRules;
+    }
+
+    /**
+     * Get a collection of references to network interfaces.
+     *
+     * @return the networkInterfaces value
+     */
+    public List<NetworkInterfaceInner> networkInterfaces() {
+        return this.networkInterfaces;
+    }
+
+    /**
+     * Get a collection of references to subnets.
+     *
+     * @return the subnets value
+     */
+    public List<SubnetInner> subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * Get a collection of references to flow log resources.
+     *
+     * @return the flowLogs value
+     */
+    public List<FlowLogInner> flowLogs() {
+        return this.flowLogs;
+    }
+
+    /**
+     * Get the resource GUID property of the network security group resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the network security group resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkSecurityGroupInner object itself.
+     */
+    public NetworkSecurityGroupInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleImpl.java
new file mode 100644
index 000000000000..da121058bac2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroupSecurityRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleProtocol;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleAccess;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleDirection;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+
+class NetworkSecurityGroupSecurityRuleImpl extends CreatableUpdatableImpl<NetworkSecurityGroupSecurityRule, SecurityRuleInner, NetworkSecurityGroupSecurityRuleImpl> implements NetworkSecurityGroupSecurityRule, NetworkSecurityGroupSecurityRule.Definition, NetworkSecurityGroupSecurityRule.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkSecurityGroupName;
+    private String securityRuleName;
+
+    NetworkSecurityGroupSecurityRuleImpl(String name, NetworkManager manager) {
+        super(name, new SecurityRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.securityRuleName = name;
+        //
+    }
+
+    NetworkSecurityGroupSecurityRuleImpl(SecurityRuleInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.securityRuleName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkSecurityGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkSecurityGroups");
+        this.securityRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "securityRules");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRule> createResourceAsync() {
+        SecurityRulesInner client = this.manager().inner().securityRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkSecurityGroupName, this.securityRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRule> updateResourceAsync() {
+        SecurityRulesInner client = this.manager().inner().securityRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.networkSecurityGroupName, this.securityRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SecurityRuleInner> getInnerAsync() {
+        SecurityRulesInner client = this.manager().inner().securityRules();
+        return client.getAsync(this.resourceGroupName, this.networkSecurityGroupName, this.securityRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public SecurityRuleAccess access() {
+        return this.inner().access();
+    }
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String destinationAddressPrefix() {
+        return this.inner().destinationAddressPrefix();
+    }
+
+    @Override
+    public List<String> destinationAddressPrefixes() {
+        return this.inner().destinationAddressPrefixes();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> destinationApplicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().destinationApplicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().destinationApplicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String destinationPortRange() {
+        return this.inner().destinationPortRange();
+    }
+
+    @Override
+    public List<String> destinationPortRanges() {
+        return this.inner().destinationPortRanges();
+    }
+
+    @Override
+    public SecurityRuleDirection direction() {
+        return this.inner().direction();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer priority() {
+        return this.inner().priority();
+    }
+
+    @Override
+    public SecurityRuleProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String sourceAddressPrefix() {
+        return this.inner().sourceAddressPrefix();
+    }
+
+    @Override
+    public List<String> sourceAddressPrefixes() {
+        return this.inner().sourceAddressPrefixes();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> sourceApplicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().sourceApplicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().sourceApplicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String sourcePortRange() {
+        return this.inner().sourcePortRange();
+    }
+
+    @Override
+    public List<String> sourcePortRanges() {
+        return this.inner().sourcePortRanges();
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withExistingNetworkSecurityGroup(String resourceGroupName, String networkSecurityGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        this.networkSecurityGroupName = networkSecurityGroupName;
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withAccess(SecurityRuleAccess access) {
+        this.inner().withAccess(access);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDirection(SecurityRuleDirection direction) {
+        this.inner().withDirection(direction);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withProtocol(SecurityRuleProtocol protocol) {
+        this.inner().withProtocol(protocol);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDescription(String description) {
+        this.inner().withDescription(description);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDestinationAddressPrefix(String destinationAddressPrefix) {
+        this.inner().withDestinationAddressPrefix(destinationAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDestinationAddressPrefixes(List<String> destinationAddressPrefixes) {
+        this.inner().withDestinationAddressPrefixes(destinationAddressPrefixes);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups) {
+        this.inner().withDestinationApplicationSecurityGroups(destinationApplicationSecurityGroups);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDestinationPortRange(String destinationPortRange) {
+        this.inner().withDestinationPortRange(destinationPortRange);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withDestinationPortRanges(List<String> destinationPortRanges) {
+        this.inner().withDestinationPortRanges(destinationPortRanges);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withPriority(Integer priority) {
+        this.inner().withPriority(priority);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withSourceAddressPrefix(String sourceAddressPrefix) {
+        this.inner().withSourceAddressPrefix(sourceAddressPrefix);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withSourceAddressPrefixes(List<String> sourceAddressPrefixes) {
+        this.inner().withSourceAddressPrefixes(sourceAddressPrefixes);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups) {
+        this.inner().withSourceApplicationSecurityGroups(sourceApplicationSecurityGroups);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withSourcePortRange(String sourcePortRange) {
+        this.inner().withSourcePortRange(sourcePortRange);
+        return this;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl withSourcePortRanges(List<String> sourcePortRanges) {
+        this.inner().withSourcePortRanges(sourcePortRanges);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleModelImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleModelImpl.java
new file mode 100644
index 000000000000..fd06dcb25c90
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupSecurityRuleModelImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroupSecurityRuleModel;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleAccess;
+import java.util.List;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleDirection;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class NetworkSecurityGroupSecurityRuleModelImpl extends IndexableRefreshableWrapperImpl<NetworkSecurityGroupSecurityRuleModel, SecurityRuleInner> implements NetworkSecurityGroupSecurityRuleModel {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkSecurityGroupName;
+    private String defaultSecurityRuleName;
+
+    NetworkSecurityGroupSecurityRuleModelImpl(SecurityRuleInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkSecurityGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkSecurityGroups");
+        this.defaultSecurityRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "defaultSecurityRules");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<SecurityRuleInner> getInnerAsync() {
+        DefaultSecurityRulesInner client = this.manager().inner().defaultSecurityRules();
+        return client.getAsync(this.resourceGroupName, this.networkSecurityGroupName, this.defaultSecurityRuleName);
+    }
+
+
+
+    @Override
+    public SecurityRuleAccess access() {
+        return this.inner().access();
+    }
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String destinationAddressPrefix() {
+        return this.inner().destinationAddressPrefix();
+    }
+
+    @Override
+    public List<String> destinationAddressPrefixes() {
+        return this.inner().destinationAddressPrefixes();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> destinationApplicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().destinationApplicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().destinationApplicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String destinationPortRange() {
+        return this.inner().destinationPortRange();
+    }
+
+    @Override
+    public List<String> destinationPortRanges() {
+        return this.inner().destinationPortRanges();
+    }
+
+    @Override
+    public SecurityRuleDirection direction() {
+        return this.inner().direction();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer priority() {
+        return this.inner().priority();
+    }
+
+    @Override
+    public SecurityRuleProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String sourceAddressPrefix() {
+        return this.inner().sourceAddressPrefix();
+    }
+
+    @Override
+    public List<String> sourceAddressPrefixes() {
+        return this.inner().sourceAddressPrefixes();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> sourceApplicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().sourceApplicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().sourceApplicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String sourcePortRange() {
+        return this.inner().sourcePortRange();
+    }
+
+    @Override
+    public List<String> sourcePortRanges() {
+        return this.inner().sourcePortRanges();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsImpl.java
new file mode 100644
index 000000000000..e10e70d31961
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroups;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroup;
+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;
+
+class NetworkSecurityGroupsImpl extends GroupableResourcesCoreImpl<NetworkSecurityGroup, NetworkSecurityGroupImpl, NetworkSecurityGroupInner, NetworkSecurityGroupsInner, NetworkManager>  implements NetworkSecurityGroups {
+    protected NetworkSecurityGroupsImpl(NetworkManager manager) {
+        super(manager.inner().networkSecurityGroups(), manager);
+    }
+
+    @Override
+    protected Observable<NetworkSecurityGroupInner> getInnerAsync(String resourceGroupName, String name) {
+        NetworkSecurityGroupsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NetworkSecurityGroupsInner 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<NetworkSecurityGroup> listByResourceGroup(String resourceGroupName) {
+        NetworkSecurityGroupsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroup> listByResourceGroupAsync(String resourceGroupName) {
+        NetworkSecurityGroupsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NetworkSecurityGroupInner>, Iterable<NetworkSecurityGroupInner>>() {
+            @Override
+            public Iterable<NetworkSecurityGroupInner> call(Page<NetworkSecurityGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkSecurityGroupInner, NetworkSecurityGroup>() {
+            @Override
+            public NetworkSecurityGroup call(NetworkSecurityGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NetworkSecurityGroup> list() {
+        NetworkSecurityGroupsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroup> listAsync() {
+        NetworkSecurityGroupsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NetworkSecurityGroupInner>, Iterable<NetworkSecurityGroupInner>>() {
+            @Override
+            public Iterable<NetworkSecurityGroupInner> call(Page<NetworkSecurityGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkSecurityGroupInner, NetworkSecurityGroup>() {
+            @Override
+            public NetworkSecurityGroup call(NetworkSecurityGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NetworkSecurityGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected NetworkSecurityGroupImpl wrapModel(NetworkSecurityGroupInner inner) {
+        return  new NetworkSecurityGroupImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NetworkSecurityGroupImpl wrapModel(String name) {
+        return new NetworkSecurityGroupImpl(name, new NetworkSecurityGroupInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsInner.java
new file mode 100644
index 000000000000..c40983be88ec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkSecurityGroupsInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 NetworkSecurityGroups.
+ */
+public class NetworkSecurityGroupsInner implements InnerSupportsGet<NetworkSecurityGroupInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NetworkSecurityGroupInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkSecurityGroupsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkSecurityGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkSecurityGroupsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkSecurityGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkSecurityGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkSecurityGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @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.network.v2020_04_01.NetworkSecurityGroups beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @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.network.v2020_04_01.NetworkSecurityGroups getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkSecurityGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Body NetworkSecurityGroupInner 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.network.v2020_04_01.NetworkSecurityGroups beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Body NetworkSecurityGroupInner 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.network.v2020_04_01.NetworkSecurityGroups updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroups list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/networkSecurityGroups")
+        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.network.v2020_04_01.NetworkSecurityGroups listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups")
+        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.network.v2020_04_01.NetworkSecurityGroups 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.network.v2020_04_01.NetworkSecurityGroups listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 networkSecurityGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 networkSecurityGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkSecurityGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 networkSecurityGroupName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 networkSecurityGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkSecurityGroupName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), 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 specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner getByResourceGroup(String resourceGroupName, String networkSecurityGroupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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<NetworkSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String networkSecurityGroupName, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<NetworkSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String networkSecurityGroupName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkSecurityGroupInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param expand Expands referenced resources.
+     * @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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner getByResourceGroup(String resourceGroupName, String networkSecurityGroupName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param expand Expands referenced resources.
+     * @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<NetworkSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String networkSecurityGroupName, String expand, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<NetworkSecurityGroupInner> getByResourceGroupAsync(String resourceGroupName, String networkSecurityGroupName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, expand).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkSecurityGroupInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkSecurityGroupInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group 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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner createOrUpdate(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @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<NetworkSecurityGroupInner> createOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkSecurityGroupInner> createOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NetworkSecurityGroupInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group 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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner beginCreateOrUpdate(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @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<NetworkSecurityGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<NetworkSecurityGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, parameters).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network security group in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param parameters Parameters supplied to the create or update network security group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, NetworkSecurityGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkSecurityGroupInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkSecurityGroupInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkSecurityGroupInner>() { }.getType())
+                .register(201, new TypeToken<NetworkSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner updateTags(String resourceGroupName, String networkSecurityGroupName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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<NetworkSecurityGroupInner> updateTagsAsync(String resourceGroupName, String networkSecurityGroupName, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName), serviceCallback);
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<NetworkSecurityGroupInner> updateTagsAsync(String resourceGroupName, String networkSecurityGroupName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkSecurityGroupInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param tags Resource tags.
+     * @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 NetworkSecurityGroupInner object if successful.
+     */
+    public NetworkSecurityGroupInner updateTags(String resourceGroupName, String networkSecurityGroupName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param tags Resource tags.
+     * @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<NetworkSecurityGroupInner> updateTagsAsync(String resourceGroupName, String networkSecurityGroupName, Map<String, String> tags, final ServiceCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<NetworkSecurityGroupInner> updateTagsAsync(String resourceGroupName, String networkSecurityGroupName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, tags).map(new Func1<ServiceResponse<NetworkSecurityGroupInner>, NetworkSecurityGroupInner>() {
+            @Override
+            public NetworkSecurityGroupInner call(ServiceResponse<NetworkSecurityGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network security group tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkSecurityGroupInner object
+     */
+    public Observable<ServiceResponse<NetworkSecurityGroupInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkSecurityGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkSecurityGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkSecurityGroupInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkSecurityGroupInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkSecurityGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkSecurityGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network security groups in a 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;NetworkSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<NetworkSecurityGroupInner> list() {
+        ServiceResponse<Page<NetworkSecurityGroupInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NetworkSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<NetworkSecurityGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network security groups in a 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<NetworkSecurityGroupInner>> listAsync(final ListOperationCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<Page<NetworkSecurityGroupInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Page<NetworkSecurityGroupInner>>() {
+                @Override
+                public Page<NetworkSecurityGroupInner> call(ServiceResponse<Page<NetworkSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(ServiceResponse<Page<NetworkSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkSecurityGroupInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkSecurityGroupInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;NetworkSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<NetworkSecurityGroupInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NetworkSecurityGroupInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NetworkSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<NetworkSecurityGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<NetworkSecurityGroupInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<Page<NetworkSecurityGroupInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Page<NetworkSecurityGroupInner>>() {
+                @Override
+                public Page<NetworkSecurityGroupInner> call(ServiceResponse<Page<NetworkSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(ServiceResponse<Page<NetworkSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkSecurityGroupInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkSecurityGroupInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkSecurityGroupInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @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;NetworkSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<NetworkSecurityGroupInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkSecurityGroupInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<NetworkSecurityGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @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<NetworkSecurityGroupInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkSecurityGroupInner>> serviceFuture, final ListOperationCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @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;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<Page<NetworkSecurityGroupInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Page<NetworkSecurityGroupInner>>() {
+                @Override
+                public Page<NetworkSecurityGroupInner> call(ServiceResponse<Page<NetworkSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+     * @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;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(ServiceResponse<Page<NetworkSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a subscription.
+     *
+    ServiceResponse<PageImpl<NetworkSecurityGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> 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<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkSecurityGroupInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkSecurityGroupInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network security groups in 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;NetworkSecurityGroupInner&gt; object if successful.
+     */
+    public PagedList<NetworkSecurityGroupInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkSecurityGroupInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkSecurityGroupInner>(response.body()) {
+            @Override
+            public Page<NetworkSecurityGroupInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all network security groups in 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<NetworkSecurityGroupInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkSecurityGroupInner>> serviceFuture, final ListOperationCallback<NetworkSecurityGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all network security groups in 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;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<Page<NetworkSecurityGroupInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Page<NetworkSecurityGroupInner>>() {
+                @Override
+                public Page<NetworkSecurityGroupInner> call(ServiceResponse<Page<NetworkSecurityGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in 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;NetworkSecurityGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkSecurityGroupInner>>, Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(ServiceResponse<Page<NetworkSecurityGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all network security groups in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkSecurityGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkSecurityGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> 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<NetworkSecurityGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkSecurityGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkSecurityGroupInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkSecurityGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkSecurityGroupInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkSecurityGroupInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkSecurityGroupInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceImpl.java
new file mode 100644
index 000000000000..d31cbaa1b7c6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliance;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualApplianceNicProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualApplianceSkuProperties;
+
+class NetworkVirtualApplianceImpl extends GroupableResourceCoreImpl<NetworkVirtualAppliance, NetworkVirtualApplianceInner, NetworkVirtualApplianceImpl, NetworkManager> implements NetworkVirtualAppliance, NetworkVirtualAppliance.Definition, NetworkVirtualAppliance.Update {
+    NetworkVirtualApplianceImpl(String name, NetworkVirtualApplianceInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NetworkVirtualAppliance> createResourceAsync() {
+        NetworkVirtualAppliancesInner client = this.manager().inner().networkVirtualAppliances();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkVirtualAppliance> updateResourceAsync() {
+        NetworkVirtualAppliancesInner client = this.manager().inner().networkVirtualAppliances();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkVirtualApplianceInner> getInnerAsync() {
+        NetworkVirtualAppliancesInner client = this.manager().inner().networkVirtualAppliances();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<String> bootStrapConfigurationBlob() {
+        return this.inner().bootStrapConfigurationBlob();
+    }
+
+    @Override
+    public List<String> cloudInitConfigurationBlob() {
+        return this.inner().cloudInitConfigurationBlob();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ManagedServiceIdentity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public VirtualApplianceSkuProperties sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public Long virtualApplianceAsn() {
+        return this.inner().virtualApplianceAsn();
+    }
+
+    @Override
+    public List<VirtualApplianceNicProperties> virtualApplianceNics() {
+        return this.inner().virtualApplianceNics();
+    }
+
+    @Override
+    public SubResource virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withBootStrapConfigurationBlob(List<String> bootStrapConfigurationBlob) {
+        this.inner().withBootStrapConfigurationBlob(bootStrapConfigurationBlob);
+        return this;
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withCloudInitConfigurationBlob(List<String> cloudInitConfigurationBlob) {
+        this.inner().withCloudInitConfigurationBlob(cloudInitConfigurationBlob);
+        return this;
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withIdentity(ManagedServiceIdentity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withSku(VirtualApplianceSkuProperties sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withVirtualApplianceAsn(Long virtualApplianceAsn) {
+        this.inner().withVirtualApplianceAsn(virtualApplianceAsn);
+        return this;
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl withVirtualHub(SubResource virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceInner.java
new file mode 100644
index 000000000000..ebd695551e9a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualApplianceInner.java
@@ -0,0 +1,257 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualApplianceNicProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualApplianceSkuProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * NetworkVirtualAppliance Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NetworkVirtualApplianceInner extends Resource {
+    /**
+     * BootStrapConfigurationBlob storage URLs.
+     */
+    @JsonProperty(value = "properties.bootStrapConfigurationBlob")
+    private List<String> bootStrapConfigurationBlob;
+
+    /**
+     * The Virtual Hub where Network Virtual Appliance is being deployed.
+     */
+    @JsonProperty(value = "properties.virtualHub")
+    private SubResource virtualHub;
+
+    /**
+     * CloudInitConfigurationBlob storage URLs.
+     */
+    @JsonProperty(value = "properties.cloudInitConfigurationBlob")
+    private List<String> cloudInitConfigurationBlob;
+
+    /**
+     * VirtualAppliance ASN.
+     */
+    @JsonProperty(value = "properties.virtualApplianceAsn")
+    private Long virtualApplianceAsn;
+
+    /**
+     * List of Virtual Appliance Network Interfaces.
+     */
+    @JsonProperty(value = "properties.virtualApplianceNics", access = JsonProperty.Access.WRITE_ONLY)
+    private List<VirtualApplianceNicProperties> virtualApplianceNics;
+
+    /**
+     * The provisioning state of the resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The service principal that has read access to cloud-init and config
+     * blob.
+     */
+    @JsonProperty(value = "identity")
+    private ManagedServiceIdentity identity;
+
+    /**
+     * Network Virtual Appliance SKU.
+     */
+    @JsonProperty(value = "sku")
+    private VirtualApplianceSkuProperties sku;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get bootStrapConfigurationBlob storage URLs.
+     *
+     * @return the bootStrapConfigurationBlob value
+     */
+    public List<String> bootStrapConfigurationBlob() {
+        return this.bootStrapConfigurationBlob;
+    }
+
+    /**
+     * Set bootStrapConfigurationBlob storage URLs.
+     *
+     * @param bootStrapConfigurationBlob the bootStrapConfigurationBlob value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withBootStrapConfigurationBlob(List<String> bootStrapConfigurationBlob) {
+        this.bootStrapConfigurationBlob = bootStrapConfigurationBlob;
+        return this;
+    }
+
+    /**
+     * Get the Virtual Hub where Network Virtual Appliance is being deployed.
+     *
+     * @return the virtualHub value
+     */
+    public SubResource virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the Virtual Hub where Network Virtual Appliance is being deployed.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withVirtualHub(SubResource virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get cloudInitConfigurationBlob storage URLs.
+     *
+     * @return the cloudInitConfigurationBlob value
+     */
+    public List<String> cloudInitConfigurationBlob() {
+        return this.cloudInitConfigurationBlob;
+    }
+
+    /**
+     * Set cloudInitConfigurationBlob storage URLs.
+     *
+     * @param cloudInitConfigurationBlob the cloudInitConfigurationBlob value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withCloudInitConfigurationBlob(List<String> cloudInitConfigurationBlob) {
+        this.cloudInitConfigurationBlob = cloudInitConfigurationBlob;
+        return this;
+    }
+
+    /**
+     * Get virtualAppliance ASN.
+     *
+     * @return the virtualApplianceAsn value
+     */
+    public Long virtualApplianceAsn() {
+        return this.virtualApplianceAsn;
+    }
+
+    /**
+     * Set virtualAppliance ASN.
+     *
+     * @param virtualApplianceAsn the virtualApplianceAsn value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withVirtualApplianceAsn(Long virtualApplianceAsn) {
+        this.virtualApplianceAsn = virtualApplianceAsn;
+        return this;
+    }
+
+    /**
+     * Get list of Virtual Appliance Network Interfaces.
+     *
+     * @return the virtualApplianceNics value
+     */
+    public List<VirtualApplianceNicProperties> virtualApplianceNics() {
+        return this.virtualApplianceNics;
+    }
+
+    /**
+     * Get the provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the service principal that has read access to cloud-init and config blob.
+     *
+     * @return the identity value
+     */
+    public ManagedServiceIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the service principal that has read access to cloud-init and config blob.
+     *
+     * @param identity the identity value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withIdentity(ManagedServiceIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Get network Virtual Appliance SKU.
+     *
+     * @return the sku value
+     */
+    public VirtualApplianceSkuProperties sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set network Virtual Appliance SKU.
+     *
+     * @param sku the sku value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withSku(VirtualApplianceSkuProperties sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesImpl.java
new file mode 100644
index 000000000000..f416288406e6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliances;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliance;
+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;
+
+class NetworkVirtualAppliancesImpl extends GroupableResourcesCoreImpl<NetworkVirtualAppliance, NetworkVirtualApplianceImpl, NetworkVirtualApplianceInner, NetworkVirtualAppliancesInner, NetworkManager>  implements NetworkVirtualAppliances {
+    protected NetworkVirtualAppliancesImpl(NetworkManager manager) {
+        super(manager.inner().networkVirtualAppliances(), manager);
+    }
+
+    @Override
+    protected Observable<NetworkVirtualApplianceInner> getInnerAsync(String resourceGroupName, String name) {
+        NetworkVirtualAppliancesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NetworkVirtualAppliancesInner 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<NetworkVirtualAppliance> listByResourceGroup(String resourceGroupName) {
+        NetworkVirtualAppliancesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NetworkVirtualAppliance> listByResourceGroupAsync(String resourceGroupName) {
+        NetworkVirtualAppliancesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NetworkVirtualApplianceInner>, Iterable<NetworkVirtualApplianceInner>>() {
+            @Override
+            public Iterable<NetworkVirtualApplianceInner> call(Page<NetworkVirtualApplianceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkVirtualApplianceInner, NetworkVirtualAppliance>() {
+            @Override
+            public NetworkVirtualAppliance call(NetworkVirtualApplianceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NetworkVirtualAppliance> list() {
+        NetworkVirtualAppliancesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NetworkVirtualAppliance> listAsync() {
+        NetworkVirtualAppliancesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NetworkVirtualApplianceInner>, Iterable<NetworkVirtualApplianceInner>>() {
+            @Override
+            public Iterable<NetworkVirtualApplianceInner> call(Page<NetworkVirtualApplianceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkVirtualApplianceInner, NetworkVirtualAppliance>() {
+            @Override
+            public NetworkVirtualAppliance call(NetworkVirtualApplianceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NetworkVirtualApplianceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected NetworkVirtualApplianceImpl wrapModel(NetworkVirtualApplianceInner inner) {
+        return  new NetworkVirtualApplianceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NetworkVirtualApplianceImpl wrapModel(String name) {
+        return new NetworkVirtualApplianceImpl(name, new NetworkVirtualApplianceInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesInner.java
new file mode 100644
index 000000000000..ee08ac2e6104
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkVirtualAppliancesInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 NetworkVirtualAppliances.
+ */
+public class NetworkVirtualAppliancesInner implements InnerSupportsGet<NetworkVirtualApplianceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NetworkVirtualApplianceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkVirtualAppliancesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkVirtualAppliancesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkVirtualAppliancesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkVirtualAppliancesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkVirtualAppliances to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkVirtualAppliancesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliances delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @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.network.v2020_04_01.NetworkVirtualAppliances beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @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.network.v2020_04_01.NetworkVirtualAppliances getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.NetworkVirtualAppliances updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkVirtualAppliances createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @Path("subscriptionId") String subscriptionId, @Body NetworkVirtualApplianceInner 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.network.v2020_04_01.NetworkVirtualAppliances beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkVirtualApplianceName") String networkVirtualApplianceName, @Path("subscriptionId") String subscriptionId, @Body NetworkVirtualApplianceInner 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.network.v2020_04_01.NetworkVirtualAppliances listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances")
+        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.network.v2020_04_01.NetworkVirtualAppliances list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/networkVirtualAppliances")
+        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.network.v2020_04_01.NetworkVirtualAppliances 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.network.v2020_04_01.NetworkVirtualAppliances listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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 networkVirtualApplianceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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 networkVirtualApplianceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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 networkVirtualApplianceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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 networkVirtualApplianceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), 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 specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner getByResourceGroup(String resourceGroupName, String networkVirtualApplianceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @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<NetworkVirtualApplianceInner> getByResourceGroupAsync(String resourceGroupName, String networkVirtualApplianceName, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<NetworkVirtualApplianceInner> getByResourceGroupAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkVirtualApplianceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkVirtualApplianceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkVirtualApplianceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param expand Expands referenced resources.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner getByResourceGroup(String resourceGroupName, String networkVirtualApplianceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param expand Expands referenced resources.
+     * @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<NetworkVirtualApplianceInner> getByResourceGroupAsync(String resourceGroupName, String networkVirtualApplianceName, String expand, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<NetworkVirtualApplianceInner> getByResourceGroupAsync(String resourceGroupName, String networkVirtualApplianceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, expand).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkVirtualApplianceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkVirtualApplianceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkVirtualApplianceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkVirtualApplianceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkVirtualApplianceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkVirtualApplianceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner updateTags(String resourceGroupName, String networkVirtualApplianceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being 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<NetworkVirtualApplianceInner> updateTagsAsync(String resourceGroupName, String networkVirtualApplianceName, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName), serviceCallback);
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<NetworkVirtualApplianceInner> updateTagsAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName) {
+        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 (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, networkVirtualApplianceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkVirtualApplianceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkVirtualApplianceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkVirtualApplianceInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @param tags Resource tags.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner updateTags(String resourceGroupName, String networkVirtualApplianceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @param tags Resource tags.
+     * @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<NetworkVirtualApplianceInner> updateTagsAsync(String resourceGroupName, String networkVirtualApplianceName, Map<String, String> tags, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<NetworkVirtualApplianceInner> updateTagsAsync(String resourceGroupName, String networkVirtualApplianceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, tags).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a Network Virtual Appliance.
+     *
+     * @param resourceGroupName The resource group name of Network Virtual Appliance.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName, Map<String, String> tags) {
+        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 (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, networkVirtualApplianceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkVirtualApplianceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkVirtualApplianceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkVirtualApplianceInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkVirtualApplianceInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkVirtualApplianceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkVirtualApplianceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner createOrUpdate(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @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<NetworkVirtualApplianceInner> createOrUpdateAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkVirtualApplianceInner> createOrUpdateAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NetworkVirtualApplianceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @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 NetworkVirtualApplianceInner object if successful.
+     */
+    public NetworkVirtualApplianceInner beginCreateOrUpdate(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @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<NetworkVirtualApplianceInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters, final ServiceCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<NetworkVirtualApplianceInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkVirtualApplianceName, parameters).map(new Func1<ServiceResponse<NetworkVirtualApplianceInner>, NetworkVirtualApplianceInner>() {
+            @Override
+            public NetworkVirtualApplianceInner call(ServiceResponse<NetworkVirtualApplianceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Network Virtual Appliance.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkVirtualApplianceName The name of Network Virtual Appliance.
+     * @param parameters Parameters supplied to the create or update Network Virtual Appliance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkVirtualApplianceInner object
+     */
+    public Observable<ServiceResponse<NetworkVirtualApplianceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkVirtualApplianceName, NetworkVirtualApplianceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkVirtualApplianceName == null) {
+            throw new IllegalArgumentException("Parameter networkVirtualApplianceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkVirtualApplianceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkVirtualApplianceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkVirtualApplianceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkVirtualApplianceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkVirtualApplianceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkVirtualApplianceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkVirtualApplianceInner>() { }.getType())
+                .register(201, new TypeToken<NetworkVirtualApplianceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;NetworkVirtualApplianceInner&gt; object if successful.
+     */
+    public PagedList<NetworkVirtualApplianceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NetworkVirtualApplianceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NetworkVirtualApplianceInner>(response.body()) {
+            @Override
+            public Page<NetworkVirtualApplianceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<NetworkVirtualApplianceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<Page<NetworkVirtualApplianceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Page<NetworkVirtualApplianceInner>>() {
+                @Override
+                public Page<NetworkVirtualApplianceInner> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkVirtualApplianceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkVirtualApplianceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkVirtualApplianceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkVirtualApplianceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a 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;NetworkVirtualApplianceInner&gt; object if successful.
+     */
+    public PagedList<NetworkVirtualApplianceInner> list() {
+        ServiceResponse<Page<NetworkVirtualApplianceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NetworkVirtualApplianceInner>(response.body()) {
+            @Override
+            public Page<NetworkVirtualApplianceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a 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<NetworkVirtualApplianceInner>> listAsync(final ListOperationCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<Page<NetworkVirtualApplianceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Page<NetworkVirtualApplianceInner>>() {
+                @Override
+                public Page<NetworkVirtualApplianceInner> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkVirtualApplianceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkVirtualApplianceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkVirtualApplianceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkVirtualApplianceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in 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;NetworkVirtualApplianceInner&gt; object if successful.
+     */
+    public PagedList<NetworkVirtualApplianceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkVirtualApplianceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkVirtualApplianceInner>(response.body()) {
+            @Override
+            public Page<NetworkVirtualApplianceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in 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<NetworkVirtualApplianceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkVirtualApplianceInner>> serviceFuture, final ListOperationCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in 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;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<Page<NetworkVirtualApplianceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Page<NetworkVirtualApplianceInner>>() {
+                @Override
+                public Page<NetworkVirtualApplianceInner> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in 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;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Network Virtual Appliances in a resource group.
+     *
+    ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkVirtualApplianceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> 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<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkVirtualApplianceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkVirtualApplianceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkVirtualApplianceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @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;NetworkVirtualApplianceInner&gt; object if successful.
+     */
+    public PagedList<NetworkVirtualApplianceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkVirtualApplianceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkVirtualApplianceInner>(response.body()) {
+            @Override
+            public Page<NetworkVirtualApplianceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @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<NetworkVirtualApplianceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkVirtualApplianceInner>> serviceFuture, final ListOperationCallback<NetworkVirtualApplianceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @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;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<Page<NetworkVirtualApplianceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Page<NetworkVirtualApplianceInner>>() {
+                @Override
+                public Page<NetworkVirtualApplianceInner> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+     * @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;NetworkVirtualApplianceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkVirtualApplianceInner>>, Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(ServiceResponse<Page<NetworkVirtualApplianceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all Network Virtual Appliances in a subscription.
+     *
+    ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkVirtualApplianceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> 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<NetworkVirtualApplianceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkVirtualApplianceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkVirtualApplianceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkVirtualApplianceInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkVirtualApplianceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkVirtualApplianceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherImpl.java
new file mode 100644
index 000000000000..ca1b10f38330
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkWatcher;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class NetworkWatcherImpl extends GroupableResourceCoreImpl<NetworkWatcher, NetworkWatcherInner, NetworkWatcherImpl, NetworkManager> implements NetworkWatcher, NetworkWatcher.Definition, NetworkWatcher.Update {
+    NetworkWatcherImpl(String name, NetworkWatcherInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<NetworkWatcher> createResourceAsync() {
+        NetworkWatchersInner client = this.manager().inner().networkWatchers();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NetworkWatcher> updateResourceAsync() {
+        NetworkWatchersInner client = this.manager().inner().networkWatchers();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NetworkWatcherInner> getInnerAsync() {
+        NetworkWatchersInner client = this.manager().inner().networkWatchers();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherInner.java
new file mode 100644
index 000000000000..ab009394d6f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatcherInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Network watcher in a resource group.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NetworkWatcherInner extends Resource {
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The provisioning state of the network watcher resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the provisioning state of the network watcher resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the NetworkWatcherInner object itself.
+     */
+    public NetworkWatcherInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersImpl.java
new file mode 100644
index 000000000000..43700de560ac
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersImpl.java
@@ -0,0 +1,300 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkWatcher;
+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.network.v2020_04_01.Topology;
+import com.microsoft.azure.management.network.v2020_04_01.VerificationIPFlowResult;
+import com.microsoft.azure.management.network.v2020_04_01.NextHopResult;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityGroupViewResult;
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingResult;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogInformation;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityInformation;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReport;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableProvidersList;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticResponse;
+import com.microsoft.azure.management.network.v2020_04_01.TopologyParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VerificationIPFlowParameters;
+import com.microsoft.azure.management.network.v2020_04_01.NextHopParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingParameters;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityParameters;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportParameters;
+import com.microsoft.azure.management.network.v2020_04_01.AvailableProvidersListParameters;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticParameters;
+
+class NetworkWatchersImpl extends GroupableResourcesCoreImpl<NetworkWatcher, NetworkWatcherImpl, NetworkWatcherInner, NetworkWatchersInner, NetworkManager>  implements NetworkWatchers {
+    protected NetworkWatchersImpl(NetworkManager manager) {
+        super(manager.inner().networkWatchers(), manager);
+    }
+
+    @Override
+    protected Observable<NetworkWatcherInner> getInnerAsync(String resourceGroupName, String name) {
+        NetworkWatchersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NetworkWatchersInner 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<NetworkWatcher> listByResourceGroup(String resourceGroupName) {
+        NetworkWatchersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NetworkWatcher> listByResourceGroupAsync(String resourceGroupName) {
+        NetworkWatchersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMap(new Func1<Page<NetworkWatcherInner>, Observable<NetworkWatcherInner>>() {
+            @Override
+            public Observable<NetworkWatcherInner> call(Page<NetworkWatcherInner> innerPage) {
+                return Observable.from(innerPage.items());
+            }
+        })
+        .map(new Func1<NetworkWatcherInner, NetworkWatcher>() {
+            @Override
+            public NetworkWatcher call(NetworkWatcherInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NetworkWatcher> list() {
+        NetworkWatchersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NetworkWatcher> listAsync() {
+        NetworkWatchersInner client = this.inner();
+        return client.listAsync()
+        .flatMap(new Func1<Page<NetworkWatcherInner>, Observable<NetworkWatcherInner>>() {
+            @Override
+            public Observable<NetworkWatcherInner> call(Page<NetworkWatcherInner> innerPage) {
+                return Observable.from(innerPage.items());
+            }
+        })
+        .map(new Func1<NetworkWatcherInner, NetworkWatcher>() {
+            @Override
+            public NetworkWatcher call(NetworkWatcherInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NetworkWatcherImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<Topology> getTopologyAsync(String resourceGroupName, String networkWatcherName, TopologyParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getTopologyAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<TopologyInner, Topology>() {
+            @Override
+            public Topology call(TopologyInner inner) {
+                return new TopologyImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VerificationIPFlowResult> verifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.verifyIPFlowAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<VerificationIPFlowResultInner, VerificationIPFlowResult>() {
+            @Override
+            public VerificationIPFlowResult call(VerificationIPFlowResultInner inner) {
+                return new VerificationIPFlowResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<NextHopResult> getNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getNextHopAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<NextHopResultInner, NextHopResult>() {
+            @Override
+            public NextHopResult call(NextHopResultInner inner) {
+                return new NextHopResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<SecurityGroupViewResult> getVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        NetworkWatchersInner client = this.inner();
+        return client.getVMSecurityRulesAsync(resourceGroupName, networkWatcherName, targetResourceId)
+        .map(new Func1<SecurityGroupViewResultInner, SecurityGroupViewResult>() {
+            @Override
+            public SecurityGroupViewResult call(SecurityGroupViewResultInner inner) {
+                return new SecurityGroupViewResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<TroubleshootingResult> getTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getTroubleshootingAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<TroubleshootingResultInner, TroubleshootingResult>() {
+            @Override
+            public TroubleshootingResult call(TroubleshootingResultInner inner) {
+                return new TroubleshootingResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<TroubleshootingResult> getTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        NetworkWatchersInner client = this.inner();
+        return client.getTroubleshootingResultAsync(resourceGroupName, networkWatcherName, targetResourceId)
+        .map(new Func1<TroubleshootingResultInner, TroubleshootingResult>() {
+            @Override
+            public TroubleshootingResult call(TroubleshootingResultInner inner) {
+                return new TroubleshootingResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<FlowLogInformation> setFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.setFlowLogConfigurationAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<FlowLogInformationInner, FlowLogInformation>() {
+            @Override
+            public FlowLogInformation call(FlowLogInformationInner inner) {
+                return new FlowLogInformationImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<FlowLogInformation> getFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        NetworkWatchersInner client = this.inner();
+        return client.getFlowLogStatusAsync(resourceGroupName, networkWatcherName, targetResourceId)
+        .map(new Func1<FlowLogInformationInner, FlowLogInformation>() {
+            @Override
+            public FlowLogInformation call(FlowLogInformationInner inner) {
+                return new FlowLogInformationImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConnectivityInformation> checkConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.checkConnectivityAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<ConnectivityInformationInner, ConnectivityInformation>() {
+            @Override
+            public ConnectivityInformation call(ConnectivityInformationInner inner) {
+                return new ConnectivityInformationImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AzureReachabilityReport> getAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getAzureReachabilityReportAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<AzureReachabilityReportInner, AzureReachabilityReport>() {
+            @Override
+            public AzureReachabilityReport call(AzureReachabilityReportInner inner) {
+                return new AzureReachabilityReportImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AvailableProvidersList> listAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.listAvailableProvidersAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<AvailableProvidersListInner, AvailableProvidersList>() {
+            @Override
+            public AvailableProvidersList call(AvailableProvidersListInner inner) {
+                return new AvailableProvidersListImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkConfigurationDiagnosticResponse> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getNetworkConfigurationDiagnosticAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<NetworkConfigurationDiagnosticResponseInner, NetworkConfigurationDiagnosticResponse>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponse call(NetworkConfigurationDiagnosticResponseInner inner) {
+                return new NetworkConfigurationDiagnosticResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected NetworkWatcherImpl wrapModel(NetworkWatcherInner inner) {
+        return  new NetworkWatcherImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NetworkWatcherImpl wrapModel(String name) {
+        return new NetworkWatcherImpl(name, new NetworkWatcherInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersInner.java
new file mode 100644
index 000000000000..a9629626d420
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NetworkWatchersInner.java
@@ -0,0 +1,2812 @@
+/**
+ * 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.network.v2020_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.management.network.v2020_04_01.AvailableProvidersListParameters;
+import com.microsoft.azure.management.network.v2020_04_01.AzureReachabilityReportParameters;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectivityParameters;
+import com.microsoft.azure.management.network.v2020_04_01.ErrorResponseException;
+import com.microsoft.azure.management.network.v2020_04_01.FlowLogStatusParameters;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkConfigurationDiagnosticParameters;
+import com.microsoft.azure.management.network.v2020_04_01.NextHopParameters;
+import com.microsoft.azure.management.network.v2020_04_01.QueryTroubleshootingParameters;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityGroupViewParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+import com.microsoft.azure.management.network.v2020_04_01.TopologyParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VerificationIPFlowParameters;
+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 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.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in NetworkWatchers.
+ */
+public class NetworkWatchersInner implements InnerSupportsGet<NetworkWatcherInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NetworkWatcherInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NetworkWatchersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkWatchersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NetworkWatchersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(NetworkWatchersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkWatchers to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NetworkWatchersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NetworkWatcherInner 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.network.v2020_04_01.NetworkWatchers getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @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.network.v2020_04_01.NetworkWatchers delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @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.network.v2020_04_01.NetworkWatchers beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @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.network.v2020_04_01.NetworkWatchers updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers")
+        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.network.v2020_04_01.NetworkWatchers list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/networkWatchers")
+        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.network.v2020_04_01.NetworkWatchers getTopology" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/topology")
+        Observable<Response<ResponseBody>> getTopology(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body TopologyParameters 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.network.v2020_04_01.NetworkWatchers verifyIPFlow" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/ipFlowVerify")
+        Observable<Response<ResponseBody>> verifyIPFlow(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body VerificationIPFlowParameters 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.network.v2020_04_01.NetworkWatchers beginVerifyIPFlow" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/ipFlowVerify")
+        Observable<Response<ResponseBody>> beginVerifyIPFlow(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body VerificationIPFlowParameters 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.network.v2020_04_01.NetworkWatchers getNextHop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/nextHop")
+        Observable<Response<ResponseBody>> getNextHop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NextHopParameters 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.network.v2020_04_01.NetworkWatchers beginGetNextHop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/nextHop")
+        Observable<Response<ResponseBody>> beginGetNextHop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NextHopParameters 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.network.v2020_04_01.NetworkWatchers getVMSecurityRules" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/securityGroupView")
+        Observable<Response<ResponseBody>> getVMSecurityRules(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body SecurityGroupViewParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers beginGetVMSecurityRules" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/securityGroupView")
+        Observable<Response<ResponseBody>> beginGetVMSecurityRules(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body SecurityGroupViewParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers getTroubleshooting" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/troubleshoot")
+        Observable<Response<ResponseBody>> getTroubleshooting(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body TroubleshootingParameters 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.network.v2020_04_01.NetworkWatchers beginGetTroubleshooting" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/troubleshoot")
+        Observable<Response<ResponseBody>> beginGetTroubleshooting(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body TroubleshootingParameters 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.network.v2020_04_01.NetworkWatchers getTroubleshootingResult" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryTroubleshootResult")
+        Observable<Response<ResponseBody>> getTroubleshootingResult(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body QueryTroubleshootingParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers beginGetTroubleshootingResult" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryTroubleshootResult")
+        Observable<Response<ResponseBody>> beginGetTroubleshootingResult(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body QueryTroubleshootingParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers setFlowLogConfiguration" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog")
+        Observable<Response<ResponseBody>> setFlowLogConfiguration(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body FlowLogInformationInner 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.network.v2020_04_01.NetworkWatchers beginSetFlowLogConfiguration" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog")
+        Observable<Response<ResponseBody>> beginSetFlowLogConfiguration(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body FlowLogInformationInner 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.network.v2020_04_01.NetworkWatchers getFlowLogStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus")
+        Observable<Response<ResponseBody>> getFlowLogStatus(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body FlowLogStatusParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers beginGetFlowLogStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus")
+        Observable<Response<ResponseBody>> beginGetFlowLogStatus(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body FlowLogStatusParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.NetworkWatchers checkConnectivity" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectivityCheck")
+        Observable<Response<ResponseBody>> checkConnectivity(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body ConnectivityParameters 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.network.v2020_04_01.NetworkWatchers beginCheckConnectivity" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectivityCheck")
+        Observable<Response<ResponseBody>> beginCheckConnectivity(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body ConnectivityParameters 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.network.v2020_04_01.NetworkWatchers getAzureReachabilityReport" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/azureReachabilityReport")
+        Observable<Response<ResponseBody>> getAzureReachabilityReport(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body AzureReachabilityReportParameters 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.network.v2020_04_01.NetworkWatchers beginGetAzureReachabilityReport" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/azureReachabilityReport")
+        Observable<Response<ResponseBody>> beginGetAzureReachabilityReport(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body AzureReachabilityReportParameters 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.network.v2020_04_01.NetworkWatchers listAvailableProviders" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/availableProvidersList")
+        Observable<Response<ResponseBody>> listAvailableProviders(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body AvailableProvidersListParameters 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.network.v2020_04_01.NetworkWatchers beginListAvailableProviders" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/availableProvidersList")
+        Observable<Response<ResponseBody>> beginListAvailableProviders(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body AvailableProvidersListParameters 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.network.v2020_04_01.NetworkWatchers getNetworkConfigurationDiagnostic" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/networkConfigurationDiagnostic")
+        Observable<Response<ResponseBody>> getNetworkConfigurationDiagnostic(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NetworkConfigurationDiagnosticParameters 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.network.v2020_04_01.NetworkWatchers beginGetNetworkConfigurationDiagnostic" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/networkConfigurationDiagnostic")
+        Observable<Response<ResponseBody>> beginGetNetworkConfigurationDiagnostic(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NetworkConfigurationDiagnosticParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a network watcher in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the network watcher 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 NetworkWatcherInner object if successful.
+     */
+    public NetworkWatcherInner createOrUpdate(String resourceGroupName, String networkWatcherName, NetworkWatcherInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a network watcher in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the network watcher 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<NetworkWatcherInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, NetworkWatcherInner parameters, final ServiceCallback<NetworkWatcherInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a network watcher in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the network watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<NetworkWatcherInner> createOrUpdateAsync(String resourceGroupName, String networkWatcherName, NetworkWatcherInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NetworkWatcherInner>, NetworkWatcherInner>() {
+            @Override
+            public NetworkWatcherInner call(ServiceResponse<NetworkWatcherInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a network watcher in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the network watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<ServiceResponse<NetworkWatcherInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NetworkWatcherInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.createOrUpdate(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkWatcherInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkWatcherInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkWatcherInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
+                .register(201, new TypeToken<NetworkWatcherInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified network watcher by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 NetworkWatcherInner object if successful.
+     */
+    public NetworkWatcherInner getByResourceGroup(String resourceGroupName, String networkWatcherName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified network watcher by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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<NetworkWatcherInner> getByResourceGroupAsync(String resourceGroupName, String networkWatcherName, final ServiceCallback<NetworkWatcherInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified network watcher by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<NetworkWatcherInner> getByResourceGroupAsync(String resourceGroupName, String networkWatcherName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<NetworkWatcherInner>, NetworkWatcherInner>() {
+            @Override
+            public NetworkWatcherInner call(ServiceResponse<NetworkWatcherInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified network watcher by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<ServiceResponse<NetworkWatcherInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkWatcherInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkWatcherInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkWatcherInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 networkWatcherName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 networkWatcherName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkWatcherName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 networkWatcherName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 networkWatcherName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkWatcherName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network watcher resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkWatcherName, this.client.subscriptionId(), 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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 NetworkWatcherInner object if successful.
+     */
+    public NetworkWatcherInner updateTags(String resourceGroupName, String networkWatcherName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @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<NetworkWatcherInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, final ServiceCallback<NetworkWatcherInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<NetworkWatcherInner> updateTagsAsync(String resourceGroupName, String networkWatcherName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<NetworkWatcherInner>, NetworkWatcherInner>() {
+            @Override
+            public NetworkWatcherInner call(ServiceResponse<NetworkWatcherInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<ServiceResponse<NetworkWatcherInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkWatcherInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkWatcherInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param tags Resource tags.
+     * @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 NetworkWatcherInner object if successful.
+     */
+    public NetworkWatcherInner updateTags(String resourceGroupName, String networkWatcherName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param tags Resource tags.
+     * @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<NetworkWatcherInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, Map<String, String> tags, final ServiceCallback<NetworkWatcherInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<NetworkWatcherInner> updateTagsAsync(String resourceGroupName, String networkWatcherName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, networkWatcherName, tags).map(new Func1<ServiceResponse<NetworkWatcherInner>, NetworkWatcherInner>() {
+            @Override
+            public NetworkWatcherInner call(ServiceResponse<NetworkWatcherInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a network watcher tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkWatcherInner object
+     */
+    public Observable<ServiceResponse<NetworkWatcherInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkWatcherInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkWatcherInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkWatcherInner> updateTagsDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network watchers by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the PagedList<NetworkWatcherInner> object if successful.
+     */
+    public PagedList<NetworkWatcherInner> listByResourceGroup(String resourceGroupName) {
+        PageImpl1<NetworkWatcherInner> page = new PageImpl1<>();
+        page.setItems(listByResourceGroupWithServiceResponseAsync(resourceGroupName).toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<NetworkWatcherInner>(page) {
+            @Override
+            public Page<NetworkWatcherInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Gets all network watchers by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<NetworkWatcherInner>> listByResourceGroupAsync(String resourceGroupName, final ServiceCallback<List<NetworkWatcherInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listByResourceGroupWithServiceResponseAsync(resourceGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets all network watchers by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the observable to the List&lt;NetworkWatcherInner&gt; object
+     */
+    public Observable<Page<NetworkWatcherInner>> listByResourceGroupAsync(String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName).map(new Func1<ServiceResponse<List<NetworkWatcherInner>>, Page<NetworkWatcherInner>>() {
+            @Override
+            public Page<NetworkWatcherInner> call(ServiceResponse<List<NetworkWatcherInner>> response) {
+                PageImpl1<NetworkWatcherInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Gets all network watchers by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @return the observable to the List&lt;NetworkWatcherInner&gt; object
+     */
+    public Observable<ServiceResponse<List<NetworkWatcherInner>>> listByResourceGroupWithServiceResponseAsync(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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<NetworkWatcherInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<NetworkWatcherInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<NetworkWatcherInner>> result = listByResourceGroupDelegate(response);
+                        List<NetworkWatcherInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<NetworkWatcherInner>> clientResponse = new ServiceResponse<List<NetworkWatcherInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<NetworkWatcherInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all network watchers by subscription.
+     *
+     * @return the PagedList<NetworkWatcherInner> object if successful.
+     */
+    public PagedList<NetworkWatcherInner> list() {
+        PageImpl1<NetworkWatcherInner> page = new PageImpl1<>();
+        page.setItems(listWithServiceResponseAsync().toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<NetworkWatcherInner>(page) {
+            @Override
+            public Page<NetworkWatcherInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Gets all network watchers by subscription.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<NetworkWatcherInner>> listAsync(final ServiceCallback<List<NetworkWatcherInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Gets all network watchers by subscription.
+     *
+     * @return the observable to the List&lt;NetworkWatcherInner&gt; object
+     */
+    public Observable<Page<NetworkWatcherInner>> listAsync() {
+        return listWithServiceResponseAsync().map(new Func1<ServiceResponse<List<NetworkWatcherInner>>, Page<NetworkWatcherInner>>() {
+            @Override
+            public Page<NetworkWatcherInner> call(ServiceResponse<List<NetworkWatcherInner>> response) {
+                PageImpl1<NetworkWatcherInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Gets all network watchers by subscription.
+     *
+     * @return the observable to the List&lt;NetworkWatcherInner&gt; object
+     */
+    public Observable<ServiceResponse<List<NetworkWatcherInner>>> listWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<NetworkWatcherInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<NetworkWatcherInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<NetworkWatcherInner>> result = listDelegate(response);
+                        List<NetworkWatcherInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<NetworkWatcherInner>> clientResponse = new ServiceResponse<List<NetworkWatcherInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<NetworkWatcherInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the current network topology by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the representation of topology.
+     * @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 TopologyInner object if successful.
+     */
+    public TopologyInner getTopology(String resourceGroupName, String networkWatcherName, TopologyParameters parameters) {
+        return getTopologyWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the current network topology by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the representation of topology.
+     * @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<TopologyInner> getTopologyAsync(String resourceGroupName, String networkWatcherName, TopologyParameters parameters, final ServiceCallback<TopologyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getTopologyWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets the current network topology by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the representation of topology.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TopologyInner object
+     */
+    public Observable<TopologyInner> getTopologyAsync(String resourceGroupName, String networkWatcherName, TopologyParameters parameters) {
+        return getTopologyWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<TopologyInner>, TopologyInner>() {
+            @Override
+            public TopologyInner call(ServiceResponse<TopologyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the current network topology by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the representation of topology.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TopologyInner object
+     */
+    public Observable<ServiceResponse<TopologyInner>> getTopologyWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, TopologyParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.getTopology(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<TopologyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<TopologyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<TopologyInner> clientResponse = getTopologyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<TopologyInner> getTopologyDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TopologyInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<TopologyInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @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 VerificationIPFlowResultInner object if successful.
+     */
+    public VerificationIPFlowResultInner verifyIPFlow(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        return verifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @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<VerificationIPFlowResultInner> verifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters, final ServiceCallback<VerificationIPFlowResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(verifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VerificationIPFlowResultInner> verifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        return verifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<VerificationIPFlowResultInner>, VerificationIPFlowResultInner>() {
+            @Override
+            public VerificationIPFlowResultInner call(ServiceResponse<VerificationIPFlowResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VerificationIPFlowResultInner>> verifyIPFlowWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.verifyIPFlow(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VerificationIPFlowResultInner>() { }.getType());
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @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 VerificationIPFlowResultInner object if successful.
+     */
+    public VerificationIPFlowResultInner beginVerifyIPFlow(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        return beginVerifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @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<VerificationIPFlowResultInner> beginVerifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters, final ServiceCallback<VerificationIPFlowResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginVerifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VerificationIPFlowResultInner object
+     */
+    public Observable<VerificationIPFlowResultInner> beginVerifyIPFlowAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        return beginVerifyIPFlowWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<VerificationIPFlowResultInner>, VerificationIPFlowResultInner>() {
+            @Override
+            public VerificationIPFlowResultInner call(ServiceResponse<VerificationIPFlowResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Verify IP flow from the specified VM to a location given the currently configured NSG rules.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the IP flow to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VerificationIPFlowResultInner object
+     */
+    public Observable<ServiceResponse<VerificationIPFlowResultInner>> beginVerifyIPFlowWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, VerificationIPFlowParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginVerifyIPFlow(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VerificationIPFlowResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VerificationIPFlowResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VerificationIPFlowResultInner> clientResponse = beginVerifyIPFlowDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VerificationIPFlowResultInner> beginVerifyIPFlowDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VerificationIPFlowResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VerificationIPFlowResultInner>() { }.getType())
+                .register(202, new TypeToken<VerificationIPFlowResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @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 NextHopResultInner object if successful.
+     */
+    public NextHopResultInner getNextHop(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        return getNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @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<NextHopResultInner> getNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters, final ServiceCallback<NextHopResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NextHopResultInner> getNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        return getNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NextHopResultInner>, NextHopResultInner>() {
+            @Override
+            public NextHopResultInner call(ServiceResponse<NextHopResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NextHopResultInner>> getNextHopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getNextHop(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<NextHopResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @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 NextHopResultInner object if successful.
+     */
+    public NextHopResultInner beginGetNextHop(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        return beginGetNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @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<NextHopResultInner> beginGetNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters, final ServiceCallback<NextHopResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NextHopResultInner object
+     */
+    public Observable<NextHopResultInner> beginGetNextHopAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        return beginGetNextHopWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NextHopResultInner>, NextHopResultInner>() {
+            @Override
+            public NextHopResultInner call(ServiceResponse<NextHopResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the next hop from the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters that define the source and destination endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NextHopResultInner object
+     */
+    public Observable<ServiceResponse<NextHopResultInner>> beginGetNextHopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NextHopParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGetNextHop(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NextHopResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NextHopResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NextHopResultInner> clientResponse = beginGetNextHopDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NextHopResultInner> beginGetNextHopDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NextHopResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NextHopResultInner>() { }.getType())
+                .register(202, new TypeToken<NextHopResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @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 SecurityGroupViewResultInner object if successful.
+     */
+    public SecurityGroupViewResultInner getVMSecurityRules(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @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<SecurityGroupViewResultInner> getVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<SecurityGroupViewResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SecurityGroupViewResultInner> getVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<SecurityGroupViewResultInner>, SecurityGroupViewResultInner>() {
+            @Override
+            public SecurityGroupViewResultInner call(ServiceResponse<SecurityGroupViewResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<SecurityGroupViewResultInner>> getVMSecurityRulesWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        SecurityGroupViewParameters parameters = new SecurityGroupViewParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        Observable<Response<ResponseBody>> observable = service.getVMSecurityRules(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<SecurityGroupViewResultInner>() { }.getType());
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @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 SecurityGroupViewResultInner object if successful.
+     */
+    public SecurityGroupViewResultInner beginGetVMSecurityRules(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @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<SecurityGroupViewResultInner> beginGetVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<SecurityGroupViewResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityGroupViewResultInner object
+     */
+    public Observable<SecurityGroupViewResultInner> beginGetVMSecurityRulesAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetVMSecurityRulesWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<SecurityGroupViewResultInner>, SecurityGroupViewResultInner>() {
+            @Override
+            public SecurityGroupViewResultInner call(ServiceResponse<SecurityGroupViewResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the configured and effective security group rules on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param targetResourceId ID of the target VM.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityGroupViewResultInner object
+     */
+    public Observable<ServiceResponse<SecurityGroupViewResultInner>> beginGetVMSecurityRulesWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        SecurityGroupViewParameters parameters = new SecurityGroupViewParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        return service.beginGetVMSecurityRules(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityGroupViewResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityGroupViewResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityGroupViewResultInner> clientResponse = beginGetVMSecurityRulesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityGroupViewResultInner> beginGetVMSecurityRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityGroupViewResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityGroupViewResultInner>() { }.getType())
+                .register(202, new TypeToken<SecurityGroupViewResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @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 TroubleshootingResultInner object if successful.
+     */
+    public TroubleshootingResultInner getTroubleshooting(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        return getTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @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<TroubleshootingResultInner> getTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters, final ServiceCallback<TroubleshootingResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<TroubleshootingResultInner> getTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        return getTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<TroubleshootingResultInner>, TroubleshootingResultInner>() {
+            @Override
+            public TroubleshootingResultInner call(ServiceResponse<TroubleshootingResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<TroubleshootingResultInner>> getTroubleshootingWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getTroubleshooting(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<TroubleshootingResultInner>() { }.getType());
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @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 TroubleshootingResultInner object if successful.
+     */
+    public TroubleshootingResultInner beginGetTroubleshooting(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        return beginGetTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @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<TroubleshootingResultInner> beginGetTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters, final ServiceCallback<TroubleshootingResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TroubleshootingResultInner object
+     */
+    public Observable<TroubleshootingResultInner> beginGetTroubleshootingAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        return beginGetTroubleshootingWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<TroubleshootingResultInner>, TroubleshootingResultInner>() {
+            @Override
+            public TroubleshootingResultInner call(ServiceResponse<TroubleshootingResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Initiate troubleshooting on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the resource to troubleshoot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TroubleshootingResultInner object
+     */
+    public Observable<ServiceResponse<TroubleshootingResultInner>> beginGetTroubleshootingWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, TroubleshootingParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGetTroubleshooting(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<TroubleshootingResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<TroubleshootingResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<TroubleshootingResultInner> clientResponse = beginGetTroubleshootingDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<TroubleshootingResultInner>() { }.getType())
+                .register(202, new TypeToken<TroubleshootingResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @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 TroubleshootingResultInner object if successful.
+     */
+    public TroubleshootingResultInner getTroubleshootingResult(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().last().body();
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @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<TroubleshootingResultInner> getTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<TroubleshootingResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<TroubleshootingResultInner> getTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<TroubleshootingResultInner>, TroubleshootingResultInner>() {
+            @Override
+            public TroubleshootingResultInner call(ServiceResponse<TroubleshootingResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<TroubleshootingResultInner>> getTroubleshootingResultWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        QueryTroubleshootingParameters parameters = new QueryTroubleshootingParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        Observable<Response<ResponseBody>> observable = service.getTroubleshootingResult(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<TroubleshootingResultInner>() { }.getType());
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @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 TroubleshootingResultInner object if successful.
+     */
+    public TroubleshootingResultInner beginGetTroubleshootingResult(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().single().body();
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @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<TroubleshootingResultInner> beginGetTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<TroubleshootingResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TroubleshootingResultInner object
+     */
+    public Observable<TroubleshootingResultInner> beginGetTroubleshootingResultAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetTroubleshootingResultWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<TroubleshootingResultInner>, TroubleshootingResultInner>() {
+            @Override
+            public TroubleshootingResultInner call(ServiceResponse<TroubleshootingResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the last completed troubleshooting result on a specified resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource ID to query the troubleshooting result.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the TroubleshootingResultInner object
+     */
+    public Observable<ServiceResponse<TroubleshootingResultInner>> beginGetTroubleshootingResultWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        QueryTroubleshootingParameters parameters = new QueryTroubleshootingParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        return service.beginGetTroubleshootingResult(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<TroubleshootingResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<TroubleshootingResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<TroubleshootingResultInner> clientResponse = beginGetTroubleshootingResultDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingResultDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<TroubleshootingResultInner>() { }.getType())
+                .register(202, new TypeToken<TroubleshootingResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @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 FlowLogInformationInner object if successful.
+     */
+    public FlowLogInformationInner setFlowLogConfiguration(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        return setFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @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<FlowLogInformationInner> setFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters, final ServiceCallback<FlowLogInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(setFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<FlowLogInformationInner> setFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        return setFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<FlowLogInformationInner>, FlowLogInformationInner>() {
+            @Override
+            public FlowLogInformationInner call(ServiceResponse<FlowLogInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<FlowLogInformationInner>> setFlowLogConfigurationWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.setFlowLogConfiguration(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<FlowLogInformationInner>() { }.getType());
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @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 FlowLogInformationInner object if successful.
+     */
+    public FlowLogInformationInner beginSetFlowLogConfiguration(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        return beginSetFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @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<FlowLogInformationInner> beginSetFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters, final ServiceCallback<FlowLogInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginSetFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInformationInner object
+     */
+    public Observable<FlowLogInformationInner> beginSetFlowLogConfigurationAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        return beginSetFlowLogConfigurationWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<FlowLogInformationInner>, FlowLogInformationInner>() {
+            @Override
+            public FlowLogInformationInner call(ServiceResponse<FlowLogInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Configures flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that define the configuration of flow log.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInformationInner object
+     */
+    public Observable<ServiceResponse<FlowLogInformationInner>> beginSetFlowLogConfigurationWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, FlowLogInformationInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginSetFlowLogConfiguration(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FlowLogInformationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FlowLogInformationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FlowLogInformationInner> clientResponse = beginSetFlowLogConfigurationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FlowLogInformationInner> beginSetFlowLogConfigurationDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FlowLogInformationInner>() { }.getType())
+                .register(202, new TypeToken<FlowLogInformationInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @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 FlowLogInformationInner object if successful.
+     */
+    public FlowLogInformationInner getFlowLogStatus(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().last().body();
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @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<FlowLogInformationInner> getFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<FlowLogInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<FlowLogInformationInner> getFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return getFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<FlowLogInformationInner>, FlowLogInformationInner>() {
+            @Override
+            public FlowLogInformationInner call(ServiceResponse<FlowLogInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<FlowLogInformationInner>> getFlowLogStatusWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        FlowLogStatusParameters parameters = new FlowLogStatusParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        Observable<Response<ResponseBody>> observable = service.getFlowLogStatus(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<FlowLogInformationInner>() { }.getType());
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @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 FlowLogInformationInner object if successful.
+     */
+    public FlowLogInformationInner beginGetFlowLogStatus(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).toBlocking().single().body();
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @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<FlowLogInformationInner> beginGetFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId, final ServiceCallback<FlowLogInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId), serviceCallback);
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInformationInner object
+     */
+    public Observable<FlowLogInformationInner> beginGetFlowLogStatusAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        return beginGetFlowLogStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, targetResourceId).map(new Func1<ServiceResponse<FlowLogInformationInner>, FlowLogInformationInner>() {
+            @Override
+            public FlowLogInformationInner call(ServiceResponse<FlowLogInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Queries status of flow log and traffic analytics (optional) on a specified resource.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the FlowLogInformationInner object
+     */
+    public Observable<ServiceResponse<FlowLogInformationInner>> beginGetFlowLogStatusWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String targetResourceId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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 (targetResourceId == null) {
+            throw new IllegalArgumentException("Parameter targetResourceId is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        FlowLogStatusParameters parameters = new FlowLogStatusParameters();
+        parameters.withTargetResourceId(targetResourceId);
+        return service.beginGetFlowLogStatus(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<FlowLogInformationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<FlowLogInformationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<FlowLogInformationInner> clientResponse = beginGetFlowLogStatusDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<FlowLogInformationInner> beginGetFlowLogStatusDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<FlowLogInformationInner>() { }.getType())
+                .register(202, new TypeToken<FlowLogInformationInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @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 ConnectivityInformationInner object if successful.
+     */
+    public ConnectivityInformationInner checkConnectivity(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        return checkConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @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<ConnectivityInformationInner> checkConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters, final ServiceCallback<ConnectivityInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ConnectivityInformationInner> checkConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        return checkConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<ConnectivityInformationInner>, ConnectivityInformationInner>() {
+            @Override
+            public ConnectivityInformationInner call(ServiceResponse<ConnectivityInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ConnectivityInformationInner>> checkConnectivityWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.checkConnectivity(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ConnectivityInformationInner>() { }.getType());
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @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 ConnectivityInformationInner object if successful.
+     */
+    public ConnectivityInformationInner beginCheckConnectivity(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        return beginCheckConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @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<ConnectivityInformationInner> beginCheckConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters, final ServiceCallback<ConnectivityInformationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCheckConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectivityInformationInner object
+     */
+    public Observable<ConnectivityInformationInner> beginCheckConnectivityAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        return beginCheckConnectivityWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<ConnectivityInformationInner>, ConnectivityInformationInner>() {
+            @Override
+            public ConnectivityInformationInner call(ServiceResponse<ConnectivityInformationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Verifies the possibility of establishing a direct TCP connection from a virtual machine to a given endpoint including another VM or an arbitrary remote server.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine how the connectivity check will be performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectivityInformationInner object
+     */
+    public Observable<ServiceResponse<ConnectivityInformationInner>> beginCheckConnectivityWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, ConnectivityParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCheckConnectivity(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectivityInformationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectivityInformationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectivityInformationInner> clientResponse = beginCheckConnectivityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectivityInformationInner> beginCheckConnectivityDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectivityInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectivityInformationInner>() { }.getType())
+                .register(202, new TypeToken<ConnectivityInformationInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report 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 AzureReachabilityReportInner object if successful.
+     */
+    public AzureReachabilityReportInner getAzureReachabilityReport(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        return getAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report 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<AzureReachabilityReportInner> getAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters, final ServiceCallback<AzureReachabilityReportInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AzureReachabilityReportInner> getAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        return getAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<AzureReachabilityReportInner>, AzureReachabilityReportInner>() {
+            @Override
+            public AzureReachabilityReportInner call(ServiceResponse<AzureReachabilityReportInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AzureReachabilityReportInner>> getAzureReachabilityReportWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getAzureReachabilityReport(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<AzureReachabilityReportInner>() { }.getType());
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report 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 AzureReachabilityReportInner object if successful.
+     */
+    public AzureReachabilityReportInner beginGetAzureReachabilityReport(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        return beginGetAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report 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<AzureReachabilityReportInner> beginGetAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters, final ServiceCallback<AzureReachabilityReportInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureReachabilityReportInner object
+     */
+    public Observable<AzureReachabilityReportInner> beginGetAzureReachabilityReportAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        return beginGetAzureReachabilityReportWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<AzureReachabilityReportInner>, AzureReachabilityReportInner>() {
+            @Override
+            public AzureReachabilityReportInner call(ServiceResponse<AzureReachabilityReportInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Gets the relative latency score for internet service providers from a specified location to Azure regions.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that determine Azure reachability report configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureReachabilityReportInner object
+     */
+    public Observable<ServiceResponse<AzureReachabilityReportInner>> beginGetAzureReachabilityReportWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, AzureReachabilityReportParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGetAzureReachabilityReport(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureReachabilityReportInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureReachabilityReportInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureReachabilityReportInner> clientResponse = beginGetAzureReachabilityReportDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureReachabilityReportInner> beginGetAzureReachabilityReportDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureReachabilityReportInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureReachabilityReportInner>() { }.getType())
+                .register(202, new TypeToken<AzureReachabilityReportInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @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 AvailableProvidersListInner object if successful.
+     */
+    public AvailableProvidersListInner listAvailableProviders(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        return listAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @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<AvailableProvidersListInner> listAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters, final ServiceCallback<AvailableProvidersListInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AvailableProvidersListInner> listAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        return listAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<AvailableProvidersListInner>, AvailableProvidersListInner>() {
+            @Override
+            public AvailableProvidersListInner call(ServiceResponse<AvailableProvidersListInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AvailableProvidersListInner>> listAvailableProvidersWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.listAvailableProviders(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<AvailableProvidersListInner>() { }.getType());
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @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 AvailableProvidersListInner object if successful.
+     */
+    public AvailableProvidersListInner beginListAvailableProviders(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        return beginListAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @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<AvailableProvidersListInner> beginListAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters, final ServiceCallback<AvailableProvidersListInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AvailableProvidersListInner object
+     */
+    public Observable<AvailableProvidersListInner> beginListAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        return beginListAvailableProvidersWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<AvailableProvidersListInner>, AvailableProvidersListInner>() {
+            @Override
+            public AvailableProvidersListInner call(ServiceResponse<AvailableProvidersListInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * NOTE: This feature is currently in preview and still being tested for stability. Lists all available internet service providers for a specified Azure region.
+     *
+     * @param resourceGroupName The name of the network watcher resource group.
+     * @param networkWatcherName The name of the network watcher resource.
+     * @param parameters Parameters that scope the list of available providers.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AvailableProvidersListInner object
+     */
+    public Observable<ServiceResponse<AvailableProvidersListInner>> beginListAvailableProvidersWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginListAvailableProviders(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AvailableProvidersListInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AvailableProvidersListInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AvailableProvidersListInner> clientResponse = beginListAvailableProvidersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AvailableProvidersListInner> beginListAvailableProvidersDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AvailableProvidersListInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AvailableProvidersListInner>() { }.getType())
+                .register(202, new TypeToken<AvailableProvidersListInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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 NetworkConfigurationDiagnosticResponseInner object if successful.
+     */
+    public NetworkConfigurationDiagnosticResponseInner getNetworkConfigurationDiagnostic(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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<NetworkConfigurationDiagnosticResponseInner> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters, final ServiceCallback<NetworkConfigurationDiagnosticResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkConfigurationDiagnosticResponseInner> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>, NetworkConfigurationDiagnosticResponseInner>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponseInner call(ServiceResponse<NetworkConfigurationDiagnosticResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> getNetworkConfigurationDiagnosticWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getNetworkConfigurationDiagnostic(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType());
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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 NetworkConfigurationDiagnosticResponseInner object if successful.
+     */
+    public NetworkConfigurationDiagnosticResponseInner beginGetNetworkConfigurationDiagnostic(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters, final ServiceCallback<NetworkConfigurationDiagnosticResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkConfigurationDiagnosticResponseInner object
+     */
+    public Observable<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>, NetworkConfigurationDiagnosticResponseInner>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponseInner call(ServiceResponse<NetworkConfigurationDiagnosticResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets Network Configuration Diagnostic data to help customers understand and debug network behavior. It provides detailed information on what security rules were applied to a specified traffic flow and the result of evaluating these rules. Customers must provide details of a flow like source, destination, protocol, etc. The API returns whether traffic was allowed or denied, the rules evaluated for the specified flow and the evaluation results.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkConfigurationDiagnosticResponseInner object
+     */
+    public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGetNetworkConfigurationDiagnostic(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkConfigurationDiagnosticResponseInner> clientResponse = beginGetNetworkConfigurationDiagnosticDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkConfigurationDiagnosticResponseInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType())
+                .register(202, new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultImpl.java
new file mode 100644
index 000000000000..512ab5310a78
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NextHopResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.NextHopType;
+
+class NextHopResultImpl extends WrapperImpl<NextHopResultInner> implements NextHopResult {
+    private final NetworkManager manager;
+    NextHopResultImpl(NextHopResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextHopIpAddress() {
+        return this.inner().nextHopIpAddress();
+    }
+
+    @Override
+    public NextHopType nextHopType() {
+        return this.inner().nextHopType();
+    }
+
+    @Override
+    public String routeTableId() {
+        return this.inner().routeTableId();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultInner.java
new file mode 100644
index 000000000000..d1deda82b581
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/NextHopResultInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.NextHopType;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The information about next hop from the specified VM.
+ */
+public class NextHopResultInner {
+    /**
+     * Next hop type. Possible values include: 'Internet', 'VirtualAppliance',
+     * 'VirtualNetworkGateway', 'VnetLocal', 'HyperNetGateway', 'None'.
+     */
+    @JsonProperty(value = "nextHopType")
+    private NextHopType nextHopType;
+
+    /**
+     * Next hop IP Address.
+     */
+    @JsonProperty(value = "nextHopIpAddress")
+    private String nextHopIpAddress;
+
+    /**
+     * The resource identifier for the route table associated with the route
+     * being returned. If the route being returned does not correspond to any
+     * user created routes then this field will be the string 'System Route'.
+     */
+    @JsonProperty(value = "routeTableId")
+    private String routeTableId;
+
+    /**
+     * Get next hop type. Possible values include: 'Internet', 'VirtualAppliance', 'VirtualNetworkGateway', 'VnetLocal', 'HyperNetGateway', 'None'.
+     *
+     * @return the nextHopType value
+     */
+    public NextHopType nextHopType() {
+        return this.nextHopType;
+    }
+
+    /**
+     * Set next hop type. Possible values include: 'Internet', 'VirtualAppliance', 'VirtualNetworkGateway', 'VnetLocal', 'HyperNetGateway', 'None'.
+     *
+     * @param nextHopType the nextHopType value to set
+     * @return the NextHopResultInner object itself.
+     */
+    public NextHopResultInner withNextHopType(NextHopType nextHopType) {
+        this.nextHopType = nextHopType;
+        return this;
+    }
+
+    /**
+     * Get next hop IP Address.
+     *
+     * @return the nextHopIpAddress value
+     */
+    public String nextHopIpAddress() {
+        return this.nextHopIpAddress;
+    }
+
+    /**
+     * Set next hop IP Address.
+     *
+     * @param nextHopIpAddress the nextHopIpAddress value to set
+     * @return the NextHopResultInner object itself.
+     */
+    public NextHopResultInner withNextHopIpAddress(String nextHopIpAddress) {
+        this.nextHopIpAddress = nextHopIpAddress;
+        return this;
+    }
+
+    /**
+     * Get the resource identifier for the route table associated with the route being returned. If the route being returned does not correspond to any user created routes then this field will be the string 'System Route'.
+     *
+     * @return the routeTableId value
+     */
+    public String routeTableId() {
+        return this.routeTableId;
+    }
+
+    /**
+     * Set the resource identifier for the route table associated with the route being returned. If the route being returned does not correspond to any user created routes then this field will be the string 'System Route'.
+     *
+     * @param routeTableId the routeTableId value to set
+     * @return the NextHopResultInner object itself.
+     */
+    public NextHopResultInner withRouteTableId(String routeTableId) {
+        this.routeTableId = routeTableId;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationImpl.java
new file mode 100644
index 000000000000..b51e8669c30b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Operation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.OperationDisplay;
+import com.microsoft.azure.management.network.v2020_04_01.OperationPropertiesFormatServiceSpecification;
+
+class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
+    private final NetworkManager manager;
+    OperationImpl(OperationInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public OperationDisplay display() {
+        return this.inner().display();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String origin() {
+        return this.inner().origin();
+    }
+
+    @Override
+    public OperationPropertiesFormatServiceSpecification serviceSpecification() {
+        return this.inner().serviceSpecification();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationInner.java
new file mode 100644
index 000000000000..62aab0f2af3c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationInner.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.OperationDisplay;
+import com.microsoft.azure.management.network.v2020_04_01.OperationPropertiesFormatServiceSpecification;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Network REST API operation definition.
+ */
+@JsonFlatten
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Display metadata associated with the operation.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplay display;
+
+    /**
+     * Origin of the operation.
+     */
+    @JsonProperty(value = "origin")
+    private String origin;
+
+    /**
+     * Specification of the service.
+     */
+    @JsonProperty(value = "properties.serviceSpecification")
+    private OperationPropertiesFormatServiceSpecification serviceSpecification;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set operation name: {provider}/{resource}/{operation}.
+     *
+     * @param name the name value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get display metadata associated with the operation.
+     *
+     * @return the display value
+     */
+    public OperationDisplay display() {
+        return this.display;
+    }
+
+    /**
+     * Set display metadata associated with the operation.
+     *
+     * @param display the display value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withDisplay(OperationDisplay display) {
+        this.display = display;
+        return this;
+    }
+
+    /**
+     * Get origin of the operation.
+     *
+     * @return the origin value
+     */
+    public String origin() {
+        return this.origin;
+    }
+
+    /**
+     * Set origin of the operation.
+     *
+     * @param origin the origin value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withOrigin(String origin) {
+        this.origin = origin;
+        return this;
+    }
+
+    /**
+     * Get specification of the service.
+     *
+     * @return the serviceSpecification value
+     */
+    public OperationPropertiesFormatServiceSpecification serviceSpecification() {
+        return this.serviceSpecification;
+    }
+
+    /**
+     * Set specification of the service.
+     *
+     * @param serviceSpecification the serviceSpecification value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withServiceSpecification(OperationPropertiesFormatServiceSpecification serviceSpecification) {
+        this.serviceSpecification = serviceSpecification;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..a9928266be50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.Operation;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final NetworkManager manager;
+
+    OperationsImpl(NetworkManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public NetworkManager 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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsInner.java
new file mode 100644
index 000000000000..5601f8cd88f8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OperationsInner.java
@@ -0,0 +1,281 @@
+/**
+ * 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.network.v2020_04_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 NetworkManagementClientImpl 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, NetworkManagementClientImpl 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.network.v2020_04_01.Operations list" })
+        @GET("providers/Microsoft.Network/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.network.v2020_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 Network 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 Network 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 Network 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 Network 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 Network 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() {
+        final String apiVersion = "2020-04-01";
+        return service.list(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 {
+        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 Network 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 Network 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 Network 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 Network 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 Network 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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleImpl.java
new file mode 100644
index 000000000000..07fcc233ec3b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleImpl.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.OutboundRule;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerOutboundRuleProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class OutboundRuleImpl extends IndexableRefreshableWrapperImpl<OutboundRule, OutboundRuleInner> implements OutboundRule {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String outboundRuleName;
+
+    OutboundRuleImpl(OutboundRuleInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.outboundRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "outboundRules");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<OutboundRuleInner> getInnerAsync() {
+        LoadBalancerOutboundRulesInner client = this.manager().inner().loadBalancerOutboundRules();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.outboundRuleName);
+    }
+
+
+
+    @Override
+    public Integer allocatedOutboundPorts() {
+        return this.inner().allocatedOutboundPorts();
+    }
+
+    @Override
+    public SubResource backendAddressPool() {
+        return this.inner().backendAddressPool();
+    }
+
+    @Override
+    public Boolean enableTcpReset() {
+        return this.inner().enableTcpReset();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<SubResource> frontendIPConfigurations() {
+        return this.inner().frontendIPConfigurations();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Integer idleTimeoutInMinutes() {
+        return this.inner().idleTimeoutInMinutes();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public LoadBalancerOutboundRuleProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleInner.java
new file mode 100644
index 000000000000..7e2da259ee04
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/OutboundRuleInner.java
@@ -0,0 +1,256 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.LoadBalancerOutboundRuleProtocol;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Outbound rule of the load balancer.
+ */
+@JsonFlatten
+public class OutboundRuleInner extends SubResource {
+    /**
+     * The number of outbound ports to be used for NAT.
+     */
+    @JsonProperty(value = "properties.allocatedOutboundPorts")
+    private Integer allocatedOutboundPorts;
+
+    /**
+     * The Frontend IP addresses of the load balancer.
+     */
+    @JsonProperty(value = "properties.frontendIPConfigurations", required = true)
+    private List<SubResource> frontendIPConfigurations;
+
+    /**
+     * A reference to a pool of DIPs. Outbound traffic is randomly load
+     * balanced across IPs in the backend IPs.
+     */
+    @JsonProperty(value = "properties.backendAddressPool", required = true)
+    private SubResource backendAddressPool;
+
+    /**
+     * The provisioning state of the outbound rule resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The protocol for the outbound rule in load balancer. Possible values
+     * include: 'Tcp', 'Udp', 'All'.
+     */
+    @JsonProperty(value = "properties.protocol", required = true)
+    private LoadBalancerOutboundRuleProtocol protocol;
+
+    /**
+     * Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected
+     * connection termination. This element is only used when the protocol is
+     * set to TCP.
+     */
+    @JsonProperty(value = "properties.enableTcpReset")
+    private Boolean enableTcpReset;
+
+    /**
+     * The timeout for the TCP idle connection.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * The name of the resource that is unique within the set of outbound rules
+     * used by the load balancer. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the number of outbound ports to be used for NAT.
+     *
+     * @return the allocatedOutboundPorts value
+     */
+    public Integer allocatedOutboundPorts() {
+        return this.allocatedOutboundPorts;
+    }
+
+    /**
+     * Set the number of outbound ports to be used for NAT.
+     *
+     * @param allocatedOutboundPorts the allocatedOutboundPorts value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withAllocatedOutboundPorts(Integer allocatedOutboundPorts) {
+        this.allocatedOutboundPorts = allocatedOutboundPorts;
+        return this;
+    }
+
+    /**
+     * Get the Frontend IP addresses of the load balancer.
+     *
+     * @return the frontendIPConfigurations value
+     */
+    public List<SubResource> frontendIPConfigurations() {
+        return this.frontendIPConfigurations;
+    }
+
+    /**
+     * Set the Frontend IP addresses of the load balancer.
+     *
+     * @param frontendIPConfigurations the frontendIPConfigurations value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withFrontendIPConfigurations(List<SubResource> frontendIPConfigurations) {
+        this.frontendIPConfigurations = frontendIPConfigurations;
+        return this;
+    }
+
+    /**
+     * Get a reference to a pool of DIPs. Outbound traffic is randomly load balanced across IPs in the backend IPs.
+     *
+     * @return the backendAddressPool value
+     */
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
+    }
+
+    /**
+     * Set a reference to a pool of DIPs. Outbound traffic is randomly load balanced across IPs in the backend IPs.
+     *
+     * @param backendAddressPool the backendAddressPool value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the outbound rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the protocol for the outbound rule in load balancer. Possible values include: 'Tcp', 'Udp', 'All'.
+     *
+     * @return the protocol value
+     */
+    public LoadBalancerOutboundRuleProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol for the outbound rule in load balancer. Possible values include: 'Tcp', 'Udp', 'All'.
+     *
+     * @param protocol the protocol value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withProtocol(LoadBalancerOutboundRuleProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @return the enableTcpReset value
+     */
+    public Boolean enableTcpReset() {
+        return this.enableTcpReset;
+    }
+
+    /**
+     * Set receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP.
+     *
+     * @param enableTcpReset the enableTcpReset value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withEnableTcpReset(Boolean enableTcpReset) {
+        this.enableTcpReset = enableTcpReset;
+        return this;
+    }
+
+    /**
+     * Get the timeout for the TCP idle connection.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the timeout for the TCP idle connection.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of outbound rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of outbound rules used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the OutboundRuleInner object itself.
+     */
+    public OutboundRuleInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthImpl.java
new file mode 100644
index 000000000000..2a832487d73c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionHealth;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class P2SVpnConnectionHealthImpl extends WrapperImpl<P2SVpnConnectionHealthInner> implements P2SVpnConnectionHealth {
+    private final NetworkManager manager;
+    P2SVpnConnectionHealthImpl(P2SVpnConnectionHealthInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String sasUrl() {
+        return this.inner().sasUrl();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthInner.java
new file mode 100644
index 000000000000..09a6f091c420
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnConnectionHealthInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * P2S Vpn connection detailed health written to sas url.
+ */
+public class P2SVpnConnectionHealthInner {
+    /**
+     * Returned sas url of the blob to which the p2s vpn connection detailed
+     * health will be written.
+     */
+    @JsonProperty(value = "sasUrl")
+    private String sasUrl;
+
+    /**
+     * Get returned sas url of the blob to which the p2s vpn connection detailed health will be written.
+     *
+     * @return the sasUrl value
+     */
+    public String sasUrl() {
+        return this.sasUrl;
+    }
+
+    /**
+     * Set returned sas url of the blob to which the p2s vpn connection detailed health will be written.
+     *
+     * @param sasUrl the sasUrl value to set
+     * @return the P2SVpnConnectionHealthInner object itself.
+     */
+    public P2SVpnConnectionHealthInner withSasUrl(String sasUrl) {
+        this.sasUrl = sasUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayImpl.java
new file mode 100644
index 000000000000..33649eaff7a4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnGateway;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.P2SConnectionConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealth;
+
+class P2SVpnGatewayImpl extends GroupableResourceCoreImpl<P2SVpnGateway, P2SVpnGatewayInner, P2SVpnGatewayImpl, NetworkManager> implements P2SVpnGateway, P2SVpnGateway.Definition, P2SVpnGateway.Update {
+    P2SVpnGatewayImpl(String name, P2SVpnGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<P2SVpnGateway> createResourceAsync() {
+        P2sVpnGatewaysInner client = this.manager().inner().p2sVpnGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<P2SVpnGateway> updateResourceAsync() {
+        P2sVpnGatewaysInner client = this.manager().inner().p2sVpnGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<P2SVpnGatewayInner> getInnerAsync() {
+        P2sVpnGatewaysInner client = this.manager().inner().p2sVpnGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<String> customDnsServers() {
+        return this.inner().customDnsServers();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<P2SConnectionConfiguration> p2SConnectionConfigurations() {
+        return this.inner().p2SConnectionConfigurations();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SubResource virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public VpnClientConnectionHealth vpnClientConnectionHealth() {
+        return this.inner().vpnClientConnectionHealth();
+    }
+
+    @Override
+    public Integer vpnGatewayScaleUnit() {
+        return this.inner().vpnGatewayScaleUnit();
+    }
+
+    @Override
+    public SubResource vpnServerConfiguration() {
+        return this.inner().vpnServerConfiguration();
+    }
+
+    @Override
+    public P2SVpnGatewayImpl withCustomDnsServers(List<String> customDnsServers) {
+        this.inner().withCustomDnsServers(customDnsServers);
+        return this;
+    }
+
+    @Override
+    public P2SVpnGatewayImpl withP2SConnectionConfigurations(List<P2SConnectionConfiguration> p2SConnectionConfigurations) {
+        this.inner().withP2SConnectionConfigurations(p2SConnectionConfigurations);
+        return this;
+    }
+
+    @Override
+    public P2SVpnGatewayImpl withVirtualHub(SubResource virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+    @Override
+    public P2SVpnGatewayImpl withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit) {
+        this.inner().withVpnGatewayScaleUnit(vpnGatewayScaleUnit);
+        return this;
+    }
+
+    @Override
+    public P2SVpnGatewayImpl withVpnServerConfiguration(SubResource vpnServerConfiguration) {
+        this.inner().withVpnServerConfiguration(vpnServerConfiguration);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayInner.java
new file mode 100644
index 000000000000..cd7eb87afb2c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2SVpnGatewayInner.java
@@ -0,0 +1,229 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.P2SConnectionConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealth;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * P2SVpnGateway Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class P2SVpnGatewayInner extends Resource {
+    /**
+     * The VirtualHub to which the gateway belongs.
+     */
+    @JsonProperty(value = "properties.virtualHub")
+    private SubResource virtualHub;
+
+    /**
+     * List of all p2s connection configurations of the gateway.
+     */
+    @JsonProperty(value = "properties.p2SConnectionConfigurations")
+    private List<P2SConnectionConfiguration> p2SConnectionConfigurations;
+
+    /**
+     * The provisioning state of the P2S VPN gateway resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The scale unit for this p2s vpn gateway.
+     */
+    @JsonProperty(value = "properties.vpnGatewayScaleUnit")
+    private Integer vpnGatewayScaleUnit;
+
+    /**
+     * The VpnServerConfiguration to which the p2sVpnGateway is attached to.
+     */
+    @JsonProperty(value = "properties.vpnServerConfiguration")
+    private SubResource vpnServerConfiguration;
+
+    /**
+     * All P2S VPN clients' connection health status.
+     */
+    @JsonProperty(value = "properties.vpnClientConnectionHealth", access = JsonProperty.Access.WRITE_ONLY)
+    private VpnClientConnectionHealth vpnClientConnectionHealth;
+
+    /**
+     * List of all customer specified DNS servers IP addresses.
+     */
+    @JsonProperty(value = "properties.customDnsServers")
+    private List<String> customDnsServers;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the VirtualHub to which the gateway belongs.
+     *
+     * @return the virtualHub value
+     */
+    public SubResource virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the VirtualHub to which the gateway belongs.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withVirtualHub(SubResource virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get list of all p2s connection configurations of the gateway.
+     *
+     * @return the p2SConnectionConfigurations value
+     */
+    public List<P2SConnectionConfiguration> p2SConnectionConfigurations() {
+        return this.p2SConnectionConfigurations;
+    }
+
+    /**
+     * Set list of all p2s connection configurations of the gateway.
+     *
+     * @param p2SConnectionConfigurations the p2SConnectionConfigurations value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withP2SConnectionConfigurations(List<P2SConnectionConfiguration> p2SConnectionConfigurations) {
+        this.p2SConnectionConfigurations = p2SConnectionConfigurations;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the P2S VPN gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the scale unit for this p2s vpn gateway.
+     *
+     * @return the vpnGatewayScaleUnit value
+     */
+    public Integer vpnGatewayScaleUnit() {
+        return this.vpnGatewayScaleUnit;
+    }
+
+    /**
+     * Set the scale unit for this p2s vpn gateway.
+     *
+     * @param vpnGatewayScaleUnit the vpnGatewayScaleUnit value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit) {
+        this.vpnGatewayScaleUnit = vpnGatewayScaleUnit;
+        return this;
+    }
+
+    /**
+     * Get the VpnServerConfiguration to which the p2sVpnGateway is attached to.
+     *
+     * @return the vpnServerConfiguration value
+     */
+    public SubResource vpnServerConfiguration() {
+        return this.vpnServerConfiguration;
+    }
+
+    /**
+     * Set the VpnServerConfiguration to which the p2sVpnGateway is attached to.
+     *
+     * @param vpnServerConfiguration the vpnServerConfiguration value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withVpnServerConfiguration(SubResource vpnServerConfiguration) {
+        this.vpnServerConfiguration = vpnServerConfiguration;
+        return this;
+    }
+
+    /**
+     * Get all P2S VPN clients' connection health status.
+     *
+     * @return the vpnClientConnectionHealth value
+     */
+    public VpnClientConnectionHealth vpnClientConnectionHealth() {
+        return this.vpnClientConnectionHealth;
+    }
+
+    /**
+     * Get list of all customer specified DNS servers IP addresses.
+     *
+     * @return the customDnsServers value
+     */
+    public List<String> customDnsServers() {
+        return this.customDnsServers;
+    }
+
+    /**
+     * Set list of all customer specified DNS servers IP addresses.
+     *
+     * @param customDnsServers the customDnsServers value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withCustomDnsServers(List<String> customDnsServers) {
+        this.customDnsServers = customDnsServers;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the P2SVpnGatewayInner object itself.
+     */
+    public P2SVpnGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysImpl.java
new file mode 100644
index 000000000000..e7b9d1f8549f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysImpl.java
@@ -0,0 +1,183 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnGateway;
+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.network.v2020_04_01.VpnProfileResponse;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionHealth;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionHealthRequest;
+
+class P2sVpnGatewaysImpl extends GroupableResourcesCoreImpl<P2SVpnGateway, P2SVpnGatewayImpl, P2SVpnGatewayInner, P2sVpnGatewaysInner, NetworkManager>  implements P2sVpnGateways {
+    protected P2sVpnGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().p2sVpnGateways(), manager);
+    }
+
+    @Override
+    protected Observable<P2SVpnGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        P2sVpnGatewaysInner 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<P2SVpnGateway> listByResourceGroup(String resourceGroupName) {
+        P2sVpnGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<P2SVpnGateway> listByResourceGroupAsync(String resourceGroupName) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<P2SVpnGatewayInner>, Iterable<P2SVpnGatewayInner>>() {
+            @Override
+            public Iterable<P2SVpnGatewayInner> call(Page<P2SVpnGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<P2SVpnGatewayInner, P2SVpnGateway>() {
+            @Override
+            public P2SVpnGateway call(P2SVpnGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<P2SVpnGateway> list() {
+        P2sVpnGatewaysInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<P2SVpnGateway> listAsync() {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<P2SVpnGatewayInner>, Iterable<P2SVpnGatewayInner>>() {
+            @Override
+            public Iterable<P2SVpnGatewayInner> call(Page<P2SVpnGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<P2SVpnGatewayInner, P2SVpnGateway>() {
+            @Override
+            public P2SVpnGateway call(P2SVpnGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public P2SVpnGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<VpnProfileResponse> generateVpnProfileAsync(String resourceGroupName, String gatewayName) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.generateVpnProfileAsync(resourceGroupName, gatewayName)
+        .map(new Func1<VpnProfileResponseInner, VpnProfileResponse>() {
+            @Override
+            public VpnProfileResponse call(VpnProfileResponseInner inner) {
+                return new VpnProfileResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<P2SVpnGateway> getP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.getP2sVpnConnectionHealthAsync(resourceGroupName, gatewayName)
+        .map(new Func1<P2SVpnGatewayInner, P2SVpnGateway>() {
+            @Override
+            public P2SVpnGateway call(P2SVpnGatewayInner inner) {
+                return new P2SVpnGatewayImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<P2SVpnConnectionHealth> getP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.getP2sVpnConnectionHealthDetailedAsync(resourceGroupName, gatewayName, request)
+        .map(new Func1<P2SVpnConnectionHealthInner, P2SVpnConnectionHealth>() {
+            @Override
+            public P2SVpnConnectionHealth call(P2SVpnConnectionHealthInner inner) {
+                return new P2SVpnConnectionHealthImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName) {
+        P2sVpnGatewaysInner client = this.inner();
+        return client.disconnectP2sVpnConnectionsAsync(resourceGroupName, p2sVpnGatewayName).toCompletable();
+    }
+
+    @Override
+    protected P2SVpnGatewayImpl wrapModel(P2SVpnGatewayInner inner) {
+        return  new P2SVpnGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected P2SVpnGatewayImpl wrapModel(String name) {
+        return new P2SVpnGatewayImpl(name, new P2SVpnGatewayInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysInner.java
new file mode 100644
index 000000000000..a8bdfd1e87a2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/P2sVpnGatewaysInner.java
@@ -0,0 +1,2109 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.AuthenticationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionHealthRequest;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionRequest;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnProfileParameters;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in P2sVpnGateways.
+ */
+public class P2sVpnGatewaysInner implements InnerSupportsGet<P2SVpnGatewayInner>, InnerSupportsDelete<Void>, InnerSupportsListing<P2SVpnGatewayInner> {
+    /** The Retrofit service to perform REST calls. */
+    private P2sVpnGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of P2sVpnGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public P2sVpnGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(P2sVpnGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for P2sVpnGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface P2sVpnGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.P2sVpnGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Body P2SVpnGatewayInner p2SVpnGatewayParameters, @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.network.v2020_04_01.P2sVpnGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Body P2SVpnGatewayInner p2SVpnGatewayParameters, @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.network.v2020_04_01.P2sVpnGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject p2SVpnGatewayParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.P2sVpnGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.P2sVpnGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways")
+        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.network.v2020_04_01.P2sVpnGateways list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/p2svpnGateways")
+        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.network.v2020_04_01.P2sVpnGateways generateVpnProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/generatevpnprofile")
+        Observable<Response<ResponseBody>> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnProfileParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways beginGenerateVpnProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/generatevpnprofile")
+        Observable<Response<ResponseBody>> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnProfileParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways getP2sVpnConnectionHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealth")
+        Observable<Response<ResponseBody>> getP2sVpnConnectionHealth(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.P2sVpnGateways beginGetP2sVpnConnectionHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealth")
+        Observable<Response<ResponseBody>> beginGetP2sVpnConnectionHealth(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.P2sVpnGateways getP2sVpnConnectionHealthDetailed" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealthDetailed")
+        Observable<Response<ResponseBody>> getP2sVpnConnectionHealthDetailed(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Body P2SVpnConnectionHealthRequest request, @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.network.v2020_04_01.P2sVpnGateways beginGetP2sVpnConnectionHealthDetailed" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealthDetailed")
+        Observable<Response<ResponseBody>> beginGetP2sVpnConnectionHealthDetailed(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Body P2SVpnConnectionHealthRequest request, @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.network.v2020_04_01.P2sVpnGateways disconnectP2sVpnConnections" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{p2sVpnGatewayName}/disconnectP2sVpnConnections")
+        Observable<Response<ResponseBody>> disconnectP2sVpnConnections(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("p2sVpnGatewayName") String p2sVpnGatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnConnectionRequest request, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways beginDisconnectP2sVpnConnections" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{p2sVpnGatewayName}/disconnectP2sVpnConnections")
+        Observable<Response<ResponseBody>> beginDisconnectP2sVpnConnections(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("p2sVpnGatewayName") String p2sVpnGatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnConnectionRequest request, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.P2sVpnGateways 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.network.v2020_04_01.P2sVpnGateways listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner getByResourceGroup(String resourceGroupName, String gatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<P2SVpnGatewayInner> getByResourceGroupAsync(String resourceGroupName, String gatewayName, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<P2SVpnGatewayInner> getByResourceGroupAsync(String resourceGroupName, String gatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<P2SVpnGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<P2SVpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<P2SVpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner createOrUpdate(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @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<P2SVpnGatewayInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<P2SVpnGatewayInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (p2SVpnGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter p2SVpnGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(p2SVpnGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, p2SVpnGatewayParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<P2SVpnGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner beginCreateOrUpdate(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @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<P2SVpnGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<P2SVpnGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, p2SVpnGatewayParameters).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a virtual wan p2s vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param p2SVpnGatewayParameters Parameters supplied to create or Update a virtual wan p2s vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, P2SVpnGatewayInner p2SVpnGatewayParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (p2SVpnGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter p2SVpnGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(p2SVpnGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, p2SVpnGatewayParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<P2SVpnGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<P2SVpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<P2SVpnGatewayInner>() { }.getType())
+                .register(201, new TypeToken<P2SVpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner updateTags(String resourceGroupName, String gatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<P2SVpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<P2SVpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject p2SVpnGatewayParameters = new TagsObject();
+        p2SVpnGatewayParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), p2SVpnGatewayParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner updateTags(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @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<P2SVpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, Map<String, String> tags, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<P2SVpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates virtual wan p2s vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject p2SVpnGatewayParameters = new TagsObject();
+        p2SVpnGatewayParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), p2SVpnGatewayParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<P2SVpnGatewayInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<P2SVpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<P2SVpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String gatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String gatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a virtual wan p2s vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, gatewayName, 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);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @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;P2SVpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<P2SVpnGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<P2SVpnGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<P2SVpnGatewayInner>(response.body()) {
+            @Override
+            public Page<P2SVpnGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @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<P2SVpnGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<P2SVpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<Page<P2SVpnGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Page<P2SVpnGatewayInner>>() {
+                @Override
+                public Page<P2SVpnGatewayInner> call(ServiceResponse<Page<P2SVpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(ServiceResponse<Page<P2SVpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+    ServiceResponse<PageImpl<P2SVpnGatewayInner>> * @param resourceGroupName The resource group name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;P2SVpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<P2SVpnGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<P2SVpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<P2SVpnGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<P2SVpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<P2SVpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a 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;P2SVpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<P2SVpnGatewayInner> list() {
+        ServiceResponse<Page<P2SVpnGatewayInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<P2SVpnGatewayInner>(response.body()) {
+            @Override
+            public Page<P2SVpnGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a 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<P2SVpnGatewayInner>> listAsync(final ListOperationCallback<P2SVpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<Page<P2SVpnGatewayInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Page<P2SVpnGatewayInner>>() {
+                @Override
+                public Page<P2SVpnGatewayInner> call(ServiceResponse<Page<P2SVpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(ServiceResponse<Page<P2SVpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;P2SVpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<P2SVpnGatewayInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<P2SVpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<P2SVpnGatewayInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<P2SVpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<P2SVpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner generateVpnProfile(String resourceGroupName, String gatewayName) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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<VpnProfileResponseInner> generateVpnProfileAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnProfileResponseInner> generateVpnProfileAsync(String resourceGroupName, String gatewayName) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final AuthenticationMethod authenticationMethod = null;
+        P2SVpnProfileParameters parameters = new P2SVpnProfileParameters();
+        parameters.withAuthenticationMethod(null);
+        Observable<Response<ResponseBody>> observable = service.generateVpnProfile(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnProfileResponseInner>() { }.getType());
+    }
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner generateVpnProfile(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod).toBlocking().last().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @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<VpnProfileResponseInner> generateVpnProfileAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnProfileResponseInner> generateVpnProfileAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        P2SVpnProfileParameters parameters = new P2SVpnProfileParameters();
+        parameters.withAuthenticationMethod(authenticationMethod);
+        Observable<Response<ResponseBody>> observable = service.generateVpnProfile(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnProfileResponseInner>() { }.getType());
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner beginGenerateVpnProfile(String resourceGroupName, String gatewayName) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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<VpnProfileResponseInner> beginGenerateVpnProfileAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<VpnProfileResponseInner> beginGenerateVpnProfileAsync(String resourceGroupName, String gatewayName) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final AuthenticationMethod authenticationMethod = null;
+        P2SVpnProfileParameters parameters = new P2SVpnProfileParameters();
+        parameters.withAuthenticationMethod(null);
+        return service.beginGenerateVpnProfile(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnProfileResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnProfileResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnProfileResponseInner> clientResponse = beginGenerateVpnProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @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 VpnProfileResponseInner object if successful.
+     */
+    public VpnProfileResponseInner beginGenerateVpnProfile(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod).toBlocking().single().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @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<VpnProfileResponseInner> beginGenerateVpnProfileAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod, final ServiceCallback<VpnProfileResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<VpnProfileResponseInner> beginGenerateVpnProfileAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, gatewayName, authenticationMethod).map(new Func1<ServiceResponse<VpnProfileResponseInner>, VpnProfileResponseInner>() {
+            @Override
+            public VpnProfileResponseInner call(ServiceResponse<VpnProfileResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param authenticationMethod VPN client authentication method. Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnProfileResponseInner object
+     */
+    public Observable<ServiceResponse<VpnProfileResponseInner>> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String gatewayName, AuthenticationMethod authenticationMethod) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        P2SVpnProfileParameters parameters = new P2SVpnProfileParameters();
+        parameters.withAuthenticationMethod(authenticationMethod);
+        return service.beginGenerateVpnProfile(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnProfileResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnProfileResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnProfileResponseInner> clientResponse = beginGenerateVpnProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnProfileResponseInner> beginGenerateVpnProfileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnProfileResponseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnProfileResponseInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner getP2sVpnConnectionHealth(String resourceGroupName, String gatewayName) {
+        return getP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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<P2SVpnGatewayInner> getP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<P2SVpnGatewayInner> getP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName) {
+        return getP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> getP2sVpnConnectionHealthWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getP2sVpnConnectionHealth(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<P2SVpnGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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 P2SVpnGatewayInner object if successful.
+     */
+    public P2SVpnGatewayInner beginGetP2sVpnConnectionHealth(String resourceGroupName, String gatewayName) {
+        return beginGetP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @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<P2SVpnGatewayInner> beginGetP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName, final ServiceCallback<P2SVpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<P2SVpnGatewayInner> beginGetP2sVpnConnectionHealthAsync(String resourceGroupName, String gatewayName) {
+        return beginGetP2sVpnConnectionHealthWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<P2SVpnGatewayInner>, P2SVpnGatewayInner>() {
+            @Override
+            public P2SVpnGatewayInner call(ServiceResponse<P2SVpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnGatewayInner object
+     */
+    public Observable<ServiceResponse<P2SVpnGatewayInner>> beginGetP2sVpnConnectionHealthWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetP2sVpnConnectionHealth(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnGatewayInner> clientResponse = beginGetP2sVpnConnectionHealthDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<P2SVpnGatewayInner> beginGetP2sVpnConnectionHealthDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<P2SVpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<P2SVpnGatewayInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @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 P2SVpnConnectionHealthInner object if successful.
+     */
+    public P2SVpnConnectionHealthInner getP2sVpnConnectionHealthDetailed(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        return getP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request).toBlocking().last().body();
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @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<P2SVpnConnectionHealthInner> getP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request, final ServiceCallback<P2SVpnConnectionHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request), serviceCallback);
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<P2SVpnConnectionHealthInner> getP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        return getP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request).map(new Func1<ServiceResponse<P2SVpnConnectionHealthInner>, P2SVpnConnectionHealthInner>() {
+            @Override
+            public P2SVpnConnectionHealthInner call(ServiceResponse<P2SVpnConnectionHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<P2SVpnConnectionHealthInner>> getP2sVpnConnectionHealthDetailedWithServiceResponseAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        Validator.validate(request);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getP2sVpnConnectionHealthDetailed(this.client.subscriptionId(), resourceGroupName, gatewayName, request, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<P2SVpnConnectionHealthInner>() { }.getType());
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @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 P2SVpnConnectionHealthInner object if successful.
+     */
+    public P2SVpnConnectionHealthInner beginGetP2sVpnConnectionHealthDetailed(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        return beginGetP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @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<P2SVpnConnectionHealthInner> beginGetP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request, final ServiceCallback<P2SVpnConnectionHealthInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request), serviceCallback);
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnConnectionHealthInner object
+     */
+    public Observable<P2SVpnConnectionHealthInner> beginGetP2sVpnConnectionHealthDetailedAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        return beginGetP2sVpnConnectionHealthDetailedWithServiceResponseAsync(resourceGroupName, gatewayName, request).map(new Func1<ServiceResponse<P2SVpnConnectionHealthInner>, P2SVpnConnectionHealthInner>() {
+            @Override
+            public P2SVpnConnectionHealthInner call(ServiceResponse<P2SVpnConnectionHealthInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the sas url to get the connection health detail of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param gatewayName The name of the P2SVpnGateway.
+     * @param request Request parameters supplied to get p2s vpn connections detailed health.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the P2SVpnConnectionHealthInner object
+     */
+    public Observable<ServiceResponse<P2SVpnConnectionHealthInner>> beginGetP2sVpnConnectionHealthDetailedWithServiceResponseAsync(String resourceGroupName, String gatewayName, P2SVpnConnectionHealthRequest request) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        Validator.validate(request);
+        final String apiVersion = "2020-04-01";
+        return service.beginGetP2sVpnConnectionHealthDetailed(this.client.subscriptionId(), resourceGroupName, gatewayName, request, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<P2SVpnConnectionHealthInner>>>() {
+                @Override
+                public Observable<ServiceResponse<P2SVpnConnectionHealthInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<P2SVpnConnectionHealthInner> clientResponse = beginGetP2sVpnConnectionHealthDetailedDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<P2SVpnConnectionHealthInner> beginGetP2sVpnConnectionHealthDetailedDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<P2SVpnConnectionHealthInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<P2SVpnConnectionHealthInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @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 disconnectP2sVpnConnections(String resourceGroupName, String p2sVpnGatewayName) {
+        disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @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> disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName), serviceCallback);
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName) {
+        return disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> disconnectP2sVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String p2sVpnGatewayName) {
+        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 (p2sVpnGatewayName == null) {
+            throw new IllegalArgumentException("Parameter p2sVpnGatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String vpnConnectionIdsConverted = null;
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(null);
+        Observable<Response<ResponseBody>> observable = service.disconnectP2sVpnConnections(this.client.subscriptionId(), resourceGroupName, p2sVpnGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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 disconnectP2sVpnConnections(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds).toBlocking().last().body();
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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> disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds), serviceCallback);
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> disconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        return disconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> disconnectP2sVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        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 (p2sVpnGatewayName == null) {
+            throw new IllegalArgumentException("Parameter p2sVpnGatewayName is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionIds);
+        final String apiVersion = "2020-04-01";
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(vpnConnectionIds);
+        Observable<Response<ResponseBody>> observable = service.disconnectP2sVpnConnections(this.client.subscriptionId(), resourceGroupName, p2sVpnGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @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 beginDisconnectP2sVpnConnections(String resourceGroupName, String p2sVpnGatewayName) {
+        beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @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> beginDisconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName), serviceCallback);
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDisconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName) {
+        return beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String p2sVpnGatewayName) {
+        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 (p2sVpnGatewayName == null) {
+            throw new IllegalArgumentException("Parameter p2sVpnGatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<String> vpnConnectionIds = null;
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(null);
+        return service.beginDisconnectP2sVpnConnections(this.client.subscriptionId(), resourceGroupName, p2sVpnGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDisconnectP2sVpnConnectionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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 beginDisconnectP2sVpnConnections(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds).toBlocking().single().body();
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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> beginDisconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds), serviceCallback);
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDisconnectP2sVpnConnectionsAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        return beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(resourceGroupName, p2sVpnGatewayName, vpnConnectionIds).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect P2S vpn connections of the virtual wan P2SVpnGateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param p2sVpnGatewayName The name of the P2S Vpn Gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDisconnectP2sVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String p2sVpnGatewayName, List<String> vpnConnectionIds) {
+        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 (p2sVpnGatewayName == null) {
+            throw new IllegalArgumentException("Parameter p2sVpnGatewayName is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionIds);
+        final String apiVersion = "2020-04-01";
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(vpnConnectionIds);
+        return service.beginDisconnectP2sVpnConnections(this.client.subscriptionId(), resourceGroupName, p2sVpnGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDisconnectP2sVpnConnectionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDisconnectP2sVpnConnectionsDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in 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;P2SVpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<P2SVpnGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<P2SVpnGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<P2SVpnGatewayInner>(response.body()) {
+            @Override
+            public Page<P2SVpnGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in 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<P2SVpnGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<P2SVpnGatewayInner>> serviceFuture, final ListOperationCallback<P2SVpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in 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;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<Page<P2SVpnGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Page<P2SVpnGatewayInner>>() {
+                @Override
+                public Page<P2SVpnGatewayInner> call(ServiceResponse<Page<P2SVpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in 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;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(ServiceResponse<Page<P2SVpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a resource group.
+     *
+    ServiceResponse<PageImpl<P2SVpnGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;P2SVpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> 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<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<P2SVpnGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<P2SVpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<P2SVpnGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<P2SVpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<P2SVpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @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;P2SVpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<P2SVpnGatewayInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<P2SVpnGatewayInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<P2SVpnGatewayInner>(response.body()) {
+            @Override
+            public Page<P2SVpnGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @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<P2SVpnGatewayInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<P2SVpnGatewayInner>> serviceFuture, final ListOperationCallback<P2SVpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @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;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<Page<P2SVpnGatewayInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Page<P2SVpnGatewayInner>>() {
+                @Override
+                public Page<P2SVpnGatewayInner> call(ServiceResponse<Page<P2SVpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+     * @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;P2SVpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<P2SVpnGatewayInner>>, Observable<ServiceResponse<Page<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(ServiceResponse<Page<P2SVpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the P2SVpnGateways in a subscription.
+     *
+    ServiceResponse<PageImpl<P2SVpnGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;P2SVpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> 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<P2SVpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<P2SVpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<P2SVpnGatewayInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<P2SVpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<P2SVpnGatewayInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<P2SVpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<P2SVpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureInner.java
new file mode 100644
index 000000000000..9e06ef21e8c7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureStorageLocation;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureFilter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters that define the create packet capture operation.
+ */
+@JsonFlatten
+public class PacketCaptureInner {
+    /**
+     * The ID of the targeted resource, only VM is currently supported.
+     */
+    @JsonProperty(value = "properties.target", required = true)
+    private String target;
+
+    /**
+     * Number of bytes captured per packet, the remaining bytes are truncated.
+     */
+    @JsonProperty(value = "properties.bytesToCapturePerPacket")
+    private Integer bytesToCapturePerPacket;
+
+    /**
+     * Maximum size of the capture output.
+     */
+    @JsonProperty(value = "properties.totalBytesPerSession")
+    private Integer totalBytesPerSession;
+
+    /**
+     * Maximum duration of the capture session in seconds.
+     */
+    @JsonProperty(value = "properties.timeLimitInSeconds")
+    private Integer timeLimitInSeconds;
+
+    /**
+     * The storage location for a packet capture session.
+     */
+    @JsonProperty(value = "properties.storageLocation", required = true)
+    private PacketCaptureStorageLocation storageLocation;
+
+    /**
+     * A list of packet capture filters.
+     */
+    @JsonProperty(value = "properties.filters")
+    private List<PacketCaptureFilter> filters;
+
+    /**
+     * Get the ID of the targeted resource, only VM is currently supported.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set the ID of the targeted resource, only VM is currently supported.
+     *
+     * @param target the target value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @return the bytesToCapturePerPacket value
+     */
+    public Integer bytesToCapturePerPacket() {
+        return this.bytesToCapturePerPacket;
+    }
+
+    /**
+     * Set number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @param bytesToCapturePerPacket the bytesToCapturePerPacket value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withBytesToCapturePerPacket(Integer bytesToCapturePerPacket) {
+        this.bytesToCapturePerPacket = bytesToCapturePerPacket;
+        return this;
+    }
+
+    /**
+     * Get maximum size of the capture output.
+     *
+     * @return the totalBytesPerSession value
+     */
+    public Integer totalBytesPerSession() {
+        return this.totalBytesPerSession;
+    }
+
+    /**
+     * Set maximum size of the capture output.
+     *
+     * @param totalBytesPerSession the totalBytesPerSession value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withTotalBytesPerSession(Integer totalBytesPerSession) {
+        this.totalBytesPerSession = totalBytesPerSession;
+        return this;
+    }
+
+    /**
+     * Get maximum duration of the capture session in seconds.
+     *
+     * @return the timeLimitInSeconds value
+     */
+    public Integer timeLimitInSeconds() {
+        return this.timeLimitInSeconds;
+    }
+
+    /**
+     * Set maximum duration of the capture session in seconds.
+     *
+     * @param timeLimitInSeconds the timeLimitInSeconds value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withTimeLimitInSeconds(Integer timeLimitInSeconds) {
+        this.timeLimitInSeconds = timeLimitInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the storage location for a packet capture session.
+     *
+     * @return the storageLocation value
+     */
+    public PacketCaptureStorageLocation storageLocation() {
+        return this.storageLocation;
+    }
+
+    /**
+     * Set the storage location for a packet capture session.
+     *
+     * @param storageLocation the storageLocation value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withStorageLocation(PacketCaptureStorageLocation storageLocation) {
+        this.storageLocation = storageLocation;
+        return this;
+    }
+
+    /**
+     * Get a list of packet capture filters.
+     *
+     * @return the filters value
+     */
+    public List<PacketCaptureFilter> filters() {
+        return this.filters;
+    }
+
+    /**
+     * Set a list of packet capture filters.
+     *
+     * @param filters the filters value to set
+     * @return the PacketCaptureInner object itself.
+     */
+    public PacketCaptureInner withFilters(List<PacketCaptureFilter> filters) {
+        this.filters = filters;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultImpl.java
new file mode 100644
index 000000000000..f7e346cb9f2b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureQueryStatusResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PcError;
+import com.microsoft.azure.management.network.v2020_04_01.PcStatus;
+
+class PacketCaptureQueryStatusResultImpl extends WrapperImpl<PacketCaptureQueryStatusResultInner> implements PacketCaptureQueryStatusResult {
+    private final NetworkManager manager;
+    PacketCaptureQueryStatusResultImpl(PacketCaptureQueryStatusResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public DateTime captureStartTime() {
+        return this.inner().captureStartTime();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<PcError> packetCaptureError() {
+        return this.inner().packetCaptureError();
+    }
+
+    @Override
+    public PcStatus packetCaptureStatus() {
+        return this.inner().packetCaptureStatus();
+    }
+
+    @Override
+    public String stopReason() {
+        return this.inner().stopReason();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultInner.java
new file mode 100644
index 000000000000..121cb2dfc542
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureQueryStatusResultInner.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.network.v2020_04_01.implementation;
+
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.network.v2020_04_01.PcStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PcError;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Status of packet capture session.
+ */
+public class PacketCaptureQueryStatusResultInner {
+    /**
+     * The name of the packet capture resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The ID of the packet capture resource.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * The start time of the packet capture session.
+     */
+    @JsonProperty(value = "captureStartTime")
+    private DateTime captureStartTime;
+
+    /**
+     * The status of the packet capture session. Possible values include:
+     * 'NotStarted', 'Running', 'Stopped', 'Error', 'Unknown'.
+     */
+    @JsonProperty(value = "packetCaptureStatus")
+    private PcStatus packetCaptureStatus;
+
+    /**
+     * The reason the current packet capture session was stopped.
+     */
+    @JsonProperty(value = "stopReason")
+    private String stopReason;
+
+    /**
+     * List of errors of packet capture session.
+     */
+    @JsonProperty(value = "packetCaptureError")
+    private List<PcError> packetCaptureError;
+
+    /**
+     * Get the name of the packet capture resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the packet capture resource.
+     *
+     * @param name the name value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the ID of the packet capture resource.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the ID of the packet capture resource.
+     *
+     * @param id the id value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get the start time of the packet capture session.
+     *
+     * @return the captureStartTime value
+     */
+    public DateTime captureStartTime() {
+        return this.captureStartTime;
+    }
+
+    /**
+     * Set the start time of the packet capture session.
+     *
+     * @param captureStartTime the captureStartTime value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withCaptureStartTime(DateTime captureStartTime) {
+        this.captureStartTime = captureStartTime;
+        return this;
+    }
+
+    /**
+     * Get the status of the packet capture session. Possible values include: 'NotStarted', 'Running', 'Stopped', 'Error', 'Unknown'.
+     *
+     * @return the packetCaptureStatus value
+     */
+    public PcStatus packetCaptureStatus() {
+        return this.packetCaptureStatus;
+    }
+
+    /**
+     * Set the status of the packet capture session. Possible values include: 'NotStarted', 'Running', 'Stopped', 'Error', 'Unknown'.
+     *
+     * @param packetCaptureStatus the packetCaptureStatus value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withPacketCaptureStatus(PcStatus packetCaptureStatus) {
+        this.packetCaptureStatus = packetCaptureStatus;
+        return this;
+    }
+
+    /**
+     * Get the reason the current packet capture session was stopped.
+     *
+     * @return the stopReason value
+     */
+    public String stopReason() {
+        return this.stopReason;
+    }
+
+    /**
+     * Set the reason the current packet capture session was stopped.
+     *
+     * @param stopReason the stopReason value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withStopReason(String stopReason) {
+        this.stopReason = stopReason;
+        return this;
+    }
+
+    /**
+     * Get list of errors of packet capture session.
+     *
+     * @return the packetCaptureError value
+     */
+    public List<PcError> packetCaptureError() {
+        return this.packetCaptureError;
+    }
+
+    /**
+     * Set list of errors of packet capture session.
+     *
+     * @param packetCaptureError the packetCaptureError value to set
+     * @return the PacketCaptureQueryStatusResultInner object itself.
+     */
+    public PacketCaptureQueryStatusResultInner withPacketCaptureError(List<PcError> packetCaptureError) {
+        this.packetCaptureError = packetCaptureError;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultImpl.java
new file mode 100644
index 000000000000..657d1a3bd6a7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureResult;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureStorageLocation;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureFilter;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import rx.functions.Func1;
+
+class PacketCaptureResultImpl extends CreatableUpdatableImpl<PacketCaptureResult, PacketCaptureResultInner, PacketCaptureResultImpl> implements PacketCaptureResult, PacketCaptureResult.Definition, PacketCaptureResult.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String networkWatcherName;
+    private String packetCaptureName;
+    private PacketCaptureInner createOrUpdateParameter;
+
+    PacketCaptureResultImpl(String name, NetworkManager manager) {
+        super(name, new PacketCaptureResultInner());
+        this.manager = manager;
+        // Set resource name
+        this.packetCaptureName = name;
+        //
+        this.createOrUpdateParameter = new PacketCaptureInner();
+    }
+
+    PacketCaptureResultImpl(PacketCaptureResultInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.packetCaptureName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.networkWatcherName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkWatchers");
+        this.packetCaptureName = IdParsingUtils.getValueFromIdByName(inner.id(), "packetCaptures");
+        //
+        this.createOrUpdateParameter = new PacketCaptureInner();
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PacketCaptureResult> createResourceAsync() {
+        PacketCapturesInner client = this.manager().inner().packetCaptures();
+        return client.createAsync(this.resourceGroupName, this.networkWatcherName, this.packetCaptureName, this.createOrUpdateParameter)
+            .map(new Func1<PacketCaptureResultInner, PacketCaptureResultInner>() {
+               @Override
+               public PacketCaptureResultInner call(PacketCaptureResultInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PacketCaptureResult> updateResourceAsync() {
+        PacketCapturesInner client = this.manager().inner().packetCaptures();
+        return client.createAsync(this.resourceGroupName, this.networkWatcherName, this.packetCaptureName, this.createOrUpdateParameter)
+            .map(new Func1<PacketCaptureResultInner, PacketCaptureResultInner>() {
+               @Override
+               public PacketCaptureResultInner call(PacketCaptureResultInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PacketCaptureResultInner> getInnerAsync() {
+        PacketCapturesInner client = this.manager().inner().packetCaptures();
+        return client.getAsync(this.resourceGroupName, this.networkWatcherName, this.packetCaptureName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new PacketCaptureInner();
+    }
+
+    @Override
+    public Integer bytesToCapturePerPacket() {
+        return this.inner().bytesToCapturePerPacket();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<PacketCaptureFilter> filters() {
+        return this.inner().filters();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PacketCaptureStorageLocation storageLocation() {
+        return this.inner().storageLocation();
+    }
+
+    @Override
+    public String target() {
+        return this.inner().target();
+    }
+
+    @Override
+    public Integer timeLimitInSeconds() {
+        return this.inner().timeLimitInSeconds();
+    }
+
+    @Override
+    public Integer totalBytesPerSession() {
+        return this.inner().totalBytesPerSession();
+    }
+
+    @Override
+    public PacketCaptureResultImpl withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName) {
+        this.resourceGroupName = resourceGroupName;
+        this.networkWatcherName = networkWatcherName;
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withStorageLocation(PacketCaptureStorageLocation storageLocation) {
+        this.createOrUpdateParameter.withStorageLocation(storageLocation);
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withTarget(String target) {
+        this.createOrUpdateParameter.withTarget(target);
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withBytesToCapturePerPacket(Integer bytesToCapturePerPacket) {
+        this.createOrUpdateParameter.withBytesToCapturePerPacket(bytesToCapturePerPacket);
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withFilters(List<PacketCaptureFilter> filters) {
+        this.createOrUpdateParameter.withFilters(filters);
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withTimeLimitInSeconds(Integer timeLimitInSeconds) {
+        this.createOrUpdateParameter.withTimeLimitInSeconds(timeLimitInSeconds);
+        return this;
+    }
+
+    @Override
+    public PacketCaptureResultImpl withTotalBytesPerSession(Integer totalBytesPerSession) {
+        this.createOrUpdateParameter.withTotalBytesPerSession(totalBytesPerSession);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultInner.java
new file mode 100644
index 000000000000..f73dcdf45312
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCaptureResultInner.java
@@ -0,0 +1,240 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureStorageLocation;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureFilter;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Information about packet capture session.
+ */
+@JsonFlatten
+public class PacketCaptureResultInner {
+    /**
+     * Name of the packet capture session.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * ID of the packet capture operation.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The ID of the targeted resource, only VM is currently supported.
+     */
+    @JsonProperty(value = "properties.target", required = true)
+    private String target;
+
+    /**
+     * Number of bytes captured per packet, the remaining bytes are truncated.
+     */
+    @JsonProperty(value = "properties.bytesToCapturePerPacket")
+    private Integer bytesToCapturePerPacket;
+
+    /**
+     * Maximum size of the capture output.
+     */
+    @JsonProperty(value = "properties.totalBytesPerSession")
+    private Integer totalBytesPerSession;
+
+    /**
+     * Maximum duration of the capture session in seconds.
+     */
+    @JsonProperty(value = "properties.timeLimitInSeconds")
+    private Integer timeLimitInSeconds;
+
+    /**
+     * The storage location for a packet capture session.
+     */
+    @JsonProperty(value = "properties.storageLocation", required = true)
+    private PacketCaptureStorageLocation storageLocation;
+
+    /**
+     * A list of packet capture filters.
+     */
+    @JsonProperty(value = "properties.filters")
+    private List<PacketCaptureFilter> filters;
+
+    /**
+     * The provisioning state of the packet capture session. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Get name of the packet capture session.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get iD of the packet capture operation.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the ID of the targeted resource, only VM is currently supported.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set the ID of the targeted resource, only VM is currently supported.
+     *
+     * @param target the target value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @return the bytesToCapturePerPacket value
+     */
+    public Integer bytesToCapturePerPacket() {
+        return this.bytesToCapturePerPacket;
+    }
+
+    /**
+     * Set number of bytes captured per packet, the remaining bytes are truncated.
+     *
+     * @param bytesToCapturePerPacket the bytesToCapturePerPacket value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withBytesToCapturePerPacket(Integer bytesToCapturePerPacket) {
+        this.bytesToCapturePerPacket = bytesToCapturePerPacket;
+        return this;
+    }
+
+    /**
+     * Get maximum size of the capture output.
+     *
+     * @return the totalBytesPerSession value
+     */
+    public Integer totalBytesPerSession() {
+        return this.totalBytesPerSession;
+    }
+
+    /**
+     * Set maximum size of the capture output.
+     *
+     * @param totalBytesPerSession the totalBytesPerSession value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withTotalBytesPerSession(Integer totalBytesPerSession) {
+        this.totalBytesPerSession = totalBytesPerSession;
+        return this;
+    }
+
+    /**
+     * Get maximum duration of the capture session in seconds.
+     *
+     * @return the timeLimitInSeconds value
+     */
+    public Integer timeLimitInSeconds() {
+        return this.timeLimitInSeconds;
+    }
+
+    /**
+     * Set maximum duration of the capture session in seconds.
+     *
+     * @param timeLimitInSeconds the timeLimitInSeconds value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withTimeLimitInSeconds(Integer timeLimitInSeconds) {
+        this.timeLimitInSeconds = timeLimitInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the storage location for a packet capture session.
+     *
+     * @return the storageLocation value
+     */
+    public PacketCaptureStorageLocation storageLocation() {
+        return this.storageLocation;
+    }
+
+    /**
+     * Set the storage location for a packet capture session.
+     *
+     * @param storageLocation the storageLocation value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withStorageLocation(PacketCaptureStorageLocation storageLocation) {
+        this.storageLocation = storageLocation;
+        return this;
+    }
+
+    /**
+     * Get a list of packet capture filters.
+     *
+     * @return the filters value
+     */
+    public List<PacketCaptureFilter> filters() {
+        return this.filters;
+    }
+
+    /**
+     * Set a list of packet capture filters.
+     *
+     * @param filters the filters value to set
+     * @return the PacketCaptureResultInner object itself.
+     */
+    public PacketCaptureResultInner withFilters(List<PacketCaptureFilter> filters) {
+        this.filters = filters;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the packet capture session. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesImpl.java
new file mode 100644
index 000000000000..07642f7c121f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptures;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureQueryStatusResult;
+import com.microsoft.azure.management.network.v2020_04_01.PacketCaptureResult;
+
+class PacketCapturesImpl extends WrapperImpl<PacketCapturesInner> implements PacketCaptures {
+    private final NetworkManager manager;
+
+    PacketCapturesImpl(NetworkManager manager) {
+        super(manager.inner().packetCaptures());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public PacketCaptureResultImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private PacketCaptureResultImpl wrapModel(PacketCaptureResultInner inner) {
+        return  new PacketCaptureResultImpl(inner, manager());
+    }
+
+    private PacketCaptureResultImpl wrapModel(String name) {
+        return new PacketCaptureResultImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable stopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        PacketCapturesInner client = this.inner();
+        return client.stopAsync(resourceGroupName, networkWatcherName, packetCaptureName).toCompletable();
+    }
+
+    @Override
+    public Observable<PacketCaptureQueryStatusResult> getStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        PacketCapturesInner client = this.inner();
+        return client.getStatusAsync(resourceGroupName, networkWatcherName, packetCaptureName)
+        .map(new Func1<PacketCaptureQueryStatusResultInner, PacketCaptureQueryStatusResult>() {
+            @Override
+            public PacketCaptureQueryStatusResult call(PacketCaptureQueryStatusResultInner inner) {
+                return new PacketCaptureQueryStatusResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PacketCaptureResult> listAsync(String resourceGroupName, String networkWatcherName) {
+        PacketCapturesInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkWatcherName)
+        .flatMap(new Func1<List<PacketCaptureResultInner>, Observable<PacketCaptureResultInner>>() {
+            @Override
+            public Observable<PacketCaptureResultInner> call(List<PacketCaptureResultInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<PacketCaptureResultInner, PacketCaptureResult>() {
+            @Override
+            public PacketCaptureResult call(PacketCaptureResultInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<PacketCaptureResult> getAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        PacketCapturesInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkWatcherName, packetCaptureName)
+        .flatMap(new Func1<PacketCaptureResultInner, Observable<PacketCaptureResult>>() {
+            @Override
+            public Observable<PacketCaptureResult> call(PacketCaptureResultInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((PacketCaptureResult)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        PacketCapturesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, networkWatcherName, packetCaptureName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesInner.java
new file mode 100644
index 000000000000..44c523dd3802
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PacketCapturesInner.java
@@ -0,0 +1,959 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.network.v2020_04_01.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.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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PacketCaptures.
+ */
+public class PacketCapturesInner {
+    /** The Retrofit service to perform REST calls. */
+    private PacketCapturesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PacketCapturesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PacketCapturesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PacketCapturesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PacketCaptures to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PacketCapturesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PacketCaptures create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}")
+        Observable<Response<ResponseBody>> create(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @Path("subscriptionId") String subscriptionId, @Body PacketCaptureInner 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.network.v2020_04_01.PacketCaptures beginCreate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}")
+        Observable<Response<ResponseBody>> beginCreate(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @Path("subscriptionId") String subscriptionId, @Body PacketCaptureInner 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.network.v2020_04_01.PacketCaptures get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures stop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}/stop")
+        Observable<Response<ResponseBody>> stop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures beginStop" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}/stop")
+        Observable<Response<ResponseBody>> beginStop(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures getStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}/queryStatus")
+        Observable<Response<ResponseBody>> getStatus(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures beginGetStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}/queryStatus")
+        Observable<Response<ResponseBody>> beginGetStatus(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("packetCaptureName") String packetCaptureName, @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.network.v2020_04_01.PacketCaptures list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture 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 PacketCaptureResultInner object if successful.
+     */
+    public PacketCaptureResultInner create(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @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<PacketCaptureResultInner> createAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters, final ServiceCallback<PacketCaptureResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PacketCaptureResultInner> createAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters).map(new Func1<ServiceResponse<PacketCaptureResultInner>, PacketCaptureResultInner>() {
+            @Override
+            public PacketCaptureResultInner call(ServiceResponse<PacketCaptureResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PacketCaptureResultInner>> createWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.create(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PacketCaptureResultInner>() { }.getType());
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture 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 PacketCaptureResultInner object if successful.
+     */
+    public PacketCaptureResultInner beginCreate(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @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<PacketCaptureResultInner> beginCreateAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters, final ServiceCallback<PacketCaptureResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureResultInner object
+     */
+    public Observable<PacketCaptureResultInner> beginCreateAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName, parameters).map(new Func1<ServiceResponse<PacketCaptureResultInner>, PacketCaptureResultInner>() {
+            @Override
+            public PacketCaptureResultInner call(ServiceResponse<PacketCaptureResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create and start a packet capture on the specified VM.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @param parameters Parameters that define the create packet capture operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureResultInner object
+     */
+    public Observable<ServiceResponse<PacketCaptureResultInner>> beginCreateWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, PacketCaptureInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreate(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PacketCaptureResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PacketCaptureResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PacketCaptureResultInner> clientResponse = beginCreateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PacketCaptureResultInner> beginCreateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(201, new TypeToken<PacketCaptureResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a packet capture session by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 PacketCaptureResultInner object if successful.
+     */
+    public PacketCaptureResultInner get(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a packet capture session by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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<PacketCaptureResultInner> getAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, final ServiceCallback<PacketCaptureResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Gets a packet capture session by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureResultInner object
+     */
+    public Observable<PacketCaptureResultInner> getAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<PacketCaptureResultInner>, PacketCaptureResultInner>() {
+            @Override
+            public PacketCaptureResultInner call(ServiceResponse<PacketCaptureResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a packet capture session by name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureResultInner object
+     */
+    public Observable<ServiceResponse<PacketCaptureResultInner>> getWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PacketCaptureResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PacketCaptureResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PacketCaptureResultInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PacketCaptureResultInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PacketCaptureResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 networkWatcherName, String packetCaptureName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 networkWatcherName, String packetCaptureName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 networkWatcherName, String packetCaptureName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 networkWatcherName, String packetCaptureName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 stop(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().last().body();
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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> stopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> stopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return stopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> stopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.stop(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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 beginStop(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().single().body();
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @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> beginStopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginStopAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return beginStopWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops a specified packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param packetCaptureName The name of the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginStopWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginStop(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), 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 = beginStopDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginStopDelegate(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())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @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 PacketCaptureQueryStatusResultInner object if successful.
+     */
+    public PacketCaptureQueryStatusResultInner getStatus(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return getStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().last().body();
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @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<PacketCaptureQueryStatusResultInner> getStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, final ServiceCallback<PacketCaptureQueryStatusResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PacketCaptureQueryStatusResultInner> getStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return getStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<PacketCaptureQueryStatusResultInner>, PacketCaptureQueryStatusResultInner>() {
+            @Override
+            public PacketCaptureQueryStatusResultInner call(ServiceResponse<PacketCaptureQueryStatusResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> getStatusWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getStatus(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType());
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @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 PacketCaptureQueryStatusResultInner object if successful.
+     */
+    public PacketCaptureQueryStatusResultInner beginGetStatus(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return beginGetStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).toBlocking().single().body();
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @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<PacketCaptureQueryStatusResultInner> beginGetStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName, final ServiceCallback<PacketCaptureQueryStatusResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName), serviceCallback);
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureQueryStatusResultInner object
+     */
+    public Observable<PacketCaptureQueryStatusResultInner> beginGetStatusAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        return beginGetStatusWithServiceResponseAsync(resourceGroupName, networkWatcherName, packetCaptureName).map(new Func1<ServiceResponse<PacketCaptureQueryStatusResultInner>, PacketCaptureQueryStatusResultInner>() {
+            @Override
+            public PacketCaptureQueryStatusResultInner call(ServiceResponse<PacketCaptureQueryStatusResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Query the status of a running packet capture session.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @param packetCaptureName The name given to the packet capture session.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PacketCaptureQueryStatusResultInner object
+     */
+    public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> beginGetStatusWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (packetCaptureName == null) {
+            throw new IllegalArgumentException("Parameter packetCaptureName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetStatus(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PacketCaptureQueryStatusResultInner> clientResponse = beginGetStatusDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PacketCaptureQueryStatusResultInner> beginGetStatusDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureQueryStatusResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType())
+                .register(202, new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all packet capture sessions within the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher 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 List&lt;PacketCaptureResultInner&gt; object if successful.
+     */
+    public List<PacketCaptureResultInner> list(String resourceGroupName, String networkWatcherName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkWatcherName).toBlocking().single().body();
+    }
+
+    /**
+     * Lists all packet capture sessions within the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher 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<List<PacketCaptureResultInner>> listAsync(String resourceGroupName, String networkWatcherName, final ServiceCallback<List<PacketCaptureResultInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, networkWatcherName), serviceCallback);
+    }
+
+    /**
+     * Lists all packet capture sessions within the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;PacketCaptureResultInner&gt; object
+     */
+    public Observable<List<PacketCaptureResultInner>> listAsync(String resourceGroupName, String networkWatcherName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkWatcherName).map(new Func1<ServiceResponse<List<PacketCaptureResultInner>>, List<PacketCaptureResultInner>>() {
+            @Override
+            public List<PacketCaptureResultInner> call(ServiceResponse<List<PacketCaptureResultInner>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Lists all packet capture sessions within the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the Network Watcher resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;PacketCaptureResultInner&gt; object
+     */
+    public Observable<ServiceResponse<List<PacketCaptureResultInner>>> listWithServiceResponseAsync(String resourceGroupName, String networkWatcherName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkWatcherName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<PacketCaptureResultInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<PacketCaptureResultInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PacketCaptureResultInner>> result = listDelegate(response);
+                        List<PacketCaptureResultInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<PacketCaptureResultInner>> clientResponse = new ServiceResponse<List<PacketCaptureResultInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PacketCaptureResultInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PacketCaptureResultInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PacketCaptureResultInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl.java
new file mode 100644
index 000000000000..8cc22185f17e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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.network.v2020_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/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl1.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl1.java
new file mode 100644
index 000000000000..35aae2eb5cec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PageImpl1.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.network.v2020_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 PageImpl1<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("")
+    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 PageImpl1<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 PageImpl1<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionImpl.java
new file mode 100644
index 000000000000..da062115e5ff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnection;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.CircuitConnectionStatus;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class PeerExpressRouteCircuitConnectionImpl extends IndexableRefreshableWrapperImpl<PeerExpressRouteCircuitConnection, PeerExpressRouteCircuitConnectionInner> implements PeerExpressRouteCircuitConnection {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String circuitName;
+    private String peeringName;
+    private String connectionName;
+
+    PeerExpressRouteCircuitConnectionImpl(PeerExpressRouteCircuitConnectionInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
+        this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerConnections");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<PeerExpressRouteCircuitConnectionInner> getInnerAsync() {
+        PeerExpressRouteCircuitConnectionsInner client = this.manager().inner().peerExpressRouteCircuitConnections();
+        return client.getAsync(this.resourceGroupName, this.circuitName, this.peeringName, this.connectionName);
+    }
+
+
+
+    @Override
+    public String addressPrefix() {
+        return this.inner().addressPrefix();
+    }
+
+    @Override
+    public String authResourceGuid() {
+        return this.inner().authResourceGuid();
+    }
+
+    @Override
+    public CircuitConnectionStatus circuitConnectionStatus() {
+        return this.inner().circuitConnectionStatus();
+    }
+
+    @Override
+    public String connectionName() {
+        return this.inner().connectionName();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource expressRouteCircuitPeering() {
+        return this.inner().expressRouteCircuitPeering();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource peerExpressRouteCircuitPeering() {
+        return this.inner().peerExpressRouteCircuitPeering();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionInner.java
new file mode 100644
index 000000000000..e216953584db
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionInner.java
@@ -0,0 +1,257 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.CircuitConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Peer Express Route Circuit Connection in an ExpressRouteCircuitPeering
+ * resource.
+ */
+@JsonFlatten
+public class PeerExpressRouteCircuitConnectionInner extends SubResource {
+    /**
+     * Reference to Express Route Circuit Private Peering Resource of the
+     * circuit.
+     */
+    @JsonProperty(value = "properties.expressRouteCircuitPeering")
+    private SubResource expressRouteCircuitPeering;
+
+    /**
+     * Reference to Express Route Circuit Private Peering Resource of the
+     * peered circuit.
+     */
+    @JsonProperty(value = "properties.peerExpressRouteCircuitPeering")
+    private SubResource peerExpressRouteCircuitPeering;
+
+    /**
+     * /29 IP address space to carve out Customer addresses for tunnels.
+     */
+    @JsonProperty(value = "properties.addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * Express Route Circuit connection state. Possible values include:
+     * 'Connected', 'Connecting', 'Disconnected'.
+     */
+    @JsonProperty(value = "properties.circuitConnectionStatus")
+    private CircuitConnectionStatus circuitConnectionStatus;
+
+    /**
+     * The name of the express route circuit connection resource.
+     */
+    @JsonProperty(value = "properties.connectionName")
+    private String connectionName;
+
+    /**
+     * The resource guid of the authorization used for the express route
+     * circuit connection.
+     */
+    @JsonProperty(value = "properties.authResourceGuid")
+    private String authResourceGuid;
+
+    /**
+     * The provisioning state of the peer express route circuit connection
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get reference to Express Route Circuit Private Peering Resource of the circuit.
+     *
+     * @return the expressRouteCircuitPeering value
+     */
+    public SubResource expressRouteCircuitPeering() {
+        return this.expressRouteCircuitPeering;
+    }
+
+    /**
+     * Set reference to Express Route Circuit Private Peering Resource of the circuit.
+     *
+     * @param expressRouteCircuitPeering the expressRouteCircuitPeering value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering) {
+        this.expressRouteCircuitPeering = expressRouteCircuitPeering;
+        return this;
+    }
+
+    /**
+     * Get reference to Express Route Circuit Private Peering Resource of the peered circuit.
+     *
+     * @return the peerExpressRouteCircuitPeering value
+     */
+    public SubResource peerExpressRouteCircuitPeering() {
+        return this.peerExpressRouteCircuitPeering;
+    }
+
+    /**
+     * Set reference to Express Route Circuit Private Peering Resource of the peered circuit.
+     *
+     * @param peerExpressRouteCircuitPeering the peerExpressRouteCircuitPeering value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering) {
+        this.peerExpressRouteCircuitPeering = peerExpressRouteCircuitPeering;
+        return this;
+    }
+
+    /**
+     * Get /29 IP address space to carve out Customer addresses for tunnels.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set /29 IP address space to carve out Customer addresses for tunnels.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'.
+     *
+     * @return the circuitConnectionStatus value
+     */
+    public CircuitConnectionStatus circuitConnectionStatus() {
+        return this.circuitConnectionStatus;
+    }
+
+    /**
+     * Set express Route Circuit connection state. Possible values include: 'Connected', 'Connecting', 'Disconnected'.
+     *
+     * @param circuitConnectionStatus the circuitConnectionStatus value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withCircuitConnectionStatus(CircuitConnectionStatus circuitConnectionStatus) {
+        this.circuitConnectionStatus = circuitConnectionStatus;
+        return this;
+    }
+
+    /**
+     * Get the name of the express route circuit connection resource.
+     *
+     * @return the connectionName value
+     */
+    public String connectionName() {
+        return this.connectionName;
+    }
+
+    /**
+     * Set the name of the express route circuit connection resource.
+     *
+     * @param connectionName the connectionName value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withConnectionName(String connectionName) {
+        this.connectionName = connectionName;
+        return this;
+    }
+
+    /**
+     * Get the resource guid of the authorization used for the express route circuit connection.
+     *
+     * @return the authResourceGuid value
+     */
+    public String authResourceGuid() {
+        return this.authResourceGuid;
+    }
+
+    /**
+     * Set the resource guid of the authorization used for the express route circuit connection.
+     *
+     * @param authResourceGuid the authResourceGuid value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withAuthResourceGuid(String authResourceGuid) {
+        this.authResourceGuid = authResourceGuid;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the peer express route circuit connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the PeerExpressRouteCircuitConnectionInner object itself.
+     */
+    public PeerExpressRouteCircuitConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsImpl.java
new file mode 100644
index 000000000000..590afee36117
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnections;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnection;
+
+class PeerExpressRouteCircuitConnectionsImpl extends WrapperImpl<PeerExpressRouteCircuitConnectionsInner> implements PeerExpressRouteCircuitConnections {
+    private final NetworkManager manager;
+
+    PeerExpressRouteCircuitConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().peerExpressRouteCircuitConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private PeerExpressRouteCircuitConnectionImpl wrapModel(PeerExpressRouteCircuitConnectionInner inner) {
+        return  new PeerExpressRouteCircuitConnectionImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<PeerExpressRouteCircuitConnection> listAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        PeerExpressRouteCircuitConnectionsInner client = this.inner();
+        return client.listAsync(resourceGroupName, circuitName, peeringName)
+        .flatMapIterable(new Func1<Page<PeerExpressRouteCircuitConnectionInner>, Iterable<PeerExpressRouteCircuitConnectionInner>>() {
+            @Override
+            public Iterable<PeerExpressRouteCircuitConnectionInner> call(Page<PeerExpressRouteCircuitConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PeerExpressRouteCircuitConnectionInner, PeerExpressRouteCircuitConnection>() {
+            @Override
+            public PeerExpressRouteCircuitConnection call(PeerExpressRouteCircuitConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<PeerExpressRouteCircuitConnection> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        PeerExpressRouteCircuitConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, circuitName, peeringName, connectionName)
+        .flatMap(new Func1<PeerExpressRouteCircuitConnectionInner, Observable<PeerExpressRouteCircuitConnection>>() {
+            @Override
+            public Observable<PeerExpressRouteCircuitConnection> call(PeerExpressRouteCircuitConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((PeerExpressRouteCircuitConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsInner.java
new file mode 100644
index 000000000000..67b2ce6dfdd4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PeerExpressRouteCircuitConnectionsInner.java
@@ -0,0 +1,412 @@
+/**
+ * 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.network.v2020_04_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.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.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 PeerExpressRouteCircuitConnections.
+ */
+public class PeerExpressRouteCircuitConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private PeerExpressRouteCircuitConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PeerExpressRouteCircuitConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PeerExpressRouteCircuitConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PeerExpressRouteCircuitConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PeerExpressRouteCircuitConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PeerExpressRouteCircuitConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PeerExpressRouteCircuitConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/peerConnections/{connectionName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.PeerExpressRouteCircuitConnections list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/peerConnections")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("circuitName") String circuitName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.PeerExpressRouteCircuitConnections listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets the specified Peer Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the peer express route circuit connection.
+     * @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 PeerExpressRouteCircuitConnectionInner object if successful.
+     */
+    public PeerExpressRouteCircuitConnectionInner get(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Peer Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the peer express route circuit connection.
+     * @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<PeerExpressRouteCircuitConnectionInner> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName, final ServiceCallback<PeerExpressRouteCircuitConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Peer Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the peer express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PeerExpressRouteCircuitConnectionInner object
+     */
+    public Observable<PeerExpressRouteCircuitConnectionInner> getAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, circuitName, peeringName, connectionName).map(new Func1<ServiceResponse<PeerExpressRouteCircuitConnectionInner>, PeerExpressRouteCircuitConnectionInner>() {
+            @Override
+            public PeerExpressRouteCircuitConnectionInner call(ServiceResponse<PeerExpressRouteCircuitConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Peer Express Route Circuit Connection from the specified express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the express route circuit.
+     * @param peeringName The name of the peering.
+     * @param connectionName The name of the peer express route circuit connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PeerExpressRouteCircuitConnectionInner object
+     */
+    public Observable<ServiceResponse<PeerExpressRouteCircuitConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String circuitName, String peeringName, String connectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, circuitName, peeringName, connectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PeerExpressRouteCircuitConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PeerExpressRouteCircuitConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PeerExpressRouteCircuitConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PeerExpressRouteCircuitConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PeerExpressRouteCircuitConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PeerExpressRouteCircuitConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @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;PeerExpressRouteCircuitConnectionInner&gt; object if successful.
+     */
+    public PagedList<PeerExpressRouteCircuitConnectionInner> list(final String resourceGroupName, final String circuitName, final String peeringName) {
+        ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> response = listSinglePageAsync(resourceGroupName, circuitName, peeringName).toBlocking().single();
+        return new PagedList<PeerExpressRouteCircuitConnectionInner>(response.body()) {
+            @Override
+            public Page<PeerExpressRouteCircuitConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @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<PeerExpressRouteCircuitConnectionInner>> listAsync(final String resourceGroupName, final String circuitName, final String peeringName, final ListOperationCallback<PeerExpressRouteCircuitConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, circuitName, peeringName),
+            new Func1<String, Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PeerExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<Page<PeerExpressRouteCircuitConnectionInner>> listAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        return listWithServiceResponseAsync(resourceGroupName, circuitName, peeringName)
+            .map(new Func1<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>, Page<PeerExpressRouteCircuitConnectionInner>>() {
+                @Override
+                public Page<PeerExpressRouteCircuitConnectionInner> call(ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param circuitName The name of the circuit.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PeerExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        return listSinglePageAsync(resourceGroupName, circuitName, peeringName)
+            .concatMap(new Func1<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>, Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+    ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> * @param circuitName The name of the circuit.
+    ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PeerExpressRouteCircuitConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> listSinglePageAsync(final String resourceGroupName, final String circuitName, final String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (circuitName == null) {
+            throw new IllegalArgumentException("Parameter circuitName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, circuitName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PeerExpressRouteCircuitConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PeerExpressRouteCircuitConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @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;PeerExpressRouteCircuitConnectionInner&gt; object if successful.
+     */
+    public PagedList<PeerExpressRouteCircuitConnectionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PeerExpressRouteCircuitConnectionInner>(response.body()) {
+            @Override
+            public Page<PeerExpressRouteCircuitConnectionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @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<PeerExpressRouteCircuitConnectionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PeerExpressRouteCircuitConnectionInner>> serviceFuture, final ListOperationCallback<PeerExpressRouteCircuitConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @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;PeerExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<Page<PeerExpressRouteCircuitConnectionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>, Page<PeerExpressRouteCircuitConnectionInner>>() {
+                @Override
+                public Page<PeerExpressRouteCircuitConnectionInner> call(ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+     * @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;PeerExpressRouteCircuitConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>, Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all global reach peer connections associated with a private peering in an express route circuit.
+     *
+    ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PeerExpressRouteCircuitConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> 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<PeerExpressRouteCircuitConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PeerExpressRouteCircuitConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PeerExpressRouteCircuitConnectionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PeerExpressRouteCircuitConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PeerExpressRouteCircuitConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupImpl.java
new file mode 100644
index 000000000000..6f342024f9ab
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupImpl.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneGroup;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneConfig;
+
+class PrivateDnsZoneGroupImpl extends CreatableUpdatableImpl<PrivateDnsZoneGroup, PrivateDnsZoneGroupInner, PrivateDnsZoneGroupImpl> implements PrivateDnsZoneGroup, PrivateDnsZoneGroup.Definition, PrivateDnsZoneGroup.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String privateEndpointName;
+    private String privateDnsZoneGroupName;
+
+    PrivateDnsZoneGroupImpl(String name, NetworkManager manager) {
+        super(name, new PrivateDnsZoneGroupInner());
+        this.manager = manager;
+        // Set resource name
+        this.privateDnsZoneGroupName = name;
+        //
+    }
+
+    PrivateDnsZoneGroupImpl(PrivateDnsZoneGroupInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.privateDnsZoneGroupName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.privateEndpointName = IdParsingUtils.getValueFromIdByName(inner.id(), "privateEndpoints");
+        this.privateDnsZoneGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "privateDnsZoneGroups");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PrivateDnsZoneGroup> createResourceAsync() {
+        PrivateDnsZoneGroupsInner client = this.manager().inner().privateDnsZoneGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateEndpointName, this.privateDnsZoneGroupName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PrivateDnsZoneGroup> updateResourceAsync() {
+        PrivateDnsZoneGroupsInner client = this.manager().inner().privateDnsZoneGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.privateEndpointName, this.privateDnsZoneGroupName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PrivateDnsZoneGroupInner> getInnerAsync() {
+        PrivateDnsZoneGroupsInner client = this.manager().inner().privateDnsZoneGroups();
+        return client.getAsync(this.resourceGroupName, this.privateEndpointName, this.privateDnsZoneGroupName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<PrivateDnsZoneConfig> privateDnsZoneConfigs() {
+        return this.inner().privateDnsZoneConfigs();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PrivateDnsZoneGroupImpl withExistingPrivateEndpoint(String resourceGroupName, String privateEndpointName) {
+        this.resourceGroupName = resourceGroupName;
+        this.privateEndpointName = privateEndpointName;
+        return this;
+    }
+
+    @Override
+    public PrivateDnsZoneGroupImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public PrivateDnsZoneGroupImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public PrivateDnsZoneGroupImpl withPrivateDnsZoneConfigs(List<PrivateDnsZoneConfig> privateDnsZoneConfigs) {
+        this.inner().withPrivateDnsZoneConfigs(privateDnsZoneConfigs);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupInner.java
new file mode 100644
index 000000000000..6b0d65d579bb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneConfig;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Private dns zone group resource.
+ */
+@JsonFlatten
+public class PrivateDnsZoneGroupInner extends SubResource {
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The provisioning state of the private dns zone group resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A collection of private dns zone configurations of the private dns zone
+     * group.
+     */
+    @JsonProperty(value = "properties.privateDnsZoneConfigs")
+    private List<PrivateDnsZoneConfig> privateDnsZoneConfigs;
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the PrivateDnsZoneGroupInner object itself.
+     */
+    public PrivateDnsZoneGroupInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the provisioning state of the private dns zone group resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a collection of private dns zone configurations of the private dns zone group.
+     *
+     * @return the privateDnsZoneConfigs value
+     */
+    public List<PrivateDnsZoneConfig> privateDnsZoneConfigs() {
+        return this.privateDnsZoneConfigs;
+    }
+
+    /**
+     * Set a collection of private dns zone configurations of the private dns zone group.
+     *
+     * @param privateDnsZoneConfigs the privateDnsZoneConfigs value to set
+     * @return the PrivateDnsZoneGroupInner object itself.
+     */
+    public PrivateDnsZoneGroupInner withPrivateDnsZoneConfigs(List<PrivateDnsZoneConfig> privateDnsZoneConfigs) {
+        this.privateDnsZoneConfigs = privateDnsZoneConfigs;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsImpl.java
new file mode 100644
index 000000000000..93b2b7583432
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneGroups;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneGroup;
+
+class PrivateDnsZoneGroupsImpl extends WrapperImpl<PrivateDnsZoneGroupsInner> implements PrivateDnsZoneGroups {
+    private final NetworkManager manager;
+
+    PrivateDnsZoneGroupsImpl(NetworkManager manager) {
+        super(manager.inner().privateDnsZoneGroups());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public PrivateDnsZoneGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private PrivateDnsZoneGroupImpl wrapModel(PrivateDnsZoneGroupInner inner) {
+        return  new PrivateDnsZoneGroupImpl(inner, manager());
+    }
+
+    private PrivateDnsZoneGroupImpl wrapModel(String name) {
+        return new PrivateDnsZoneGroupImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<PrivateDnsZoneGroup> listAsync(final String privateEndpointName, final String resourceGroupName) {
+        PrivateDnsZoneGroupsInner client = this.inner();
+        return client.listAsync(privateEndpointName, resourceGroupName)
+        .flatMapIterable(new Func1<Page<PrivateDnsZoneGroupInner>, Iterable<PrivateDnsZoneGroupInner>>() {
+            @Override
+            public Iterable<PrivateDnsZoneGroupInner> call(Page<PrivateDnsZoneGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateDnsZoneGroupInner, PrivateDnsZoneGroup>() {
+            @Override
+            public PrivateDnsZoneGroup call(PrivateDnsZoneGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<PrivateDnsZoneGroup> getAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        PrivateDnsZoneGroupsInner client = this.inner();
+        return client.getAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName)
+        .flatMap(new Func1<PrivateDnsZoneGroupInner, Observable<PrivateDnsZoneGroup>>() {
+            @Override
+            public Observable<PrivateDnsZoneGroup> call(PrivateDnsZoneGroupInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((PrivateDnsZoneGroup)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        PrivateDnsZoneGroupsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsInner.java
new file mode 100644
index 000000000000..7454d2c7c52d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateDnsZoneGroupsInner.java
@@ -0,0 +1,765 @@
+/**
+ * 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.network.v2020_04_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.network.v2020_04_01.ErrorException;
+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 PrivateDnsZoneGroups.
+ */
+public class PrivateDnsZoneGroupsInner {
+    /** The Retrofit service to perform REST calls. */
+    private PrivateDnsZoneGroupsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PrivateDnsZoneGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PrivateDnsZoneGroupsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PrivateDnsZoneGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PrivateDnsZoneGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PrivateDnsZoneGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateDnsZoneGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("privateDnsZoneGroupName") String privateDnsZoneGroupName, @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.network.v2020_04_01.PrivateDnsZoneGroups beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("privateDnsZoneGroupName") String privateDnsZoneGroupName, @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.network.v2020_04_01.PrivateDnsZoneGroups get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("privateDnsZoneGroupName") String privateDnsZoneGroupName, @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.network.v2020_04_01.PrivateDnsZoneGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("privateDnsZoneGroupName") String privateDnsZoneGroupName, @Path("subscriptionId") String subscriptionId, @Body PrivateDnsZoneGroupInner 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.network.v2020_04_01.PrivateDnsZoneGroups beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("privateDnsZoneGroupName") String privateDnsZoneGroupName, @Path("subscriptionId") String subscriptionId, @Body PrivateDnsZoneGroupInner 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.network.v2020_04_01.PrivateDnsZoneGroups list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups")
+        Observable<Response<ResponseBody>> list(@Path("privateEndpointName") String privateEndpointName, @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.network.v2020_04_01.PrivateDnsZoneGroups listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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 privateEndpointName, String privateDnsZoneGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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 privateEndpointName, String privateDnsZoneGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (privateDnsZoneGroupName == null) {
+            throw new IllegalArgumentException("Parameter privateDnsZoneGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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 privateEndpointName, String privateDnsZoneGroupName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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 privateEndpointName, String privateDnsZoneGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private dns zone group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (privateDnsZoneGroupName == null) {
+            throw new IllegalArgumentException("Parameter privateDnsZoneGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, this.client.subscriptionId(), 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 private dns zone group resource by specified private dns zone group name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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 PrivateDnsZoneGroupInner object if successful.
+     */
+    public PrivateDnsZoneGroupInner get(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the private dns zone group resource by specified private dns zone group name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @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<PrivateDnsZoneGroupInner> getAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, final ServiceCallback<PrivateDnsZoneGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets the private dns zone group resource by specified private dns zone group name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateDnsZoneGroupInner object
+     */
+    public Observable<PrivateDnsZoneGroupInner> getAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName).map(new Func1<ServiceResponse<PrivateDnsZoneGroupInner>, PrivateDnsZoneGroupInner>() {
+            @Override
+            public PrivateDnsZoneGroupInner call(ServiceResponse<PrivateDnsZoneGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the private dns zone group resource by specified private dns zone group name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateDnsZoneGroupInner object
+     */
+    public Observable<ServiceResponse<PrivateDnsZoneGroupInner>> getWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (privateDnsZoneGroupName == null) {
+            throw new IllegalArgumentException("Parameter privateDnsZoneGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateDnsZoneGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateDnsZoneGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateDnsZoneGroupInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateDnsZoneGroupInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateDnsZoneGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateDnsZoneGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group 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 PrivateDnsZoneGroupInner object if successful.
+     */
+    public PrivateDnsZoneGroupInner createOrUpdate(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @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<PrivateDnsZoneGroupInner> createOrUpdateAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters, final ServiceCallback<PrivateDnsZoneGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PrivateDnsZoneGroupInner> createOrUpdateAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters).map(new Func1<ServiceResponse<PrivateDnsZoneGroupInner>, PrivateDnsZoneGroupInner>() {
+            @Override
+            public PrivateDnsZoneGroupInner call(ServiceResponse<PrivateDnsZoneGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PrivateDnsZoneGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (privateDnsZoneGroupName == null) {
+            throw new IllegalArgumentException("Parameter privateDnsZoneGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PrivateDnsZoneGroupInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group 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 PrivateDnsZoneGroupInner object if successful.
+     */
+    public PrivateDnsZoneGroupInner beginCreateOrUpdate(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @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<PrivateDnsZoneGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters, final ServiceCallback<PrivateDnsZoneGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateDnsZoneGroupInner object
+     */
+    public Observable<PrivateDnsZoneGroupInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, parameters).map(new Func1<ServiceResponse<PrivateDnsZoneGroupInner>, PrivateDnsZoneGroupInner>() {
+            @Override
+            public PrivateDnsZoneGroupInner call(ServiceResponse<PrivateDnsZoneGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a private dns zone group in the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param privateDnsZoneGroupName The name of the private dns zone group.
+     * @param parameters Parameters supplied to the create or update private dns zone group operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateDnsZoneGroupInner object
+     */
+    public Observable<ServiceResponse<PrivateDnsZoneGroupInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String privateDnsZoneGroupName, PrivateDnsZoneGroupInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (privateDnsZoneGroupName == null) {
+            throw new IllegalArgumentException("Parameter privateDnsZoneGroupName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, privateEndpointName, privateDnsZoneGroupName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateDnsZoneGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateDnsZoneGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateDnsZoneGroupInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateDnsZoneGroupInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateDnsZoneGroupInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateDnsZoneGroupInner>() { }.getType())
+                .register(201, new TypeToken<PrivateDnsZoneGroupInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param privateEndpointName The name of the private endpoint.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateDnsZoneGroupInner&gt; object if successful.
+     */
+    public PagedList<PrivateDnsZoneGroupInner> list(final String privateEndpointName, final String resourceGroupName) {
+        ServiceResponse<Page<PrivateDnsZoneGroupInner>> response = listSinglePageAsync(privateEndpointName, resourceGroupName).toBlocking().single();
+        return new PagedList<PrivateDnsZoneGroupInner>(response.body()) {
+            @Override
+            public Page<PrivateDnsZoneGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param privateEndpointName The name of the private endpoint.
+     * @param resourceGroupName The name of the resource group.
+     * @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<PrivateDnsZoneGroupInner>> listAsync(final String privateEndpointName, final String resourceGroupName, final ListOperationCallback<PrivateDnsZoneGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(privateEndpointName, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param privateEndpointName The name of the private endpoint.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateDnsZoneGroupInner&gt; object
+     */
+    public Observable<Page<PrivateDnsZoneGroupInner>> listAsync(final String privateEndpointName, final String resourceGroupName) {
+        return listWithServiceResponseAsync(privateEndpointName, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PrivateDnsZoneGroupInner>>, Page<PrivateDnsZoneGroupInner>>() {
+                @Override
+                public Page<PrivateDnsZoneGroupInner> call(ServiceResponse<Page<PrivateDnsZoneGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param privateEndpointName The name of the private endpoint.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateDnsZoneGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> listWithServiceResponseAsync(final String privateEndpointName, final String resourceGroupName) {
+        return listSinglePageAsync(privateEndpointName, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateDnsZoneGroupInner>>, Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(ServiceResponse<Page<PrivateDnsZoneGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+    ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> * @param privateEndpointName The name of the private endpoint.
+    ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateDnsZoneGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> listSinglePageAsync(final String privateEndpointName, final String resourceGroupName) {
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(privateEndpointName, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateDnsZoneGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateDnsZoneGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateDnsZoneGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateDnsZoneGroupInner&gt; object if successful.
+     */
+    public PagedList<PrivateDnsZoneGroupInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateDnsZoneGroupInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateDnsZoneGroupInner>(response.body()) {
+            @Override
+            public Page<PrivateDnsZoneGroupInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @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<PrivateDnsZoneGroupInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateDnsZoneGroupInner>> serviceFuture, final ListOperationCallback<PrivateDnsZoneGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @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;PrivateDnsZoneGroupInner&gt; object
+     */
+    public Observable<Page<PrivateDnsZoneGroupInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateDnsZoneGroupInner>>, Page<PrivateDnsZoneGroupInner>>() {
+                @Override
+                public Page<PrivateDnsZoneGroupInner> call(ServiceResponse<Page<PrivateDnsZoneGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+     * @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;PrivateDnsZoneGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateDnsZoneGroupInner>>, Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(ServiceResponse<Page<PrivateDnsZoneGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private dns zone groups in a private endpoint.
+     *
+    ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateDnsZoneGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> 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<PrivateDnsZoneGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateDnsZoneGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateDnsZoneGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateDnsZoneGroupInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateDnsZoneGroupInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateDnsZoneGroupInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionImpl.java
new file mode 100644
index 000000000000..d6d1c5246753
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionImpl.java
@@ -0,0 +1,137 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpointConnection;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceConnectionState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+
+class PrivateEndpointConnectionImpl extends CreatableUpdatableImpl<PrivateEndpointConnection, PrivateEndpointConnectionInner, PrivateEndpointConnectionImpl> implements PrivateEndpointConnection, PrivateEndpointConnection.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String serviceName;
+    private String peConnectionName;
+
+    PrivateEndpointConnectionImpl(String name, NetworkManager manager) {
+        super(name, new PrivateEndpointConnectionInner());
+        this.manager = manager;
+        // Set resource name
+        this.peConnectionName = name;
+        //
+    }
+
+    PrivateEndpointConnectionImpl(PrivateEndpointConnectionInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.peConnectionName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.serviceName = IdParsingUtils.getValueFromIdByName(inner.id(), "privateLinkServices");
+        this.peConnectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "privateEndpointConnections");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PrivateEndpointConnection> createResourceAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<PrivateEndpointConnection> updateResourceAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return client.updatePrivateEndpointConnectionAsync(this.resourceGroupName, this.serviceName, this.peConnectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PrivateEndpointConnectionInner> getInnerAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return client.getPrivateEndpointConnectionAsync(this.resourceGroupName, this.serviceName, this.peConnectionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String linkIdentifier() {
+        return this.inner().linkIdentifier();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public PrivateEndpoint privateEndpoint() {
+        PrivateEndpointInner inner = this.inner().privateEndpoint();
+        if (inner != null) {
+            return  new PrivateEndpointImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public PrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
+        return this.inner().privateLinkServiceConnectionState();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public PrivateEndpointConnectionImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public PrivateEndpointConnectionImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public PrivateEndpointConnectionImpl withPrivateLinkServiceConnectionState(PrivateLinkServiceConnectionState privateLinkServiceConnectionState) {
+        this.inner().withPrivateLinkServiceConnectionState(privateLinkServiceConnectionState);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionInner.java
new file mode 100644
index 000000000000..5e3207579264
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointConnectionInner.java
@@ -0,0 +1,152 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceConnectionState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * PrivateEndpointConnection resource.
+ */
+@JsonFlatten
+public class PrivateEndpointConnectionInner extends SubResource {
+    /**
+     * The resource of private end point.
+     */
+    @JsonProperty(value = "properties.privateEndpoint", access = JsonProperty.Access.WRITE_ONLY)
+    private PrivateEndpointInner privateEndpoint;
+
+    /**
+     * A collection of information about the state of the connection between
+     * service consumer and provider.
+     */
+    @JsonProperty(value = "properties.privateLinkServiceConnectionState")
+    private PrivateLinkServiceConnectionState privateLinkServiceConnectionState;
+
+    /**
+     * The provisioning state of the private endpoint connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The consumer link id.
+     */
+    @JsonProperty(value = "properties.linkIdentifier", access = JsonProperty.Access.WRITE_ONLY)
+    private String linkIdentifier;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the resource of private end point.
+     *
+     * @return the privateEndpoint value
+     */
+    public PrivateEndpointInner privateEndpoint() {
+        return this.privateEndpoint;
+    }
+
+    /**
+     * Get a collection of information about the state of the connection between service consumer and provider.
+     *
+     * @return the privateLinkServiceConnectionState value
+     */
+    public PrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
+        return this.privateLinkServiceConnectionState;
+    }
+
+    /**
+     * Set a collection of information about the state of the connection between service consumer and provider.
+     *
+     * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set
+     * @return the PrivateEndpointConnectionInner object itself.
+     */
+    public PrivateEndpointConnectionInner withPrivateLinkServiceConnectionState(PrivateLinkServiceConnectionState privateLinkServiceConnectionState) {
+        this.privateLinkServiceConnectionState = privateLinkServiceConnectionState;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the private endpoint connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the consumer link id.
+     *
+     * @return the linkIdentifier value
+     */
+    public String linkIdentifier() {
+        return this.linkIdentifier;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the PrivateEndpointConnectionInner object itself.
+     */
+    public PrivateEndpointConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointImpl.java
new file mode 100644
index 000000000000..0312168a3ecc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointImpl.java
@@ -0,0 +1,123 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceConnection;
+import com.microsoft.azure.management.network.v2020_04_01.CustomDnsConfigPropertiesFormat;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class PrivateEndpointImpl extends GroupableResourceCoreImpl<PrivateEndpoint, PrivateEndpointInner, PrivateEndpointImpl, NetworkManager> implements PrivateEndpoint, PrivateEndpoint.Definition, PrivateEndpoint.Update {
+    PrivateEndpointImpl(String name, PrivateEndpointInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<PrivateEndpoint> createResourceAsync() {
+        PrivateEndpointsInner client = this.manager().inner().privateEndpoints();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PrivateEndpoint> updateResourceAsync() {
+        PrivateEndpointsInner client = this.manager().inner().privateEndpoints();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PrivateEndpointInner> getInnerAsync() {
+        PrivateEndpointsInner client = this.manager().inner().privateEndpoints();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<CustomDnsConfigPropertiesFormat> customDnsConfigs() {
+        return this.inner().customDnsConfigs();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections() {
+        return this.inner().manualPrivateLinkServiceConnections();
+    }
+
+    @Override
+    public List<NetworkInterface> networkInterfaces() {
+        List<NetworkInterface> lst = new ArrayList<NetworkInterface>();
+        if (this.inner().networkInterfaces() != null) {
+            for (NetworkInterfaceInner inner : this.inner().networkInterfaces()) {
+                lst.add( new NetworkInterfaceImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<PrivateLinkServiceConnection> privateLinkServiceConnections() {
+        return this.inner().privateLinkServiceConnections();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public Subnet subnet() {
+        SubnetInner inner = this.inner().subnet();
+        if (inner != null) {
+            return  new SubnetImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public PrivateEndpointImpl withCustomDnsConfigs(List<CustomDnsConfigPropertiesFormat> customDnsConfigs) {
+        this.inner().withCustomDnsConfigs(customDnsConfigs);
+        return this;
+    }
+
+    @Override
+    public PrivateEndpointImpl withManualPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections) {
+        this.inner().withManualPrivateLinkServiceConnections(manualPrivateLinkServiceConnections);
+        return this;
+    }
+
+    @Override
+    public PrivateEndpointImpl withPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> privateLinkServiceConnections) {
+        this.inner().withPrivateLinkServiceConnections(privateLinkServiceConnections);
+        return this;
+    }
+
+    @Override
+    public PrivateEndpointImpl withSubnet(SubnetInner subnet) {
+        this.inner().withSubnet(subnet);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointInner.java
new file mode 100644
index 000000000000..2add87d5b45b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointInner.java
@@ -0,0 +1,205 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceConnection;
+import com.microsoft.azure.management.network.v2020_04_01.CustomDnsConfigPropertiesFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Private endpoint resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class PrivateEndpointInner extends Resource {
+    /**
+     * The ID of the subnet from which the private IP will be allocated.
+     */
+    @JsonProperty(value = "properties.subnet")
+    private SubnetInner subnet;
+
+    /**
+     * An array of references to the network interfaces created for this
+     * private endpoint.
+     */
+    @JsonProperty(value = "properties.networkInterfaces", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceInner> networkInterfaces;
+
+    /**
+     * The provisioning state of the private endpoint resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A grouping of information about the connection to the remote resource.
+     */
+    @JsonProperty(value = "properties.privateLinkServiceConnections")
+    private List<PrivateLinkServiceConnection> privateLinkServiceConnections;
+
+    /**
+     * A grouping of information about the connection to the remote resource.
+     * Used when the network admin does not have access to approve connections
+     * to the remote resource.
+     */
+    @JsonProperty(value = "properties.manualPrivateLinkServiceConnections")
+    private List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections;
+
+    /**
+     * An array of custom dns configurations.
+     */
+    @JsonProperty(value = "properties.customDnsConfigs")
+    private List<CustomDnsConfigPropertiesFormat> customDnsConfigs;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the ID of the subnet from which the private IP will be allocated.
+     *
+     * @return the subnet value
+     */
+    public SubnetInner subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the ID of the subnet from which the private IP will be allocated.
+     *
+     * @param subnet the subnet value to set
+     * @return the PrivateEndpointInner object itself.
+     */
+    public PrivateEndpointInner withSubnet(SubnetInner subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get an array of references to the network interfaces created for this private endpoint.
+     *
+     * @return the networkInterfaces value
+     */
+    public List<NetworkInterfaceInner> networkInterfaces() {
+        return this.networkInterfaces;
+    }
+
+    /**
+     * Get the provisioning state of the private endpoint resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a grouping of information about the connection to the remote resource.
+     *
+     * @return the privateLinkServiceConnections value
+     */
+    public List<PrivateLinkServiceConnection> privateLinkServiceConnections() {
+        return this.privateLinkServiceConnections;
+    }
+
+    /**
+     * Set a grouping of information about the connection to the remote resource.
+     *
+     * @param privateLinkServiceConnections the privateLinkServiceConnections value to set
+     * @return the PrivateEndpointInner object itself.
+     */
+    public PrivateEndpointInner withPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> privateLinkServiceConnections) {
+        this.privateLinkServiceConnections = privateLinkServiceConnections;
+        return this;
+    }
+
+    /**
+     * Get a grouping of information about the connection to the remote resource. Used when the network admin does not have access to approve connections to the remote resource.
+     *
+     * @return the manualPrivateLinkServiceConnections value
+     */
+    public List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections() {
+        return this.manualPrivateLinkServiceConnections;
+    }
+
+    /**
+     * Set a grouping of information about the connection to the remote resource. Used when the network admin does not have access to approve connections to the remote resource.
+     *
+     * @param manualPrivateLinkServiceConnections the manualPrivateLinkServiceConnections value to set
+     * @return the PrivateEndpointInner object itself.
+     */
+    public PrivateEndpointInner withManualPrivateLinkServiceConnections(List<PrivateLinkServiceConnection> manualPrivateLinkServiceConnections) {
+        this.manualPrivateLinkServiceConnections = manualPrivateLinkServiceConnections;
+        return this;
+    }
+
+    /**
+     * Get an array of custom dns configurations.
+     *
+     * @return the customDnsConfigs value
+     */
+    public List<CustomDnsConfigPropertiesFormat> customDnsConfigs() {
+        return this.customDnsConfigs;
+    }
+
+    /**
+     * Set an array of custom dns configurations.
+     *
+     * @param customDnsConfigs the customDnsConfigs value to set
+     * @return the PrivateEndpointInner object itself.
+     */
+    public PrivateEndpointInner withCustomDnsConfigs(List<CustomDnsConfigPropertiesFormat> customDnsConfigs) {
+        this.customDnsConfigs = customDnsConfigs;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the PrivateEndpointInner object itself.
+     */
+    public PrivateEndpointInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsImpl.java
new file mode 100644
index 000000000000..78eda392cc87
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoints;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+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;
+
+class PrivateEndpointsImpl extends GroupableResourcesCoreImpl<PrivateEndpoint, PrivateEndpointImpl, PrivateEndpointInner, PrivateEndpointsInner, NetworkManager>  implements PrivateEndpoints {
+    protected PrivateEndpointsImpl(NetworkManager manager) {
+        super(manager.inner().privateEndpoints(), manager);
+    }
+
+    @Override
+    protected Observable<PrivateEndpointInner> getInnerAsync(String resourceGroupName, String name) {
+        PrivateEndpointsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        PrivateEndpointsInner 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<PrivateEndpoint> listByResourceGroup(String resourceGroupName) {
+        PrivateEndpointsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<PrivateEndpoint> listByResourceGroupAsync(String resourceGroupName) {
+        PrivateEndpointsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<PrivateEndpointInner>, Iterable<PrivateEndpointInner>>() {
+            @Override
+            public Iterable<PrivateEndpointInner> call(Page<PrivateEndpointInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateEndpointInner, PrivateEndpoint>() {
+            @Override
+            public PrivateEndpoint call(PrivateEndpointInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PrivateEndpoint> list() {
+        PrivateEndpointsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<PrivateEndpoint> listAsync() {
+        PrivateEndpointsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PrivateEndpointInner>, Iterable<PrivateEndpointInner>>() {
+            @Override
+            public Iterable<PrivateEndpointInner> call(Page<PrivateEndpointInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateEndpointInner, PrivateEndpoint>() {
+            @Override
+            public PrivateEndpoint call(PrivateEndpointInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PrivateEndpointImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected PrivateEndpointImpl wrapModel(PrivateEndpointInner inner) {
+        return  new PrivateEndpointImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected PrivateEndpointImpl wrapModel(String name) {
+        return new PrivateEndpointImpl(name, new PrivateEndpointInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsInner.java
new file mode 100644
index 000000000000..d6022f3e37d4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateEndpointsInner.java
@@ -0,0 +1,1030 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.ErrorException;
+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 PrivateEndpoints.
+ */
+public class PrivateEndpointsInner implements InnerSupportsGet<PrivateEndpointInner>, InnerSupportsDelete<Void>, InnerSupportsListing<PrivateEndpointInner> {
+    /** The Retrofit service to perform REST calls. */
+    private PrivateEndpointsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PrivateEndpointsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PrivateEndpointsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PrivateEndpointsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PrivateEndpoints to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PrivateEndpointsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoints delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @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.network.v2020_04_01.PrivateEndpoints beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @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.network.v2020_04_01.PrivateEndpoints getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PrivateEndpoints createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("subscriptionId") String subscriptionId, @Body PrivateEndpointInner 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.network.v2020_04_01.PrivateEndpoints beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("privateEndpointName") String privateEndpointName, @Path("subscriptionId") String subscriptionId, @Body PrivateEndpointInner 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.network.v2020_04_01.PrivateEndpoints listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints")
+        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.network.v2020_04_01.PrivateEndpoints list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/privateEndpoints")
+        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.network.v2020_04_01.PrivateEndpoints 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.network.v2020_04_01.PrivateEndpoints listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 privateEndpointName) {
+        deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @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 privateEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String privateEndpointName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, privateEndpointName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String privateEndpointName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, privateEndpointName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 privateEndpointName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @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 privateEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String privateEndpointName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, privateEndpointName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String privateEndpointName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, privateEndpointName, this.client.subscriptionId(), 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointInner object if successful.
+     */
+    public PrivateEndpointInner getByResourceGroup(String resourceGroupName, String privateEndpointName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @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<PrivateEndpointInner> getByResourceGroupAsync(String resourceGroupName, String privateEndpointName, final ServiceCallback<PrivateEndpointInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<PrivateEndpointInner> getByResourceGroupAsync(String resourceGroupName, String privateEndpointName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName).map(new Func1<ServiceResponse<PrivateEndpointInner>, PrivateEndpointInner>() {
+            @Override
+            public PrivateEndpointInner call(ServiceResponse<PrivateEndpointInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String privateEndpointName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, privateEndpointName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointInner object if successful.
+     */
+    public PrivateEndpointInner getByResourceGroup(String resourceGroupName, String privateEndpointName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param expand Expands referenced resources.
+     * @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<PrivateEndpointInner> getByResourceGroupAsync(String resourceGroupName, String privateEndpointName, String expand, final ServiceCallback<PrivateEndpointInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<PrivateEndpointInner> getByResourceGroupAsync(String resourceGroupName, String privateEndpointName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, privateEndpointName, expand).map(new Func1<ServiceResponse<PrivateEndpointInner>, PrivateEndpointInner>() {
+            @Override
+            public PrivateEndpointInner call(ServiceResponse<PrivateEndpointInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified private endpoint by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, privateEndpointName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateEndpointInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateEndpointInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateEndpointInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointInner object if successful.
+     */
+    public PrivateEndpointInner createOrUpdate(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @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<PrivateEndpointInner> createOrUpdateAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters, final ServiceCallback<PrivateEndpointInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PrivateEndpointInner> createOrUpdateAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters).map(new Func1<ServiceResponse<PrivateEndpointInner>, PrivateEndpointInner>() {
+            @Override
+            public PrivateEndpointInner call(ServiceResponse<PrivateEndpointInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PrivateEndpointInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, privateEndpointName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PrivateEndpointInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointInner object if successful.
+     */
+    public PrivateEndpointInner beginCreateOrUpdate(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @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<PrivateEndpointInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters, final ServiceCallback<PrivateEndpointInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<PrivateEndpointInner> beginCreateOrUpdateAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, privateEndpointName, parameters).map(new Func1<ServiceResponse<PrivateEndpointInner>, PrivateEndpointInner>() {
+            @Override
+            public PrivateEndpointInner call(ServiceResponse<PrivateEndpointInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an private endpoint in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param privateEndpointName The name of the private endpoint.
+     * @param parameters Parameters supplied to the create or update private endpoint operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String privateEndpointName, PrivateEndpointInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (privateEndpointName == null) {
+            throw new IllegalArgumentException("Parameter privateEndpointName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, privateEndpointName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateEndpointInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateEndpointInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateEndpointInner>() { }.getType())
+                .register(201, new TypeToken<PrivateEndpointInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<PrivateEndpointInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<PrivateEndpointInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<PrivateEndpointInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<PrivateEndpointInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Page<PrivateEndpointInner>>() {
+                @Override
+                public Page<PrivateEndpointInner> call(ServiceResponse<Page<PrivateEndpointInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(ServiceResponse<Page<PrivateEndpointInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+    ServiceResponse<PageImpl<PrivateEndpointInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointInner> list() {
+        ServiceResponse<Page<PrivateEndpointInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PrivateEndpointInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private endpoints in a 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<PrivateEndpointInner>> listAsync(final ListOperationCallback<PrivateEndpointInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Page<PrivateEndpointInner>>() {
+                @Override
+                public Page<PrivateEndpointInner> call(ServiceResponse<Page<PrivateEndpointInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(ServiceResponse<Page<PrivateEndpointInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateEndpointInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateEndpointInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private endpoints in 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<PrivateEndpointInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateEndpointInner>> serviceFuture, final ListOperationCallback<PrivateEndpointInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private endpoints in 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;PrivateEndpointInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Page<PrivateEndpointInner>>() {
+                @Override
+                public Page<PrivateEndpointInner> call(ServiceResponse<Page<PrivateEndpointInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in 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;PrivateEndpointInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(ServiceResponse<Page<PrivateEndpointInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a resource group.
+     *
+    ServiceResponse<PageImpl<PrivateEndpointInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> 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<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateEndpointInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateEndpointInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @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<PrivateEndpointInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateEndpointInner>> serviceFuture, final ListOperationCallback<PrivateEndpointInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @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;PrivateEndpointInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Page<PrivateEndpointInner>>() {
+                @Override
+                public Page<PrivateEndpointInner> call(ServiceResponse<Page<PrivateEndpointInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+     * @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;PrivateEndpointInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointInner>>, Observable<ServiceResponse<Page<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(ServiceResponse<Page<PrivateEndpointInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private endpoints in a subscription.
+     *
+    ServiceResponse<PageImpl<PrivateEndpointInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointInner>>> 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<PrivateEndpointInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceImpl.java
new file mode 100644
index 000000000000..69fea819c8e8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceImpl.java
@@ -0,0 +1,164 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkService;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceIpConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServicePropertiesVisibility;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServicePropertiesAutoApproval;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterface;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpointConnection;
+
+class PrivateLinkServiceImpl extends GroupableResourceCoreImpl<PrivateLinkService, PrivateLinkServiceInner, PrivateLinkServiceImpl, NetworkManager> implements PrivateLinkService, PrivateLinkService.Definition, PrivateLinkService.Update {
+    PrivateLinkServiceImpl(String name, PrivateLinkServiceInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<PrivateLinkService> createResourceAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PrivateLinkService> updateResourceAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PrivateLinkServiceInner> getInnerAsync() {
+        PrivateLinkServicesInner client = this.manager().inner().privateLinkServices();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String alias() {
+        return this.inner().alias();
+    }
+
+    @Override
+    public PrivateLinkServicePropertiesAutoApproval autoApproval() {
+        return this.inner().autoApproval();
+    }
+
+    @Override
+    public Boolean enableProxyProtocol() {
+        return this.inner().enableProxyProtocol();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<String> fqdns() {
+        return this.inner().fqdns();
+    }
+
+    @Override
+    public List<PrivateLinkServiceIpConfiguration> ipConfigurations() {
+        return this.inner().ipConfigurations();
+    }
+
+    @Override
+    public List<FrontendIPConfiguration> loadBalancerFrontendIpConfigurations() {
+        List<FrontendIPConfiguration> lst = new ArrayList<FrontendIPConfiguration>();
+        if (this.inner().loadBalancerFrontendIpConfigurations() != null) {
+            for (FrontendIPConfigurationInner inner : this.inner().loadBalancerFrontendIpConfigurations()) {
+                lst.add( new FrontendIPConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<NetworkInterface> networkInterfaces() {
+        List<NetworkInterface> lst = new ArrayList<NetworkInterface>();
+        if (this.inner().networkInterfaces() != null) {
+            for (NetworkInterfaceInner inner : this.inner().networkInterfaces()) {
+                lst.add( new NetworkInterfaceImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<PrivateEndpointConnection> privateEndpointConnections() {
+        List<PrivateEndpointConnection> lst = new ArrayList<PrivateEndpointConnection>();
+        if (this.inner().privateEndpointConnections() != null) {
+            for (PrivateEndpointConnectionInner inner : this.inner().privateEndpointConnections()) {
+                lst.add( new PrivateEndpointConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PrivateLinkServicePropertiesVisibility visibility() {
+        return this.inner().visibility();
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withAutoApproval(PrivateLinkServicePropertiesAutoApproval autoApproval) {
+        this.inner().withAutoApproval(autoApproval);
+        return this;
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withEnableProxyProtocol(Boolean enableProxyProtocol) {
+        this.inner().withEnableProxyProtocol(enableProxyProtocol);
+        return this;
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withFqdns(List<String> fqdns) {
+        this.inner().withFqdns(fqdns);
+        return this;
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withIpConfigurations(List<PrivateLinkServiceIpConfiguration> ipConfigurations) {
+        this.inner().withIpConfigurations(ipConfigurations);
+        return this;
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withLoadBalancerFrontendIpConfigurations(List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations) {
+        this.inner().withLoadBalancerFrontendIpConfigurations(loadBalancerFrontendIpConfigurations);
+        return this;
+    }
+
+    @Override
+    public PrivateLinkServiceImpl withVisibility(PrivateLinkServicePropertiesVisibility visibility) {
+        this.inner().withVisibility(visibility);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceInner.java
new file mode 100644
index 000000000000..1b50d98367c6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceInner.java
@@ -0,0 +1,286 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceIpConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServicePropertiesVisibility;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServicePropertiesAutoApproval;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Private link service resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class PrivateLinkServiceInner extends Resource {
+    /**
+     * An array of references to the load balancer IP configurations.
+     */
+    @JsonProperty(value = "properties.loadBalancerFrontendIpConfigurations")
+    private List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations;
+
+    /**
+     * An array of private link service IP configurations.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<PrivateLinkServiceIpConfiguration> ipConfigurations;
+
+    /**
+     * An array of references to the network interfaces created for this
+     * private link service.
+     */
+    @JsonProperty(value = "properties.networkInterfaces", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceInner> networkInterfaces;
+
+    /**
+     * The provisioning state of the private link service resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * An array of list about connections to the private endpoint.
+     */
+    @JsonProperty(value = "properties.privateEndpointConnections", access = JsonProperty.Access.WRITE_ONLY)
+    private List<PrivateEndpointConnectionInner> privateEndpointConnections;
+
+    /**
+     * The visibility list of the private link service.
+     */
+    @JsonProperty(value = "properties.visibility")
+    private PrivateLinkServicePropertiesVisibility visibility;
+
+    /**
+     * The auto-approval list of the private link service.
+     */
+    @JsonProperty(value = "properties.autoApproval")
+    private PrivateLinkServicePropertiesAutoApproval autoApproval;
+
+    /**
+     * The list of Fqdn.
+     */
+    @JsonProperty(value = "properties.fqdns")
+    private List<String> fqdns;
+
+    /**
+     * The alias of the private link service.
+     */
+    @JsonProperty(value = "properties.alias", access = JsonProperty.Access.WRITE_ONLY)
+    private String alias;
+
+    /**
+     * Whether the private link service is enabled for proxy protocol or not.
+     */
+    @JsonProperty(value = "properties.enableProxyProtocol")
+    private Boolean enableProxyProtocol;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get an array of references to the load balancer IP configurations.
+     *
+     * @return the loadBalancerFrontendIpConfigurations value
+     */
+    public List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations() {
+        return this.loadBalancerFrontendIpConfigurations;
+    }
+
+    /**
+     * Set an array of references to the load balancer IP configurations.
+     *
+     * @param loadBalancerFrontendIpConfigurations the loadBalancerFrontendIpConfigurations value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withLoadBalancerFrontendIpConfigurations(List<FrontendIPConfigurationInner> loadBalancerFrontendIpConfigurations) {
+        this.loadBalancerFrontendIpConfigurations = loadBalancerFrontendIpConfigurations;
+        return this;
+    }
+
+    /**
+     * Get an array of private link service IP configurations.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<PrivateLinkServiceIpConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set an array of private link service IP configurations.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withIpConfigurations(List<PrivateLinkServiceIpConfiguration> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get an array of references to the network interfaces created for this private link service.
+     *
+     * @return the networkInterfaces value
+     */
+    public List<NetworkInterfaceInner> networkInterfaces() {
+        return this.networkInterfaces;
+    }
+
+    /**
+     * Get the provisioning state of the private link service resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get an array of list about connections to the private endpoint.
+     *
+     * @return the privateEndpointConnections value
+     */
+    public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
+        return this.privateEndpointConnections;
+    }
+
+    /**
+     * Get the visibility list of the private link service.
+     *
+     * @return the visibility value
+     */
+    public PrivateLinkServicePropertiesVisibility visibility() {
+        return this.visibility;
+    }
+
+    /**
+     * Set the visibility list of the private link service.
+     *
+     * @param visibility the visibility value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withVisibility(PrivateLinkServicePropertiesVisibility visibility) {
+        this.visibility = visibility;
+        return this;
+    }
+
+    /**
+     * Get the auto-approval list of the private link service.
+     *
+     * @return the autoApproval value
+     */
+    public PrivateLinkServicePropertiesAutoApproval autoApproval() {
+        return this.autoApproval;
+    }
+
+    /**
+     * Set the auto-approval list of the private link service.
+     *
+     * @param autoApproval the autoApproval value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withAutoApproval(PrivateLinkServicePropertiesAutoApproval autoApproval) {
+        this.autoApproval = autoApproval;
+        return this;
+    }
+
+    /**
+     * Get the list of Fqdn.
+     *
+     * @return the fqdns value
+     */
+    public List<String> fqdns() {
+        return this.fqdns;
+    }
+
+    /**
+     * Set the list of Fqdn.
+     *
+     * @param fqdns the fqdns value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withFqdns(List<String> fqdns) {
+        this.fqdns = fqdns;
+        return this;
+    }
+
+    /**
+     * Get the alias of the private link service.
+     *
+     * @return the alias value
+     */
+    public String alias() {
+        return this.alias;
+    }
+
+    /**
+     * Get whether the private link service is enabled for proxy protocol or not.
+     *
+     * @return the enableProxyProtocol value
+     */
+    public Boolean enableProxyProtocol() {
+        return this.enableProxyProtocol;
+    }
+
+    /**
+     * Set whether the private link service is enabled for proxy protocol or not.
+     *
+     * @param enableProxyProtocol the enableProxyProtocol value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withEnableProxyProtocol(Boolean enableProxyProtocol) {
+        this.enableProxyProtocol = enableProxyProtocol;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the PrivateLinkServiceInner object itself.
+     */
+    public PrivateLinkServiceInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityImpl.java
new file mode 100644
index 000000000000..a9000684fc87
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceVisibility;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class PrivateLinkServiceVisibilityImpl extends WrapperImpl<PrivateLinkServiceVisibilityInner> implements PrivateLinkServiceVisibility {
+    private final NetworkManager manager;
+    PrivateLinkServiceVisibilityImpl(PrivateLinkServiceVisibilityInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Boolean visible() {
+        return this.inner().visible();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityInner.java
new file mode 100644
index 000000000000..4e31499bd928
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServiceVisibilityInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for the CheckPrivateLinkServiceVisibility API service call.
+ */
+public class PrivateLinkServiceVisibilityInner {
+    /**
+     * Private Link Service Visibility (True/False).
+     */
+    @JsonProperty(value = "visible")
+    private Boolean visible;
+
+    /**
+     * Get private Link Service Visibility (True/False).
+     *
+     * @return the visible value
+     */
+    public Boolean visible() {
+        return this.visible;
+    }
+
+    /**
+     * Set private Link Service Visibility (True/False).
+     *
+     * @param visible the visible value to set
+     * @return the PrivateLinkServiceVisibilityInner object itself.
+     */
+    public PrivateLinkServiceVisibilityInner withVisible(Boolean visible) {
+        this.visible = visible;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesImpl.java
new file mode 100644
index 000000000000..fef6e47179cd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesImpl.java
@@ -0,0 +1,257 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkService;
+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.network.v2020_04_01.PrivateEndpointConnection;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServiceVisibility;
+import com.microsoft.azure.management.network.v2020_04_01.AutoApprovedPrivateLinkService;
+
+class PrivateLinkServicesImpl extends GroupableResourcesCoreImpl<PrivateLinkService, PrivateLinkServiceImpl, PrivateLinkServiceInner, PrivateLinkServicesInner, NetworkManager>  implements PrivateLinkServices {
+    protected PrivateLinkServicesImpl(NetworkManager manager) {
+        super(manager.inner().privateLinkServices(), manager);
+    }
+
+    @Override
+    protected Observable<PrivateLinkServiceInner> getInnerAsync(String resourceGroupName, String name) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        PrivateLinkServicesInner 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<PrivateLinkService> listByResourceGroup(String resourceGroupName) {
+        PrivateLinkServicesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<PrivateLinkService> listByResourceGroupAsync(String resourceGroupName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<PrivateLinkServiceInner>, Iterable<PrivateLinkServiceInner>>() {
+            @Override
+            public Iterable<PrivateLinkServiceInner> call(Page<PrivateLinkServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateLinkServiceInner, PrivateLinkService>() {
+            @Override
+            public PrivateLinkService call(PrivateLinkServiceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PrivateLinkService> list() {
+        PrivateLinkServicesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<PrivateLinkService> listAsync() {
+        PrivateLinkServicesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PrivateLinkServiceInner>, Iterable<PrivateLinkServiceInner>>() {
+            @Override
+            public Iterable<PrivateLinkServiceInner> call(Page<PrivateLinkServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateLinkServiceInner, PrivateLinkService>() {
+            @Override
+            public PrivateLinkService call(PrivateLinkServiceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PrivateLinkServiceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected PrivateLinkServiceImpl wrapModel(PrivateLinkServiceInner inner) {
+        return  new PrivateLinkServiceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected PrivateLinkServiceImpl wrapModel(String name) {
+        return new PrivateLinkServiceImpl(name, new PrivateLinkServiceInner(), this.manager());
+    }
+
+    private PrivateEndpointConnectionImpl wrapPrivateEndpointConnectionModel(PrivateEndpointConnectionInner inner) {
+        return  new PrivateEndpointConnectionImpl(inner, manager());
+    }
+
+    private AutoApprovedPrivateLinkServiceImpl wrapAutoApprovedPrivateLinkServiceModel(AutoApprovedPrivateLinkServiceInner inner) {
+        return  new AutoApprovedPrivateLinkServiceImpl(inner, manager());
+    }
+
+    private Observable<PrivateEndpointConnectionInner> getPrivateEndpointConnectionInnerUsingPrivateLinkServicesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String serviceName = IdParsingUtils.getValueFromIdByName(id, "privateLinkServices");
+        String peConnectionName = IdParsingUtils.getValueFromIdByName(id, "privateEndpointConnections");
+        PrivateLinkServicesInner client = this.inner();
+        return client.getPrivateEndpointConnectionAsync(resourceGroupName, serviceName, peConnectionName);
+    }
+
+    @Override
+    public Observable<PrivateEndpointConnection> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.getPrivateEndpointConnectionAsync(resourceGroupName, serviceName, peConnectionName)
+        .flatMap(new Func1<PrivateEndpointConnectionInner, Observable<PrivateEndpointConnection>>() {
+            @Override
+            public Observable<PrivateEndpointConnection> call(PrivateEndpointConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((PrivateEndpointConnection)wrapPrivateEndpointConnectionModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Observable<PrivateEndpointConnection> listPrivateEndpointConnectionsAsync(final String resourceGroupName, final String serviceName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.listPrivateEndpointConnectionsAsync(resourceGroupName, serviceName)
+        .flatMapIterable(new Func1<Page<PrivateEndpointConnectionInner>, Iterable<PrivateEndpointConnectionInner>>() {
+            @Override
+            public Iterable<PrivateEndpointConnectionInner> call(Page<PrivateEndpointConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PrivateEndpointConnectionInner, PrivateEndpointConnection>() {
+            @Override
+            public PrivateEndpointConnection call(PrivateEndpointConnectionInner inner) {
+                return wrapPrivateEndpointConnectionModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.deletePrivateEndpointConnectionAsync(resourceGroupName, serviceName, peConnectionName).toCompletable();
+    }
+
+    @Override
+    public Observable<PrivateLinkServiceVisibility> checkPrivateLinkServiceVisibilityAsync(String location) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.checkPrivateLinkServiceVisibilityAsync(location)
+        .map(new Func1<PrivateLinkServiceVisibilityInner, PrivateLinkServiceVisibility>() {
+            @Override
+            public PrivateLinkServiceVisibility call(PrivateLinkServiceVisibilityInner inner) {
+                return new PrivateLinkServiceVisibilityImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PrivateLinkServiceVisibility> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.checkPrivateLinkServiceVisibilityByResourceGroupAsync(location, resourceGroupName)
+        .map(new Func1<PrivateLinkServiceVisibilityInner, PrivateLinkServiceVisibility>() {
+            @Override
+            public PrivateLinkServiceVisibility call(PrivateLinkServiceVisibilityInner inner) {
+                return new PrivateLinkServiceVisibilityImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AutoApprovedPrivateLinkService> listAutoApprovedPrivateLinkServicesAsync(final String location) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.listAutoApprovedPrivateLinkServicesAsync(location)
+        .flatMapIterable(new Func1<Page<AutoApprovedPrivateLinkServiceInner>, Iterable<AutoApprovedPrivateLinkServiceInner>>() {
+            @Override
+            public Iterable<AutoApprovedPrivateLinkServiceInner> call(Page<AutoApprovedPrivateLinkServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AutoApprovedPrivateLinkServiceInner, AutoApprovedPrivateLinkService>() {
+            @Override
+            public AutoApprovedPrivateLinkService call(AutoApprovedPrivateLinkServiceInner inner) {
+                return wrapAutoApprovedPrivateLinkServiceModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<AutoApprovedPrivateLinkService> listAutoApprovedPrivateLinkServicesByResourceGroupAsync(final String location, final String resourceGroupName) {
+        PrivateLinkServicesInner client = this.inner();
+        return client.listAutoApprovedPrivateLinkServicesByResourceGroupAsync(location, resourceGroupName)
+        .flatMapIterable(new Func1<Page<AutoApprovedPrivateLinkServiceInner>, Iterable<AutoApprovedPrivateLinkServiceInner>>() {
+            @Override
+            public Iterable<AutoApprovedPrivateLinkServiceInner> call(Page<AutoApprovedPrivateLinkServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AutoApprovedPrivateLinkServiceInner, AutoApprovedPrivateLinkService>() {
+            @Override
+            public AutoApprovedPrivateLinkService call(AutoApprovedPrivateLinkServiceInner inner) {
+                return new AutoApprovedPrivateLinkServiceImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
new file mode 100644
index 000000000000..941f0618361f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
@@ -0,0 +1,2539 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.CheckPrivateLinkServiceVisibilityRequest;
+import com.microsoft.azure.management.network.v2020_04_01.ErrorException;
+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 PrivateLinkServices.
+ */
+public class PrivateLinkServicesInner implements InnerSupportsGet<PrivateLinkServiceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<PrivateLinkServiceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private PrivateLinkServicesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PrivateLinkServicesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PrivateLinkServicesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PrivateLinkServicesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PrivateLinkServices to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PrivateLinkServicesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @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.network.v2020_04_01.PrivateLinkServices beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @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.network.v2020_04_01.PrivateLinkServices getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PrivateLinkServices createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("subscriptionId") String subscriptionId, @Body PrivateLinkServiceInner 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.network.v2020_04_01.PrivateLinkServices beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("subscriptionId") String subscriptionId, @Body PrivateLinkServiceInner 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.network.v2020_04_01.PrivateLinkServices listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices")
+        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.network.v2020_04_01.PrivateLinkServices list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/privateLinkServices")
+        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.network.v2020_04_01.PrivateLinkServices getPrivateEndpointConnection" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}/privateEndpointConnections/{peConnectionName}")
+        Observable<Response<ResponseBody>> getPrivateEndpointConnection(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("peConnectionName") String peConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PrivateLinkServices updatePrivateEndpointConnection" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}/privateEndpointConnections/{peConnectionName}")
+        Observable<Response<ResponseBody>> updatePrivateEndpointConnection(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("peConnectionName") String peConnectionName, @Path("subscriptionId") String subscriptionId, @Body PrivateEndpointConnectionInner 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.network.v2020_04_01.PrivateLinkServices deletePrivateEndpointConnection" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}/privateEndpointConnections/{peConnectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deletePrivateEndpointConnection(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("peConnectionName") String peConnectionName, @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.network.v2020_04_01.PrivateLinkServices beginDeletePrivateEndpointConnection" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}/privateEndpointConnections/{peConnectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDeletePrivateEndpointConnection(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @Path("peConnectionName") String peConnectionName, @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.network.v2020_04_01.PrivateLinkServices listPrivateEndpointConnections" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}/privateEndpointConnections")
+        Observable<Response<ResponseBody>> listPrivateEndpointConnections(@Path("resourceGroupName") String resourceGroupName, @Path("serviceName") String serviceName, @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.network.v2020_04_01.PrivateLinkServices checkPrivateLinkServiceVisibility" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
+        Observable<Response<ResponseBody>> checkPrivateLinkServiceVisibility(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices checkPrivateLinkServiceVisibilityByResourceGroup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
+        Observable<Response<ResponseBody>> checkPrivateLinkServiceVisibilityByResourceGroup(@Path("location") String location, @Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices listAutoApprovedPrivateLinkServices" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/autoApprovedPrivateLinkServices")
+        Observable<Response<ResponseBody>> listAutoApprovedPrivateLinkServices(@Path("location") String location, @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.network.v2020_04_01.PrivateLinkServices listAutoApprovedPrivateLinkServicesByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/autoApprovedPrivateLinkServices")
+        Observable<Response<ResponseBody>> listAutoApprovedPrivateLinkServicesByResourceGroup(@Path("location") String location, @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.network.v2020_04_01.PrivateLinkServices 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.network.v2020_04_01.PrivateLinkServices 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.network.v2020_04_01.PrivateLinkServices listPrivateEndpointConnectionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listPrivateEndpointConnectionsNext(@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.network.v2020_04_01.PrivateLinkServices listAutoApprovedPrivateLinkServicesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAutoApprovedPrivateLinkServicesNext(@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.network.v2020_04_01.PrivateLinkServices listAutoApprovedPrivateLinkServicesByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAutoApprovedPrivateLinkServicesByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 serviceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, serviceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @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 serviceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, serviceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String serviceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, serviceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, serviceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 serviceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, serviceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @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 serviceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, serviceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String serviceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, serviceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, serviceName, this.client.subscriptionId(), 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateLinkServiceInner object if successful.
+     */
+    public PrivateLinkServiceInner getByResourceGroup(String resourceGroupName, String serviceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @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<PrivateLinkServiceInner> getByResourceGroupAsync(String resourceGroupName, String serviceName, final ServiceCallback<PrivateLinkServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<PrivateLinkServiceInner> getByResourceGroupAsync(String resourceGroupName, String serviceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName).map(new Func1<ServiceResponse<PrivateLinkServiceInner>, PrivateLinkServiceInner>() {
+            @Override
+            public PrivateLinkServiceInner call(ServiceResponse<PrivateLinkServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, serviceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateLinkServiceInner object if successful.
+     */
+    public PrivateLinkServiceInner getByResourceGroup(String resourceGroupName, String serviceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param expand Expands referenced resources.
+     * @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<PrivateLinkServiceInner> getByResourceGroupAsync(String resourceGroupName, String serviceName, String expand, final ServiceCallback<PrivateLinkServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<PrivateLinkServiceInner> getByResourceGroupAsync(String resourceGroupName, String serviceName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceName, expand).map(new Func1<ServiceResponse<PrivateLinkServiceInner>, PrivateLinkServiceInner>() {
+            @Override
+            public PrivateLinkServiceInner call(ServiceResponse<PrivateLinkServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified private link service by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String serviceName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, serviceName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateLinkServiceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateLinkServiceInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateLinkServiceInner object if successful.
+     */
+    public PrivateLinkServiceInner createOrUpdate(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @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<PrivateLinkServiceInner> createOrUpdateAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters, final ServiceCallback<PrivateLinkServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PrivateLinkServiceInner> createOrUpdateAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters).map(new Func1<ServiceResponse<PrivateLinkServiceInner>, PrivateLinkServiceInner>() {
+            @Override
+            public PrivateLinkServiceInner call(ServiceResponse<PrivateLinkServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, serviceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PrivateLinkServiceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateLinkServiceInner object if successful.
+     */
+    public PrivateLinkServiceInner beginCreateOrUpdate(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @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<PrivateLinkServiceInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters, final ServiceCallback<PrivateLinkServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<PrivateLinkServiceInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceName, parameters).map(new Func1<ServiceResponse<PrivateLinkServiceInner>, PrivateLinkServiceInner>() {
+            @Override
+            public PrivateLinkServiceInner call(ServiceResponse<PrivateLinkServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an private link service in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param parameters Parameters supplied to the create or update private link service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceName, PrivateLinkServiceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, serviceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateLinkServiceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateLinkServiceInner>() { }.getType())
+                .register(201, new TypeToken<PrivateLinkServiceInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<PrivateLinkServiceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<PrivateLinkServiceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<PrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<PrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<PrivateLinkServiceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<PrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<PrivateLinkServiceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Page<PrivateLinkServiceInner>>() {
+                @Override
+                public Page<PrivateLinkServiceInner> call(ServiceResponse<Page<PrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(ServiceResponse<Page<PrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+    ServiceResponse<PageImpl<PrivateLinkServiceInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateLinkServiceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateLinkServiceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateLinkServiceInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateLinkServiceInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<PrivateLinkServiceInner> list() {
+        ServiceResponse<Page<PrivateLinkServiceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<PrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private link service in a 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<PrivateLinkServiceInner>> listAsync(final ListOperationCallback<PrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<PrivateLinkServiceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Page<PrivateLinkServiceInner>>() {
+                @Override
+                public Page<PrivateLinkServiceInner> call(ServiceResponse<Page<PrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(ServiceResponse<Page<PrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateLinkServiceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateLinkServiceInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateLinkServiceInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateLinkServiceInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointConnectionInner object if successful.
+     */
+    public PrivateEndpointConnectionInner getPrivateEndpointConnection(String resourceGroupName, String serviceName, String peConnectionName) {
+        return getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @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<PrivateEndpointConnectionInner> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, final ServiceCallback<PrivateEndpointConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName), serviceCallback);
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<PrivateEndpointConnectionInner> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        return getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).map(new Func1<ServiceResponse<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>() {
+            @Override
+            public PrivateEndpointConnectionInner call(ServiceResponse<PrivateEndpointConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointConnectionInner>> getPrivateEndpointConnectionWithServiceResponseAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (peConnectionName == null) {
+            throw new IllegalArgumentException("Parameter peConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getPrivateEndpointConnection(resourceGroupName, serviceName, peConnectionName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointConnectionInner> clientResponse = getPrivateEndpointConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointConnectionInner object if successful.
+     */
+    public PrivateEndpointConnectionInner getPrivateEndpointConnection(String resourceGroupName, String serviceName, String peConnectionName, String expand) {
+        return getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param expand Expands referenced resources.
+     * @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<PrivateEndpointConnectionInner> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, String expand, final ServiceCallback<PrivateEndpointConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, expand), serviceCallback);
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<PrivateEndpointConnectionInner> getPrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, String expand) {
+        return getPrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, expand).map(new Func1<ServiceResponse<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>() {
+            @Override
+            public PrivateEndpointConnectionInner call(ServiceResponse<PrivateEndpointConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specific private end point connection by specific private link service in the resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointConnectionInner>> getPrivateEndpointConnectionWithServiceResponseAsync(String resourceGroupName, String serviceName, String peConnectionName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (peConnectionName == null) {
+            throw new IllegalArgumentException("Parameter peConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getPrivateEndpointConnection(resourceGroupName, serviceName, peConnectionName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointConnectionInner> clientResponse = getPrivateEndpointConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateEndpointConnectionInner> getPrivateEndpointConnectionDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateEndpointConnectionInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateEndpointConnectionInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Approve or reject private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param parameters Parameters supplied to approve or reject the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PrivateEndpointConnectionInner object if successful.
+     */
+    public PrivateEndpointConnectionInner updatePrivateEndpointConnection(String resourceGroupName, String serviceName, String peConnectionName, PrivateEndpointConnectionInner parameters) {
+        return updatePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Approve or reject private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param parameters Parameters supplied to approve or reject the private end point connection.
+     * @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<PrivateEndpointConnectionInner> updatePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, PrivateEndpointConnectionInner parameters, final ServiceCallback<PrivateEndpointConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updatePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Approve or reject private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param parameters Parameters supplied to approve or reject the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<PrivateEndpointConnectionInner> updatePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, PrivateEndpointConnectionInner parameters) {
+        return updatePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName, parameters).map(new Func1<ServiceResponse<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>() {
+            @Override
+            public PrivateEndpointConnectionInner call(ServiceResponse<PrivateEndpointConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Approve or reject private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @param parameters Parameters supplied to approve or reject the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateEndpointConnectionInner object
+     */
+    public Observable<ServiceResponse<PrivateEndpointConnectionInner>> updatePrivateEndpointConnectionWithServiceResponseAsync(String resourceGroupName, String serviceName, String peConnectionName, PrivateEndpointConnectionInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (peConnectionName == null) {
+            throw new IllegalArgumentException("Parameter peConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.updatePrivateEndpointConnection(resourceGroupName, serviceName, peConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateEndpointConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateEndpointConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateEndpointConnectionInner> clientResponse = updatePrivateEndpointConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateEndpointConnectionInner> updatePrivateEndpointConnectionDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateEndpointConnectionInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateEndpointConnectionInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void deletePrivateEndpointConnection(String resourceGroupName, String serviceName, String peConnectionName) {
+        deletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @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> deletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName), serviceCallback);
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        return deletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deletePrivateEndpointConnectionWithServiceResponseAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (peConnectionName == null) {
+            throw new IllegalArgumentException("Parameter peConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.deletePrivateEndpointConnection(resourceGroupName, serviceName, peConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDeletePrivateEndpointConnection(String resourceGroupName, String serviceName, String peConnectionName) {
+        beginDeletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @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> beginDeletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName), serviceCallback);
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeletePrivateEndpointConnectionAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        return beginDeletePrivateEndpointConnectionWithServiceResponseAsync(resourceGroupName, serviceName, peConnectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete private end point connection for a private link service in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @param peConnectionName The name of the private end point connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeletePrivateEndpointConnectionWithServiceResponseAsync(String resourceGroupName, String serviceName, String peConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (peConnectionName == null) {
+            throw new IllegalArgumentException("Parameter peConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDeletePrivateEndpointConnection(resourceGroupName, serviceName, peConnectionName, this.client.subscriptionId(), 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 = beginDeletePrivateEndpointConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeletePrivateEndpointConnectionDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointConnectionInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointConnectionInner> listPrivateEndpointConnections(final String resourceGroupName, final String serviceName) {
+        ServiceResponse<Page<PrivateEndpointConnectionInner>> response = listPrivateEndpointConnectionsSinglePageAsync(resourceGroupName, serviceName).toBlocking().single();
+        return new PagedList<PrivateEndpointConnectionInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointConnectionInner> nextPage(String nextPageLink) {
+                return listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @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<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsAsync(final String resourceGroupName, final String serviceName, final ListOperationCallback<PrivateEndpointConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listPrivateEndpointConnectionsSinglePageAsync(resourceGroupName, serviceName),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(String nextPageLink) {
+                    return listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointConnectionInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsAsync(final String resourceGroupName, final String serviceName) {
+        return listPrivateEndpointConnectionsWithServiceResponseAsync(resourceGroupName, serviceName)
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointConnectionInner>>, Page<PrivateEndpointConnectionInner>>() {
+                @Override
+                public Page<PrivateEndpointConnectionInner> call(ServiceResponse<Page<PrivateEndpointConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PrivateEndpointConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> listPrivateEndpointConnectionsWithServiceResponseAsync(final String resourceGroupName, final String serviceName) {
+        return listPrivateEndpointConnectionsSinglePageAsync(resourceGroupName, serviceName)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointConnectionInner>>, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(ServiceResponse<Page<PrivateEndpointConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listPrivateEndpointConnectionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+    ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> * @param serviceName The name of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> listPrivateEndpointConnectionsSinglePageAsync(final String resourceGroupName, final String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listPrivateEndpointConnections(resourceGroupName, serviceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> result = listPrivateEndpointConnectionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointConnectionInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointConnectionInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain 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 PrivateLinkServiceVisibilityInner object if successful.
+     */
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibility(String location) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain 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<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location), serviceCallback);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+            @Override
+            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String privateLinkServiceAlias = null;
+        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
+        parameters.withPrivateLinkServiceAlias(null);
+        return service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @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 PrivateLinkServiceVisibilityInner object if successful.
+     */
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibility(String location, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @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<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias), serviceCallback);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+            @Override
+            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service.
+     *
+     * @param location The location of the domain name.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location, String privateLinkServiceAlias) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
+        parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
+        return service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceVisibilityInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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 PrivateLinkServiceVisibilityInner object if successful.
+     */
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName), serviceCallback);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+            @Override
+            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String privateLinkServiceAlias = null;
+        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
+        parameters.withPrivateLinkServiceAlias(null);
+        return service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @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 PrivateLinkServiceVisibilityInner object if successful.
+     */
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @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<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias), serviceCallback);
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+            @Override
+            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether the subscription is visible to private link service in the specified resource group.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @param privateLinkServiceAlias The alias of the private link service.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
+     */
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
+        parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
+        return service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceVisibilityInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain 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;AutoApprovedPrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivateLinkServices(final String location) {
+        ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response = listAutoApprovedPrivateLinkServicesSinglePageAsync(location).toBlocking().single();
+        return new PagedList<AutoApprovedPrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<AutoApprovedPrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain 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<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesAsync(final String location, final ListOperationCallback<AutoApprovedPrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAutoApprovedPrivateLinkServicesSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesAsync(final String location) {
+        return listAutoApprovedPrivateLinkServicesWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Page<AutoApprovedPrivateLinkServiceInner>>() {
+                @Override
+                public Page<AutoApprovedPrivateLinkServiceInner> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesWithServiceResponseAsync(final String location) {
+        return listAutoApprovedPrivateLinkServicesSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAutoApprovedPrivateLinkServicesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAutoApprovedPrivateLinkServices(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> result = listAutoApprovedPrivateLinkServicesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AutoApprovedPrivateLinkServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AutoApprovedPrivateLinkServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivateLinkServicesByResourceGroup(final String location, final String resourceGroupName) {
+        ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response = listAutoApprovedPrivateLinkServicesByResourceGroupSinglePageAsync(location, resourceGroupName).toBlocking().single();
+        return new PagedList<AutoApprovedPrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<AutoApprovedPrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @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<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupAsync(final String location, final String resourceGroupName, final ListOperationCallback<AutoApprovedPrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAutoApprovedPrivateLinkServicesByResourceGroupSinglePageAsync(location, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupAsync(final String location, final String resourceGroupName) {
+        return listAutoApprovedPrivateLinkServicesByResourceGroupWithServiceResponseAsync(location, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Page<AutoApprovedPrivateLinkServiceInner>>() {
+                @Override
+                public Page<AutoApprovedPrivateLinkServiceInner> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesByResourceGroupWithServiceResponseAsync(final String location, final String resourceGroupName) {
+        return listAutoApprovedPrivateLinkServicesByResourceGroupSinglePageAsync(location, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAutoApprovedPrivateLinkServicesByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> * @param location The location of the domain name.
+    ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesByResourceGroupSinglePageAsync(final String location, final String resourceGroupName) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listAutoApprovedPrivateLinkServicesByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> result = listAutoApprovedPrivateLinkServicesByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AutoApprovedPrivateLinkServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AutoApprovedPrivateLinkServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<PrivateLinkServiceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateLinkServiceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<PrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private link services in 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<PrivateLinkServiceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateLinkServiceInner>> serviceFuture, final ListOperationCallback<PrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private link services in 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;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<PrivateLinkServiceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Page<PrivateLinkServiceInner>>() {
+                @Override
+                public Page<PrivateLinkServiceInner> call(ServiceResponse<Page<PrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private link services in 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;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(ServiceResponse<Page<PrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private link services in a resource group.
+     *
+    ServiceResponse<PageImpl<PrivateLinkServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> 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<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateLinkServiceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateLinkServiceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateLinkServiceInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateLinkServiceInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<PrivateLinkServiceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateLinkServiceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<PrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @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<PrivateLinkServiceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateLinkServiceInner>> serviceFuture, final ListOperationCallback<PrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @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;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<PrivateLinkServiceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Page<PrivateLinkServiceInner>>() {
+                @Override
+                public Page<PrivateLinkServiceInner> call(ServiceResponse<Page<PrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+     * @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;PrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateLinkServiceInner>>, Observable<ServiceResponse<Page<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(ServiceResponse<Page<PrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private link service in a subscription.
+     *
+    ServiceResponse<PageImpl<PrivateLinkServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> 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<PrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateLinkServiceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateLinkServiceInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateLinkServiceInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateLinkServiceInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;PrivateEndpointConnectionInner&gt; object if successful.
+     */
+    public PagedList<PrivateEndpointConnectionInner> listPrivateEndpointConnectionsNext(final String nextPageLink) {
+        ServiceResponse<Page<PrivateEndpointConnectionInner>> response = listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PrivateEndpointConnectionInner>(response.body()) {
+            @Override
+            public Page<PrivateEndpointConnectionInner> nextPage(String nextPageLink) {
+                return listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @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<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsNextAsync(final String nextPageLink, final ServiceFuture<List<PrivateEndpointConnectionInner>> serviceFuture, final ListOperationCallback<PrivateEndpointConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(String nextPageLink) {
+                    return listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @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;PrivateEndpointConnectionInner&gt; object
+     */
+    public Observable<Page<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsNextAsync(final String nextPageLink) {
+        return listPrivateEndpointConnectionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PrivateEndpointConnectionInner>>, Page<PrivateEndpointConnectionInner>>() {
+                @Override
+                public Page<PrivateEndpointConnectionInner> call(ServiceResponse<Page<PrivateEndpointConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+     * @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;PrivateEndpointConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> listPrivateEndpointConnectionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listPrivateEndpointConnectionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PrivateEndpointConnectionInner>>, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(ServiceResponse<Page<PrivateEndpointConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listPrivateEndpointConnectionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all private end point connections for a specific private link service.
+     *
+    ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PrivateEndpointConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> listPrivateEndpointConnectionsNextSinglePageAsync(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.listPrivateEndpointConnectionsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PrivateEndpointConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> result = listPrivateEndpointConnectionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PrivateEndpointConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PrivateEndpointConnectionInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PrivateEndpointConnectionInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivateLinkServicesNext(final String nextPageLink) {
+        ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response = listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AutoApprovedPrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<AutoApprovedPrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesNextAsync(final String nextPageLink, final ServiceFuture<List<AutoApprovedPrivateLinkServiceInner>> serviceFuture, final ListOperationCallback<AutoApprovedPrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesNextAsync(final String nextPageLink) {
+        return listAutoApprovedPrivateLinkServicesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Page<AutoApprovedPrivateLinkServiceInner>>() {
+                @Override
+                public Page<AutoApprovedPrivateLinkServiceInner> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAutoApprovedPrivateLinkServicesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAutoApprovedPrivateLinkServicesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesNextSinglePageAsync(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.listAutoApprovedPrivateLinkServicesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> result = listAutoApprovedPrivateLinkServicesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AutoApprovedPrivateLinkServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AutoApprovedPrivateLinkServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object if successful.
+     */
+    public PagedList<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivateLinkServicesByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response = listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AutoApprovedPrivateLinkServiceInner>(response.body()) {
+            @Override
+            public Page<AutoApprovedPrivateLinkServiceInner> nextPage(String nextPageLink) {
+                return listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AutoApprovedPrivateLinkServiceInner>> serviceFuture, final ListOperationCallback<AutoApprovedPrivateLinkServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(String nextPageLink) {
+                    return listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<Page<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupNextAsync(final String nextPageLink) {
+        return listAutoApprovedPrivateLinkServicesByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Page<AutoApprovedPrivateLinkServiceInner>>() {
+                @Override
+                public Page<AutoApprovedPrivateLinkServiceInner> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+     * @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;AutoApprovedPrivateLinkServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAutoApprovedPrivateLinkServicesByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Returns all of the private link service ids that can be linked to a Private Endpoint with auto approved in this subscription in this region.
+     *
+    ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AutoApprovedPrivateLinkServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> listAutoApprovedPrivateLinkServicesByResourceGroupNextSinglePageAsync(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.listAutoApprovedPrivateLinkServicesByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> result = listAutoApprovedPrivateLinkServicesByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AutoApprovedPrivateLinkServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AutoApprovedPrivateLinkServiceInner>> listAutoApprovedPrivateLinkServicesByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AutoApprovedPrivateLinkServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AutoApprovedPrivateLinkServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeImpl.java
new file mode 100644
index 000000000000..5c12f70f77ca
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeImpl.java
@@ -0,0 +1,102 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Probe;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProbeProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ProbeImpl extends IndexableRefreshableWrapperImpl<Probe, ProbeInner> implements Probe {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String loadBalancerName;
+    private String probeName;
+
+    ProbeImpl(ProbeInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
+        this.probeName = IdParsingUtils.getValueFromIdByName(inner.id(), "probes");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<ProbeInner> getInnerAsync() {
+        LoadBalancerProbesInner client = this.manager().inner().loadBalancerProbes();
+        return client.getAsync(this.resourceGroupName, this.loadBalancerName, this.probeName);
+    }
+
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Integer intervalInSeconds() {
+        return this.inner().intervalInSeconds();
+    }
+
+    @Override
+    public List<SubResource> loadBalancingRules() {
+        return this.inner().loadBalancingRules();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Integer numberOfProbes() {
+        return this.inner().numberOfProbes();
+    }
+
+    @Override
+    public int port() {
+        return this.inner().port();
+    }
+
+    @Override
+    public ProbeProtocol protocol() {
+        return this.inner().protocol();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String requestPath() {
+        return this.inner().requestPath();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeInner.java
new file mode 100644
index 000000000000..3be8865b5085
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ProbeInner.java
@@ -0,0 +1,254 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProbeProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * A load balancer probe.
+ */
+@JsonFlatten
+public class ProbeInner extends SubResource {
+    /**
+     * The load balancer rules that use this probe.
+     */
+    @JsonProperty(value = "properties.loadBalancingRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> loadBalancingRules;
+
+    /**
+     * The protocol of the end point. If 'Tcp' is specified, a received ACK is
+     * required for the probe to be successful. If 'Http' or 'Https' is
+     * specified, a 200 OK response from the specifies URI is required for the
+     * probe to be successful. Possible values include: 'Http', 'Tcp', 'Https'.
+     */
+    @JsonProperty(value = "properties.protocol", required = true)
+    private ProbeProtocol protocol;
+
+    /**
+     * The port for communicating the probe. Possible values range from 1 to
+     * 65535, inclusive.
+     */
+    @JsonProperty(value = "properties.port", required = true)
+    private int port;
+
+    /**
+     * The interval, in seconds, for how frequently to probe the endpoint for
+     * health status. Typically, the interval is slightly less than half the
+     * allocated timeout period (in seconds) which allows two full probes
+     * before taking the instance out of rotation. The default value is 15, the
+     * minimum value is 5.
+     */
+    @JsonProperty(value = "properties.intervalInSeconds")
+    private Integer intervalInSeconds;
+
+    /**
+     * The number of probes where if no response, will result in stopping
+     * further traffic from being delivered to the endpoint. This values allows
+     * endpoints to be taken out of rotation faster or slower than the typical
+     * times used in Azure.
+     */
+    @JsonProperty(value = "properties.numberOfProbes")
+    private Integer numberOfProbes;
+
+    /**
+     * The URI used for requesting health status from the VM. Path is required
+     * if a protocol is set to http. Otherwise, it is not allowed. There is no
+     * default value.
+     */
+    @JsonProperty(value = "properties.requestPath")
+    private String requestPath;
+
+    /**
+     * The provisioning state of the probe resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within the set of probes used by
+     * the load balancer. This name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Type of the resource.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the load balancer rules that use this probe.
+     *
+     * @return the loadBalancingRules value
+     */
+    public List<SubResource> loadBalancingRules() {
+        return this.loadBalancingRules;
+    }
+
+    /**
+     * Get the protocol of the end point. If 'Tcp' is specified, a received ACK is required for the probe to be successful. If 'Http' or 'Https' is specified, a 200 OK response from the specifies URI is required for the probe to be successful. Possible values include: 'Http', 'Tcp', 'Https'.
+     *
+     * @return the protocol value
+     */
+    public ProbeProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol of the end point. If 'Tcp' is specified, a received ACK is required for the probe to be successful. If 'Http' or 'Https' is specified, a 200 OK response from the specifies URI is required for the probe to be successful. Possible values include: 'Http', 'Tcp', 'Https'.
+     *
+     * @param protocol the protocol value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withProtocol(ProbeProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the port for communicating the probe. Possible values range from 1 to 65535, inclusive.
+     *
+     * @return the port value
+     */
+    public int port() {
+        return this.port;
+    }
+
+    /**
+     * Set the port for communicating the probe. Possible values range from 1 to 65535, inclusive.
+     *
+     * @param port the port value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withPort(int port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Get the interval, in seconds, for how frequently to probe the endpoint for health status. Typically, the interval is slightly less than half the allocated timeout period (in seconds) which allows two full probes before taking the instance out of rotation. The default value is 15, the minimum value is 5.
+     *
+     * @return the intervalInSeconds value
+     */
+    public Integer intervalInSeconds() {
+        return this.intervalInSeconds;
+    }
+
+    /**
+     * Set the interval, in seconds, for how frequently to probe the endpoint for health status. Typically, the interval is slightly less than half the allocated timeout period (in seconds) which allows two full probes before taking the instance out of rotation. The default value is 15, the minimum value is 5.
+     *
+     * @param intervalInSeconds the intervalInSeconds value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withIntervalInSeconds(Integer intervalInSeconds) {
+        this.intervalInSeconds = intervalInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the number of probes where if no response, will result in stopping further traffic from being delivered to the endpoint. This values allows endpoints to be taken out of rotation faster or slower than the typical times used in Azure.
+     *
+     * @return the numberOfProbes value
+     */
+    public Integer numberOfProbes() {
+        return this.numberOfProbes;
+    }
+
+    /**
+     * Set the number of probes where if no response, will result in stopping further traffic from being delivered to the endpoint. This values allows endpoints to be taken out of rotation faster or slower than the typical times used in Azure.
+     *
+     * @param numberOfProbes the numberOfProbes value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withNumberOfProbes(Integer numberOfProbes) {
+        this.numberOfProbes = numberOfProbes;
+        return this;
+    }
+
+    /**
+     * Get the URI used for requesting health status from the VM. Path is required if a protocol is set to http. Otherwise, it is not allowed. There is no default value.
+     *
+     * @return the requestPath value
+     */
+    public String requestPath() {
+        return this.requestPath;
+    }
+
+    /**
+     * Set the URI used for requesting health status from the VM. Path is required if a protocol is set to http. Otherwise, it is not allowed. There is no default value.
+     *
+     * @param requestPath the requestPath value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withRequestPath(String requestPath) {
+        this.requestPath = requestPath;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the probe resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within the set of probes used by the load balancer. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within the set of probes used by the load balancer. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ProbeInner object itself.
+     */
+    public ProbeInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get type of the resource.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressImpl.java
new file mode 100644
index 000000000000..e5937ef85dc4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressImpl.java
@@ -0,0 +1,186 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddress;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddressSku;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddressDnsSettings;
+import com.microsoft.azure.management.network.v2020_04_01.DdosSettings;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpTag;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class PublicIPAddressImpl extends GroupableResourceCoreImpl<PublicIPAddress, PublicIPAddressInner, PublicIPAddressImpl, NetworkManager> implements PublicIPAddress, PublicIPAddress.Definition, PublicIPAddress.Update {
+    PublicIPAddressImpl(String name, PublicIPAddressInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<PublicIPAddress> createResourceAsync() {
+        PublicIPAddressesInner client = this.manager().inner().publicIPAddresses();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PublicIPAddress> updateResourceAsync() {
+        PublicIPAddressesInner client = this.manager().inner().publicIPAddresses();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PublicIPAddressInner> getInnerAsync() {
+        PublicIPAddressesInner client = this.manager().inner().publicIPAddresses();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DdosSettings ddosSettings() {
+        return this.inner().ddosSettings();
+    }
+
+    @Override
+    public PublicIPAddressDnsSettings dnsSettings() {
+        return this.inner().dnsSettings();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public Integer idleTimeoutInMinutes() {
+        return this.inner().idleTimeoutInMinutes();
+    }
+
+    @Override
+    public String ipAddress() {
+        return this.inner().ipAddress();
+    }
+
+    @Override
+    public IPConfiguration ipConfiguration() {
+        return this.inner().ipConfiguration();
+    }
+
+    @Override
+    public List<IpTag> ipTags() {
+        return this.inner().ipTags();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public IPVersion publicIPAddressVersion() {
+        return this.inner().publicIPAddressVersion();
+    }
+
+    @Override
+    public IPAllocationMethod publicIPAllocationMethod() {
+        return this.inner().publicIPAllocationMethod();
+    }
+
+    @Override
+    public SubResource publicIPPrefix() {
+        return this.inner().publicIPPrefix();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public PublicIPAddressSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+    @Override
+    public PublicIPAddressImpl withDdosSettings(DdosSettings ddosSettings) {
+        this.inner().withDdosSettings(ddosSettings);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withDnsSettings(PublicIPAddressDnsSettings dnsSettings) {
+        this.inner().withDnsSettings(dnsSettings);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.inner().withIdleTimeoutInMinutes(idleTimeoutInMinutes);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withIpAddress(String ipAddress) {
+        this.inner().withIpAddress(ipAddress);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withIpTags(List<IpTag> ipTags) {
+        this.inner().withIpTags(ipTags);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withPublicIPAddressVersion(IPVersion publicIPAddressVersion) {
+        this.inner().withPublicIPAddressVersion(publicIPAddressVersion);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod) {
+        this.inner().withPublicIPAllocationMethod(publicIPAllocationMethod);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withPublicIPPrefix(SubResource publicIPPrefix) {
+        this.inner().withPublicIPPrefix(publicIPPrefix);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withSku(PublicIPAddressSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public PublicIPAddressImpl withZones(List<String> zones) {
+        this.inner().withZones(zones);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressInner.java
new file mode 100644
index 000000000000..dd483ea0c09f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressInner.java
@@ -0,0 +1,381 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddressSku;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddressDnsSettings;
+import com.microsoft.azure.management.network.v2020_04_01.DdosSettings;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpTag;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Public IP address resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class PublicIPAddressInner extends Resource {
+    /**
+     * The public IP address SKU.
+     */
+    @JsonProperty(value = "sku")
+    private PublicIPAddressSku sku;
+
+    /**
+     * The public IP address allocation method. Possible values include:
+     * 'Static', 'Dynamic'.
+     */
+    @JsonProperty(value = "properties.publicIPAllocationMethod")
+    private IPAllocationMethod publicIPAllocationMethod;
+
+    /**
+     * The public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.publicIPAddressVersion")
+    private IPVersion publicIPAddressVersion;
+
+    /**
+     * The IP configuration associated with the public IP address.
+     */
+    @JsonProperty(value = "properties.ipConfiguration", access = JsonProperty.Access.WRITE_ONLY)
+    private IPConfiguration ipConfiguration;
+
+    /**
+     * The FQDN of the DNS record associated with the public IP address.
+     */
+    @JsonProperty(value = "properties.dnsSettings")
+    private PublicIPAddressDnsSettings dnsSettings;
+
+    /**
+     * The DDoS protection custom policy associated with the public IP address.
+     */
+    @JsonProperty(value = "properties.ddosSettings")
+    private DdosSettings ddosSettings;
+
+    /**
+     * The list of tags associated with the public IP address.
+     */
+    @JsonProperty(value = "properties.ipTags")
+    private List<IpTag> ipTags;
+
+    /**
+     * The IP address associated with the public IP address resource.
+     */
+    @JsonProperty(value = "properties.ipAddress")
+    private String ipAddress;
+
+    /**
+     * The Public IP Prefix this Public IP Address should be allocated from.
+     */
+    @JsonProperty(value = "properties.publicIPPrefix")
+    private SubResource publicIPPrefix;
+
+    /**
+     * The idle timeout of the public IP address.
+     */
+    @JsonProperty(value = "properties.idleTimeoutInMinutes")
+    private Integer idleTimeoutInMinutes;
+
+    /**
+     * The resource GUID property of the public IP address resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the public IP address resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * A list of availability zones denoting the IP allocated for the resource
+     * needs to come from.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the public IP address SKU.
+     *
+     * @return the sku value
+     */
+    public PublicIPAddressSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the public IP address SKU.
+     *
+     * @param sku the sku value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withSku(PublicIPAddressSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the public IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @return the publicIPAllocationMethod value
+     */
+    public IPAllocationMethod publicIPAllocationMethod() {
+        return this.publicIPAllocationMethod;
+    }
+
+    /**
+     * Set the public IP address allocation method. Possible values include: 'Static', 'Dynamic'.
+     *
+     * @param publicIPAllocationMethod the publicIPAllocationMethod value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod) {
+        this.publicIPAllocationMethod = publicIPAllocationMethod;
+        return this;
+    }
+
+    /**
+     * Get the public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the publicIPAddressVersion value
+     */
+    public IPVersion publicIPAddressVersion() {
+        return this.publicIPAddressVersion;
+    }
+
+    /**
+     * Set the public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param publicIPAddressVersion the publicIPAddressVersion value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withPublicIPAddressVersion(IPVersion publicIPAddressVersion) {
+        this.publicIPAddressVersion = publicIPAddressVersion;
+        return this;
+    }
+
+    /**
+     * Get the IP configuration associated with the public IP address.
+     *
+     * @return the ipConfiguration value
+     */
+    public IPConfiguration ipConfiguration() {
+        return this.ipConfiguration;
+    }
+
+    /**
+     * Get the FQDN of the DNS record associated with the public IP address.
+     *
+     * @return the dnsSettings value
+     */
+    public PublicIPAddressDnsSettings dnsSettings() {
+        return this.dnsSettings;
+    }
+
+    /**
+     * Set the FQDN of the DNS record associated with the public IP address.
+     *
+     * @param dnsSettings the dnsSettings value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withDnsSettings(PublicIPAddressDnsSettings dnsSettings) {
+        this.dnsSettings = dnsSettings;
+        return this;
+    }
+
+    /**
+     * Get the DDoS protection custom policy associated with the public IP address.
+     *
+     * @return the ddosSettings value
+     */
+    public DdosSettings ddosSettings() {
+        return this.ddosSettings;
+    }
+
+    /**
+     * Set the DDoS protection custom policy associated with the public IP address.
+     *
+     * @param ddosSettings the ddosSettings value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withDdosSettings(DdosSettings ddosSettings) {
+        this.ddosSettings = ddosSettings;
+        return this;
+    }
+
+    /**
+     * Get the list of tags associated with the public IP address.
+     *
+     * @return the ipTags value
+     */
+    public List<IpTag> ipTags() {
+        return this.ipTags;
+    }
+
+    /**
+     * Set the list of tags associated with the public IP address.
+     *
+     * @param ipTags the ipTags value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withIpTags(List<IpTag> ipTags) {
+        this.ipTags = ipTags;
+        return this;
+    }
+
+    /**
+     * Get the IP address associated with the public IP address resource.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set the IP address associated with the public IP address resource.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * Get the Public IP Prefix this Public IP Address should be allocated from.
+     *
+     * @return the publicIPPrefix value
+     */
+    public SubResource publicIPPrefix() {
+        return this.publicIPPrefix;
+    }
+
+    /**
+     * Set the Public IP Prefix this Public IP Address should be allocated from.
+     *
+     * @param publicIPPrefix the publicIPPrefix value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withPublicIPPrefix(SubResource publicIPPrefix) {
+        this.publicIPPrefix = publicIPPrefix;
+        return this;
+    }
+
+    /**
+     * Get the idle timeout of the public IP address.
+     *
+     * @return the idleTimeoutInMinutes value
+     */
+    public Integer idleTimeoutInMinutes() {
+        return this.idleTimeoutInMinutes;
+    }
+
+    /**
+     * Set the idle timeout of the public IP address.
+     *
+     * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) {
+        this.idleTimeoutInMinutes = idleTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the public IP address resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the public IP address resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @param zones the zones value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the PublicIPAddressInner object itself.
+     */
+    public PublicIPAddressInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesImpl.java
new file mode 100644
index 000000000000..c6890b38c2e3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesImpl.java
@@ -0,0 +1,186 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddresses;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddress;
+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;
+
+class PublicIPAddressesImpl extends GroupableResourcesCoreImpl<PublicIPAddress, PublicIPAddressImpl, PublicIPAddressInner, PublicIPAddressesInner, NetworkManager>  implements PublicIPAddresses {
+    protected PublicIPAddressesImpl(NetworkManager manager) {
+        super(manager.inner().publicIPAddresses(), manager);
+    }
+
+    @Override
+    protected Observable<PublicIPAddressInner> getInnerAsync(String resourceGroupName, String name) {
+        PublicIPAddressesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        PublicIPAddressesInner 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<PublicIPAddress> listByResourceGroup(String resourceGroupName) {
+        PublicIPAddressesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<PublicIPAddress> listByResourceGroupAsync(String resourceGroupName) {
+        PublicIPAddressesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<PublicIPAddressInner>, Iterable<PublicIPAddressInner>>() {
+            @Override
+            public Iterable<PublicIPAddressInner> call(Page<PublicIPAddressInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPAddressInner, PublicIPAddress>() {
+            @Override
+            public PublicIPAddress call(PublicIPAddressInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PublicIPAddress> list() {
+        PublicIPAddressesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<PublicIPAddress> listAsync() {
+        PublicIPAddressesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PublicIPAddressInner>, Iterable<PublicIPAddressInner>>() {
+            @Override
+            public Iterable<PublicIPAddressInner> call(Page<PublicIPAddressInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPAddressInner, PublicIPAddress>() {
+            @Override
+            public PublicIPAddress call(PublicIPAddressInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PublicIPAddressImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<PublicIPAddress> listVirtualMachineScaleSetPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        PublicIPAddressesInner client = this.inner();
+        return client.listVirtualMachineScaleSetPublicIPAddressesAsync(resourceGroupName, virtualMachineScaleSetName)
+        .flatMapIterable(new Func1<Page<PublicIPAddressInner>, Iterable<PublicIPAddressInner>>() {
+            @Override
+            public Iterable<PublicIPAddressInner> call(Page<PublicIPAddressInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPAddressInner, PublicIPAddress>() {
+            @Override
+            public PublicIPAddress call(PublicIPAddressInner inner) {
+                return new PublicIPAddressImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PublicIPAddress> listVirtualMachineScaleSetVMPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName) {
+        PublicIPAddressesInner client = this.inner();
+        return client.listVirtualMachineScaleSetVMPublicIPAddressesAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName)
+        .flatMapIterable(new Func1<Page<PublicIPAddressInner>, Iterable<PublicIPAddressInner>>() {
+            @Override
+            public Iterable<PublicIPAddressInner> call(Page<PublicIPAddressInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPAddressInner, PublicIPAddress>() {
+            @Override
+            public PublicIPAddress call(PublicIPAddressInner inner) {
+                return new PublicIPAddressImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PublicIPAddress> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName) {
+        PublicIPAddressesInner client = this.inner();
+        return client.getVirtualMachineScaleSetPublicIPAddressAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName)
+        .map(new Func1<PublicIPAddressInner, PublicIPAddress>() {
+            @Override
+            public PublicIPAddress call(PublicIPAddressInner inner) {
+                return new PublicIPAddressImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected PublicIPAddressImpl wrapModel(PublicIPAddressInner inner) {
+        return  new PublicIPAddressImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected PublicIPAddressImpl wrapModel(String name) {
+        return new PublicIPAddressImpl(name, new PublicIPAddressInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesInner.java
new file mode 100644
index 000000000000..47405d661f35
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPAddressesInner.java
@@ -0,0 +1,1938 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 PublicIPAddresses.
+ */
+public class PublicIPAddressesInner implements InnerSupportsGet<PublicIPAddressInner>, InnerSupportsDelete<Void>, InnerSupportsListing<PublicIPAddressInner> {
+    /** The Retrofit service to perform REST calls. */
+    private PublicIPAddressesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PublicIPAddressesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PublicIPAddressesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PublicIPAddressesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PublicIPAddresses to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PublicIPAddressesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PublicIPAddresses delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @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.network.v2020_04_01.PublicIPAddresses beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @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.network.v2020_04_01.PublicIPAddresses getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PublicIPAddresses createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @Path("subscriptionId") String subscriptionId, @Body PublicIPAddressInner 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.network.v2020_04_01.PublicIPAddresses beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @Path("subscriptionId") String subscriptionId, @Body PublicIPAddressInner 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.network.v2020_04_01.PublicIPAddresses updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpAddressName") String publicIpAddressName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PublicIPAddresses list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/publicIPAddresses")
+        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.network.v2020_04_01.PublicIPAddresses listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses")
+        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.network.v2020_04_01.PublicIPAddresses listVirtualMachineScaleSetPublicIPAddresses" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/publicipaddresses")
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetPublicIPAddresses(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @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.network.v2020_04_01.PublicIPAddresses listVirtualMachineScaleSetVMPublicIPAddresses" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}/ipconfigurations/{ipConfigurationName}/publicipaddresses")
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetVMPublicIPAddresses(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @Path("networkInterfaceName") String networkInterfaceName, @Path("ipConfigurationName") String ipConfigurationName, @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.network.v2020_04_01.PublicIPAddresses getVirtualMachineScaleSetPublicIPAddress" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}/ipconfigurations/{ipConfigurationName}/publicipaddresses/{publicIpAddressName}")
+        Observable<Response<ResponseBody>> getVirtualMachineScaleSetPublicIPAddress(@Path("resourceGroupName") String resourceGroupName, @Path("virtualMachineScaleSetName") String virtualMachineScaleSetName, @Path("virtualmachineIndex") String virtualmachineIndex, @Path("networkInterfaceName") String networkInterfaceName, @Path("ipConfigurationName") String ipConfigurationName, @Path("publicIpAddressName") String publicIpAddressName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PublicIPAddresses 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.network.v2020_04_01.PublicIPAddresses 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.network.v2020_04_01.PublicIPAddresses listVirtualMachineScaleSetPublicIPAddressesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetPublicIPAddressesNext(@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.network.v2020_04_01.PublicIPAddresses listVirtualMachineScaleSetVMPublicIPAddressesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualMachineScaleSetVMPublicIPAddressesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @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 publicIpAddressName) {
+        deleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the 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<Void> deleteAsync(String resourceGroupName, String publicIpAddressName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String publicIpAddressName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @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 publicIpAddressName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the 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<Void> beginDeleteAsync(String resourceGroupName, String publicIpAddressName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String publicIpAddressName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpAddressName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), 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 specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner getByResourceGroup(String resourceGroupName, String publicIpAddressName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the 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<PublicIPAddressInner> getByResourceGroupAsync(String resourceGroupName, String publicIpAddressName, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> getByResourceGroupAsync(String resourceGroupName, String publicIpAddressName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner getByResourceGroup(String resourceGroupName, String publicIpAddressName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @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<PublicIPAddressInner> getByResourceGroupAsync(String resourceGroupName, String publicIpAddressName, String expand, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> getByResourceGroupAsync(String resourceGroupName, String publicIpAddressName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpAddressName, expand).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified public IP address in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPAddressInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPAddressInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPAddressInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address 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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner createOrUpdate(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @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<PublicIPAddressInner> createOrUpdateAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PublicIPAddressInner> createOrUpdateAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PublicIPAddressInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address 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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner beginCreateOrUpdate(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @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<PublicIPAddressInner> beginCreateOrUpdateAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> beginCreateOrUpdateAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpAddressName, parameters).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP address.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param parameters Parameters supplied to the create or update public IP address operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName, PublicIPAddressInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPAddressInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPAddressInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPAddressInner>() { }.getType())
+                .register(201, new TypeToken<PublicIPAddressInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner updateTags(String resourceGroupName, String publicIpAddressName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @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<PublicIPAddressInner> updateTagsAsync(String resourceGroupName, String publicIpAddressName, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName), serviceCallback);
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> updateTagsAsync(String resourceGroupName, String publicIpAddressName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param tags Resource tags.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner updateTags(String resourceGroupName, String publicIpAddressName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param tags Resource tags.
+     * @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<PublicIPAddressInner> updateTagsAsync(String resourceGroupName, String publicIpAddressName, Map<String, String> tags, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> updateTagsAsync(String resourceGroupName, String publicIpAddressName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpAddressName, tags).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates public IP address tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpAddressName The name of the public IP address.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String publicIpAddressName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, publicIpAddressName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPAddressInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPAddressInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPAddressInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the public IP addresses in a 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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> list() {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the public IP addresses in a 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<PublicIPAddressInner>> listAsync(final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<PublicIPAddressInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listVirtualMachineScaleSetPublicIPAddresses(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listVirtualMachineScaleSetPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @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<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        return listVirtualMachineScaleSetPublicIPAddressesWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetPublicIPAddressesWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        return listVirtualMachineScaleSetPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetPublicIPAddressesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetPublicIPAddressesSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.listVirtualMachineScaleSetPublicIPAddresses(resourceGroupName, virtualMachineScaleSetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listVirtualMachineScaleSetPublicIPAddressesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The network interface name.
+     * @param ipConfigurationName The IP configuration 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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listVirtualMachineScaleSetVMPublicIPAddresses(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listVirtualMachineScaleSetVMPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The network interface name.
+     * @param ipConfigurationName The IP 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<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetVMPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The network interface name.
+     * @param ipConfigurationName The IP configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName) {
+        return listVirtualMachineScaleSetVMPublicIPAddressesWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The network interface name.
+     * @param ipConfigurationName The IP configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetVMPublicIPAddressesWithServiceResponseAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName) {
+        return listVirtualMachineScaleSetVMPublicIPAddressesSinglePageAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetVMPublicIPAddressesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param virtualmachineIndex The virtual machine index.
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param networkInterfaceName The network interface name.
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param ipConfigurationName The IP configuration name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetVMPublicIPAddressesSinglePageAsync(final String resourceGroupName, final String virtualMachineScaleSetName, final String virtualmachineIndex, final String networkInterfaceName, final String ipConfigurationName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.listVirtualMachineScaleSetVMPublicIPAddresses(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listVirtualMachineScaleSetVMPublicIPAddressesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner getVirtualMachineScaleSetPublicIPAddress(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName) {
+        return getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @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<PublicIPAddressInner> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName), serviceCallback);
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName) {
+        return getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        final String expand = null;
+        return service.getVirtualMachineScaleSetPublicIPAddress(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = getVirtualMachineScaleSetPublicIPAddressDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @param expand Expands referenced resources.
+     * @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 PublicIPAddressInner object if successful.
+     */
+    public PublicIPAddressInner getVirtualMachineScaleSetPublicIPAddress(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName, String expand) {
+        return getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @param expand Expands referenced resources.
+     * @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<PublicIPAddressInner> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName, String expand, final ServiceCallback<PublicIPAddressInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName, expand), serviceCallback);
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<PublicIPAddressInner> getVirtualMachineScaleSetPublicIPAddressAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName, String expand) {
+        return getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName, expand).map(new Func1<ServiceResponse<PublicIPAddressInner>, PublicIPAddressInner>() {
+            @Override
+            public PublicIPAddressInner call(ServiceResponse<PublicIPAddressInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified public IP address in a virtual machine scale set.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualMachineScaleSetName The name of the virtual machine scale set.
+     * @param virtualmachineIndex The virtual machine index.
+     * @param networkInterfaceName The name of the network interface.
+     * @param ipConfigurationName The name of the IP configuration.
+     * @param publicIpAddressName The name of the public IP Address.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPAddressInner object
+     */
+    public Observable<ServiceResponse<PublicIPAddressInner>> getVirtualMachineScaleSetPublicIPAddressWithServiceResponseAsync(String resourceGroupName, String virtualMachineScaleSetName, String virtualmachineIndex, String networkInterfaceName, String ipConfigurationName, String publicIpAddressName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualMachineScaleSetName == null) {
+            throw new IllegalArgumentException("Parameter virtualMachineScaleSetName is required and cannot be null.");
+        }
+        if (virtualmachineIndex == null) {
+            throw new IllegalArgumentException("Parameter virtualmachineIndex is required and cannot be null.");
+        }
+        if (networkInterfaceName == null) {
+            throw new IllegalArgumentException("Parameter networkInterfaceName is required and cannot be null.");
+        }
+        if (ipConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter ipConfigurationName is required and cannot be null.");
+        }
+        if (publicIpAddressName == null) {
+            throw new IllegalArgumentException("Parameter publicIpAddressName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-10-01";
+        return service.getVirtualMachineScaleSetPublicIPAddress(resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, ipConfigurationName, publicIpAddressName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPAddressInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPAddressInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPAddressInner> clientResponse = getVirtualMachineScaleSetPublicIPAddressDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPAddressInner> getVirtualMachineScaleSetPublicIPAddressDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPAddressInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPAddressInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @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<PublicIPAddressInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPAddressInner>> serviceFuture, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP addresses in a subscription.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> 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<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all public IP addresses in 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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all public IP addresses in 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<PublicIPAddressInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPAddressInner>> serviceFuture, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all public IP addresses in 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;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP addresses in 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;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP addresses in a resource group.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> 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<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listVirtualMachineScaleSetPublicIPAddressesNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @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<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPAddressInner>> serviceFuture, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesNextAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetPublicIPAddressesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetPublicIPAddressesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetPublicIPAddressesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses on a virtual machine scale set level.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetPublicIPAddressesNextSinglePageAsync(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.listVirtualMachineScaleSetPublicIPAddressesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listVirtualMachineScaleSetPublicIPAddressesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listVirtualMachineScaleSetPublicIPAddressesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @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;PublicIPAddressInner&gt; object if successful.
+     */
+    public PagedList<PublicIPAddressInner> listVirtualMachineScaleSetVMPublicIPAddressesNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPAddressInner>> response = listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPAddressInner>(response.body()) {
+            @Override
+            public Page<PublicIPAddressInner> nextPage(String nextPageLink) {
+                return listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @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<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPAddressInner>> serviceFuture, final ListOperationCallback<PublicIPAddressInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(String nextPageLink) {
+                    return listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<Page<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesNextAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetVMPublicIPAddressesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Page<PublicIPAddressInner>>() {
+                @Override
+                public Page<PublicIPAddressInner> call(ServiceResponse<Page<PublicIPAddressInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+     * @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;PublicIPAddressInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetVMPublicIPAddressesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPAddressInner>>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(ServiceResponse<Page<PublicIPAddressInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualMachineScaleSetVMPublicIPAddressesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets information about all public IP addresses in a virtual machine IP configuration in a virtual machine scale set.
+     *
+    ServiceResponse<PageImpl<PublicIPAddressInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPAddressInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPAddressInner>>> listVirtualMachineScaleSetVMPublicIPAddressesNextSinglePageAsync(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.listVirtualMachineScaleSetVMPublicIPAddressesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPAddressInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPAddressInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPAddressInner>> result = listVirtualMachineScaleSetVMPublicIPAddressesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPAddressInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPAddressInner>> listVirtualMachineScaleSetVMPublicIPAddressesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPAddressInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPAddressInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixImpl.java
new file mode 100644
index 000000000000..3827a6a3e5d5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefix;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixSku;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpTag;
+import com.microsoft.azure.management.network.v2020_04_01.ReferencedPublicIpAddress;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class PublicIPPrefixImpl extends GroupableResourceCoreImpl<PublicIPPrefix, PublicIPPrefixInner, PublicIPPrefixImpl, NetworkManager> implements PublicIPPrefix, PublicIPPrefix.Definition, PublicIPPrefix.Update {
+    PublicIPPrefixImpl(String name, PublicIPPrefixInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<PublicIPPrefix> createResourceAsync() {
+        PublicIPPrefixesInner client = this.manager().inner().publicIPPrefixes();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PublicIPPrefix> updateResourceAsync() {
+        PublicIPPrefixesInner client = this.manager().inner().publicIPPrefixes();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PublicIPPrefixInner> getInnerAsync() {
+        PublicIPPrefixesInner client = this.manager().inner().publicIPPrefixes();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String ipPrefix() {
+        return this.inner().ipPrefix();
+    }
+
+    @Override
+    public List<IpTag> ipTags() {
+        return this.inner().ipTags();
+    }
+
+    @Override
+    public SubResource loadBalancerFrontendIpConfiguration() {
+        return this.inner().loadBalancerFrontendIpConfiguration();
+    }
+
+    @Override
+    public Integer prefixLength() {
+        return this.inner().prefixLength();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<ReferencedPublicIpAddress> publicIPAddresses() {
+        return this.inner().publicIPAddresses();
+    }
+
+    @Override
+    public IPVersion publicIPAddressVersion() {
+        return this.inner().publicIPAddressVersion();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public PublicIPPrefixSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public List<String> zones() {
+        return this.inner().zones();
+    }
+
+    @Override
+    public PublicIPPrefixImpl withIpTags(List<IpTag> ipTags) {
+        this.inner().withIpTags(ipTags);
+        return this;
+    }
+
+    @Override
+    public PublicIPPrefixImpl withPrefixLength(Integer prefixLength) {
+        this.inner().withPrefixLength(prefixLength);
+        return this;
+    }
+
+    @Override
+    public PublicIPPrefixImpl withPublicIPAddressVersion(IPVersion publicIPAddressVersion) {
+        this.inner().withPublicIPAddressVersion(publicIPAddressVersion);
+        return this;
+    }
+
+    @Override
+    public PublicIPPrefixImpl withSku(PublicIPPrefixSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public PublicIPPrefixImpl withZones(List<String> zones) {
+        this.inner().withZones(zones);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixInner.java
new file mode 100644
index 000000000000..e428d7eda219
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixInner.java
@@ -0,0 +1,278 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixSku;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpTag;
+import com.microsoft.azure.management.network.v2020_04_01.ReferencedPublicIpAddress;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Public IP prefix resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class PublicIPPrefixInner extends Resource {
+    /**
+     * The public IP prefix SKU.
+     */
+    @JsonProperty(value = "sku")
+    private PublicIPPrefixSku sku;
+
+    /**
+     * The public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     */
+    @JsonProperty(value = "properties.publicIPAddressVersion")
+    private IPVersion publicIPAddressVersion;
+
+    /**
+     * The list of tags associated with the public IP prefix.
+     */
+    @JsonProperty(value = "properties.ipTags")
+    private List<IpTag> ipTags;
+
+    /**
+     * The Length of the Public IP Prefix.
+     */
+    @JsonProperty(value = "properties.prefixLength")
+    private Integer prefixLength;
+
+    /**
+     * The allocated Prefix.
+     */
+    @JsonProperty(value = "properties.ipPrefix", access = JsonProperty.Access.WRITE_ONLY)
+    private String ipPrefix;
+
+    /**
+     * The list of all referenced PublicIPAddresses.
+     */
+    @JsonProperty(value = "properties.publicIPAddresses", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReferencedPublicIpAddress> publicIPAddresses;
+
+    /**
+     * The reference to load balancer frontend IP configuration associated with
+     * the public IP prefix.
+     */
+    @JsonProperty(value = "properties.loadBalancerFrontendIpConfiguration", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource loadBalancerFrontendIpConfiguration;
+
+    /**
+     * The resource GUID property of the public IP prefix resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the public IP prefix resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * A list of availability zones denoting the IP allocated for the resource
+     * needs to come from.
+     */
+    @JsonProperty(value = "zones")
+    private List<String> zones;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the public IP prefix SKU.
+     *
+     * @return the sku value
+     */
+    public PublicIPPrefixSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the public IP prefix SKU.
+     *
+     * @param sku the sku value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withSku(PublicIPPrefixSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the publicIPAddressVersion value
+     */
+    public IPVersion publicIPAddressVersion() {
+        return this.publicIPAddressVersion;
+    }
+
+    /**
+     * Set the public IP address version. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param publicIPAddressVersion the publicIPAddressVersion value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withPublicIPAddressVersion(IPVersion publicIPAddressVersion) {
+        this.publicIPAddressVersion = publicIPAddressVersion;
+        return this;
+    }
+
+    /**
+     * Get the list of tags associated with the public IP prefix.
+     *
+     * @return the ipTags value
+     */
+    public List<IpTag> ipTags() {
+        return this.ipTags;
+    }
+
+    /**
+     * Set the list of tags associated with the public IP prefix.
+     *
+     * @param ipTags the ipTags value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withIpTags(List<IpTag> ipTags) {
+        this.ipTags = ipTags;
+        return this;
+    }
+
+    /**
+     * Get the Length of the Public IP Prefix.
+     *
+     * @return the prefixLength value
+     */
+    public Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Set the Length of the Public IP Prefix.
+     *
+     * @param prefixLength the prefixLength value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withPrefixLength(Integer prefixLength) {
+        this.prefixLength = prefixLength;
+        return this;
+    }
+
+    /**
+     * Get the allocated Prefix.
+     *
+     * @return the ipPrefix value
+     */
+    public String ipPrefix() {
+        return this.ipPrefix;
+    }
+
+    /**
+     * Get the list of all referenced PublicIPAddresses.
+     *
+     * @return the publicIPAddresses value
+     */
+    public List<ReferencedPublicIpAddress> publicIPAddresses() {
+        return this.publicIPAddresses;
+    }
+
+    /**
+     * Get the reference to load balancer frontend IP configuration associated with the public IP prefix.
+     *
+     * @return the loadBalancerFrontendIpConfiguration value
+     */
+    public SubResource loadBalancerFrontendIpConfiguration() {
+        return this.loadBalancerFrontendIpConfiguration;
+    }
+
+    /**
+     * Get the resource GUID property of the public IP prefix resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the public IP prefix resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @return the zones value
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set a list of availability zones denoting the IP allocated for the resource needs to come from.
+     *
+     * @param zones the zones value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the PublicIPPrefixInner object itself.
+     */
+    public PublicIPPrefixInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesImpl.java
new file mode 100644
index 000000000000..92460a410341
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixes;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefix;
+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;
+
+class PublicIPPrefixesImpl extends GroupableResourcesCoreImpl<PublicIPPrefix, PublicIPPrefixImpl, PublicIPPrefixInner, PublicIPPrefixesInner, NetworkManager>  implements PublicIPPrefixes {
+    protected PublicIPPrefixesImpl(NetworkManager manager) {
+        super(manager.inner().publicIPPrefixes(), manager);
+    }
+
+    @Override
+    protected Observable<PublicIPPrefixInner> getInnerAsync(String resourceGroupName, String name) {
+        PublicIPPrefixesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        PublicIPPrefixesInner 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<PublicIPPrefix> listByResourceGroup(String resourceGroupName) {
+        PublicIPPrefixesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<PublicIPPrefix> listByResourceGroupAsync(String resourceGroupName) {
+        PublicIPPrefixesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<PublicIPPrefixInner>, Iterable<PublicIPPrefixInner>>() {
+            @Override
+            public Iterable<PublicIPPrefixInner> call(Page<PublicIPPrefixInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPPrefixInner, PublicIPPrefix>() {
+            @Override
+            public PublicIPPrefix call(PublicIPPrefixInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PublicIPPrefix> list() {
+        PublicIPPrefixesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<PublicIPPrefix> listAsync() {
+        PublicIPPrefixesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PublicIPPrefixInner>, Iterable<PublicIPPrefixInner>>() {
+            @Override
+            public Iterable<PublicIPPrefixInner> call(Page<PublicIPPrefixInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PublicIPPrefixInner, PublicIPPrefix>() {
+            @Override
+            public PublicIPPrefix call(PublicIPPrefixInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PublicIPPrefixImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected PublicIPPrefixImpl wrapModel(PublicIPPrefixInner inner) {
+        return  new PublicIPPrefixImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected PublicIPPrefixImpl wrapModel(String name) {
+        return new PublicIPPrefixImpl(name, new PublicIPPrefixInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesInner.java
new file mode 100644
index 000000000000..bf23d98dedef
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PublicIPPrefixesInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 PublicIPPrefixes.
+ */
+public class PublicIPPrefixesInner implements InnerSupportsGet<PublicIPPrefixInner>, InnerSupportsDelete<Void>, InnerSupportsListing<PublicIPPrefixInner> {
+    /** The Retrofit service to perform REST calls. */
+    private PublicIPPrefixesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PublicIPPrefixesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PublicIPPrefixesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(PublicIPPrefixesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PublicIPPrefixes to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PublicIPPrefixesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixes delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @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.network.v2020_04_01.PublicIPPrefixes beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @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.network.v2020_04_01.PublicIPPrefixes getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.PublicIPPrefixes createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @Path("subscriptionId") String subscriptionId, @Body PublicIPPrefixInner 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.network.v2020_04_01.PublicIPPrefixes beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @Path("subscriptionId") String subscriptionId, @Body PublicIPPrefixInner 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.network.v2020_04_01.PublicIPPrefixes updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("publicIpPrefixName") String publicIpPrefixName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PublicIPPrefixes list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/publicIPPrefixes")
+        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.network.v2020_04_01.PublicIPPrefixes listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes")
+        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.network.v2020_04_01.PublicIPPrefixes 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.network.v2020_04_01.PublicIPPrefixes listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @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 publicIpPrefixName) {
+        deleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @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 publicIpPrefixName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String publicIpPrefixName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @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 publicIpPrefixName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @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 publicIpPrefixName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String publicIpPrefixName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the PublicIpPrefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), 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 specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner getByResourceGroup(String resourceGroupName, String publicIpPrefixName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @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<PublicIPPrefixInner> getByResourceGroupAsync(String resourceGroupName, String publicIpPrefixName, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<PublicIPPrefixInner> getByResourceGroupAsync(String resourceGroupName, String publicIpPrefixName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPPrefixInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPPrefixInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPPrefixInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner getByResourceGroup(String resourceGroupName, String publicIpPrefixName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @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<PublicIPPrefixInner> getByResourceGroupAsync(String resourceGroupName, String publicIpPrefixName, String expand, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<PublicIPPrefixInner> getByResourceGroupAsync(String resourceGroupName, String publicIpPrefixName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, expand).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified public IP prefix in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPPrefixInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPPrefixInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPPrefixInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPPrefixInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPPrefixInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPPrefixInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix 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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner createOrUpdate(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @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<PublicIPPrefixInner> createOrUpdateAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PublicIPPrefixInner> createOrUpdateAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<PublicIPPrefixInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix 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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner beginCreateOrUpdate(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @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<PublicIPPrefixInner> beginCreateOrUpdateAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<PublicIPPrefixInner> beginCreateOrUpdateAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, parameters).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a static or dynamic public IP prefix.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param parameters Parameters supplied to the create or update public IP prefix operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName, PublicIPPrefixInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPPrefixInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPPrefixInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPPrefixInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPPrefixInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPPrefixInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPPrefixInner>() { }.getType())
+                .register(201, new TypeToken<PublicIPPrefixInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner updateTags(String resourceGroupName, String publicIpPrefixName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @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<PublicIPPrefixInner> updateTagsAsync(String resourceGroupName, String publicIpPrefixName, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName), serviceCallback);
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<PublicIPPrefixInner> updateTagsAsync(String resourceGroupName, String publicIpPrefixName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPPrefixInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPPrefixInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPPrefixInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param tags Resource tags.
+     * @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 PublicIPPrefixInner object if successful.
+     */
+    public PublicIPPrefixInner updateTags(String resourceGroupName, String publicIpPrefixName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param tags Resource tags.
+     * @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<PublicIPPrefixInner> updateTagsAsync(String resourceGroupName, String publicIpPrefixName, Map<String, String> tags, final ServiceCallback<PublicIPPrefixInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<PublicIPPrefixInner> updateTagsAsync(String resourceGroupName, String publicIpPrefixName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, publicIpPrefixName, tags).map(new Func1<ServiceResponse<PublicIPPrefixInner>, PublicIPPrefixInner>() {
+            @Override
+            public PublicIPPrefixInner call(ServiceResponse<PublicIPPrefixInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates public IP prefix tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param publicIpPrefixName The name of the public IP prefix.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PublicIPPrefixInner object
+     */
+    public Observable<ServiceResponse<PublicIPPrefixInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String publicIpPrefixName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (publicIpPrefixName == null) {
+            throw new IllegalArgumentException("Parameter publicIpPrefixName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, publicIpPrefixName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PublicIPPrefixInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PublicIPPrefixInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PublicIPPrefixInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PublicIPPrefixInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PublicIPPrefixInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PublicIPPrefixInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the public IP prefixes in a 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;PublicIPPrefixInner&gt; object if successful.
+     */
+    public PagedList<PublicIPPrefixInner> list() {
+        ServiceResponse<Page<PublicIPPrefixInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PublicIPPrefixInner>(response.body()) {
+            @Override
+            public Page<PublicIPPrefixInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the public IP prefixes in a 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<PublicIPPrefixInner>> listAsync(final ListOperationCallback<PublicIPPrefixInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPPrefixInner&gt; object
+     */
+    public Observable<Page<PublicIPPrefixInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Page<PublicIPPrefixInner>>() {
+                @Override
+                public Page<PublicIPPrefixInner> call(ServiceResponse<Page<PublicIPPrefixInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPPrefixInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(ServiceResponse<Page<PublicIPPrefixInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPPrefixInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPPrefixInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPPrefixInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPPrefixInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPPrefixInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPPrefixInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;PublicIPPrefixInner&gt; object if successful.
+     */
+    public PagedList<PublicIPPrefixInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<PublicIPPrefixInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<PublicIPPrefixInner>(response.body()) {
+            @Override
+            public Page<PublicIPPrefixInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<PublicIPPrefixInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<PublicIPPrefixInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPPrefixInner&gt; object
+     */
+    public Observable<Page<PublicIPPrefixInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Page<PublicIPPrefixInner>>() {
+                @Override
+                public Page<PublicIPPrefixInner> call(ServiceResponse<Page<PublicIPPrefixInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PublicIPPrefixInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(ServiceResponse<Page<PublicIPPrefixInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+    ServiceResponse<PageImpl<PublicIPPrefixInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPPrefixInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPPrefixInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPPrefixInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPPrefixInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPPrefixInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPPrefixInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @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;PublicIPPrefixInner&gt; object if successful.
+     */
+    public PagedList<PublicIPPrefixInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPPrefixInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPPrefixInner>(response.body()) {
+            @Override
+            public Page<PublicIPPrefixInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @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<PublicIPPrefixInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPPrefixInner>> serviceFuture, final ListOperationCallback<PublicIPPrefixInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @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;PublicIPPrefixInner&gt; object
+     */
+    public Observable<Page<PublicIPPrefixInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Page<PublicIPPrefixInner>>() {
+                @Override
+                public Page<PublicIPPrefixInner> call(ServiceResponse<Page<PublicIPPrefixInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+     * @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;PublicIPPrefixInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(ServiceResponse<Page<PublicIPPrefixInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the public IP prefixes in a subscription.
+     *
+    ServiceResponse<PageImpl<PublicIPPrefixInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPPrefixInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> 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<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPPrefixInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPPrefixInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPPrefixInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPPrefixInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPPrefixInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all public IP prefixes in 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;PublicIPPrefixInner&gt; object if successful.
+     */
+    public PagedList<PublicIPPrefixInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PublicIPPrefixInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PublicIPPrefixInner>(response.body()) {
+            @Override
+            public Page<PublicIPPrefixInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all public IP prefixes in 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<PublicIPPrefixInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PublicIPPrefixInner>> serviceFuture, final ListOperationCallback<PublicIPPrefixInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all public IP prefixes in 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;PublicIPPrefixInner&gt; object
+     */
+    public Observable<Page<PublicIPPrefixInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Page<PublicIPPrefixInner>>() {
+                @Override
+                public Page<PublicIPPrefixInner> call(ServiceResponse<Page<PublicIPPrefixInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP prefixes in 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;PublicIPPrefixInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PublicIPPrefixInner>>, Observable<ServiceResponse<Page<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(ServiceResponse<Page<PublicIPPrefixInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all public IP prefixes in a resource group.
+     *
+    ServiceResponse<PageImpl<PublicIPPrefixInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PublicIPPrefixInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> 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<PublicIPPrefixInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PublicIPPrefixInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PublicIPPrefixInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PublicIPPrefixInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PublicIPPrefixInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PublicIPPrefixInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PublicIPPrefixInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinkInner.java
new file mode 100644
index 000000000000..60e983139009
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinkInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * ResourceNavigationLink resource.
+ */
+@JsonFlatten
+public class ResourceNavigationLinkInner extends SubResource {
+    /**
+     * Resource type of the linked resource.
+     */
+    @JsonProperty(value = "properties.linkedResourceType")
+    private String linkedResourceType;
+
+    /**
+     * Link to the external resource.
+     */
+    @JsonProperty(value = "properties.link")
+    private String link;
+
+    /**
+     * The provisioning state of the resource navigation link resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get resource type of the linked resource.
+     *
+     * @return the linkedResourceType value
+     */
+    public String linkedResourceType() {
+        return this.linkedResourceType;
+    }
+
+    /**
+     * Set resource type of the linked resource.
+     *
+     * @param linkedResourceType the linkedResourceType value to set
+     * @return the ResourceNavigationLinkInner object itself.
+     */
+    public ResourceNavigationLinkInner withLinkedResourceType(String linkedResourceType) {
+        this.linkedResourceType = linkedResourceType;
+        return this;
+    }
+
+    /**
+     * Get link to the external resource.
+     *
+     * @return the link value
+     */
+    public String link() {
+        return this.link;
+    }
+
+    /**
+     * Set link to the external resource.
+     *
+     * @param link the link value to set
+     * @return the ResourceNavigationLinkInner object itself.
+     */
+    public ResourceNavigationLinkInner withLink(String link) {
+        this.link = link;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the resource navigation link resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ResourceNavigationLinkInner object itself.
+     */
+    public ResourceNavigationLinkInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksImpl.java
new file mode 100644
index 000000000000..6d503ace8339
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ResourceNavigationLinks;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ResourceNavigationLinksListResult;
+
+class ResourceNavigationLinksImpl extends WrapperImpl<ResourceNavigationLinksInner> implements ResourceNavigationLinks {
+    private final NetworkManager manager;
+
+    ResourceNavigationLinksImpl(NetworkManager manager) {
+        super(manager.inner().resourceNavigationLinks());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ResourceNavigationLinksListResult> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        ResourceNavigationLinksInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualNetworkName, subnetName)
+        .map(new Func1<ResourceNavigationLinksListResultInner, ResourceNavigationLinksListResult>() {
+            @Override
+            public ResourceNavigationLinksListResult call(ResourceNavigationLinksListResultInner inner) {
+                return new ResourceNavigationLinksListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksInner.java
new file mode 100644
index 000000000000..6f9cc433fb50
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksInner.java
@@ -0,0 +1,151 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ResourceNavigationLinks.
+ */
+public class ResourceNavigationLinksInner {
+    /** The Retrofit service to perform REST calls. */
+    private ResourceNavigationLinksService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ResourceNavigationLinksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ResourceNavigationLinksInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ResourceNavigationLinksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ResourceNavigationLinks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ResourceNavigationLinksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ResourceNavigationLinks list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ResourceNavigationLinks")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of resource navigation links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 ResourceNavigationLinksListResultInner object if successful.
+     */
+    public ResourceNavigationLinksListResultInner list(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of resource navigation links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<ResourceNavigationLinksListResultInner> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<ResourceNavigationLinksListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Gets a list of resource navigation links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceNavigationLinksListResultInner object
+     */
+    public Observable<ResourceNavigationLinksListResultInner> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<ResourceNavigationLinksListResultInner>, ResourceNavigationLinksListResultInner>() {
+            @Override
+            public ResourceNavigationLinksListResultInner call(ServiceResponse<ResourceNavigationLinksListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of resource navigation links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceNavigationLinksListResultInner object
+     */
+    public Observable<ServiceResponse<ResourceNavigationLinksListResultInner>> listWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceNavigationLinksListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceNavigationLinksListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceNavigationLinksListResultInner> clientResponse = listDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceNavigationLinksListResultInner> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceNavigationLinksListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceNavigationLinksListResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultImpl.java
new file mode 100644
index 000000000000..9af106387c76
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ResourceNavigationLinksListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class ResourceNavigationLinksListResultImpl extends WrapperImpl<ResourceNavigationLinksListResultInner> implements ResourceNavigationLinksListResult {
+    private final NetworkManager manager;
+    ResourceNavigationLinksListResultImpl(ResourceNavigationLinksListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ResourceNavigationLinkInner> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultInner.java
new file mode 100644
index 000000000000..167e763766c3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ResourceNavigationLinksListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ResourceNavigationLinks_List operation.
+ */
+public class ResourceNavigationLinksListResultInner {
+    /**
+     * The resource navigation links in a subnet.
+     */
+    @JsonProperty(value = "value")
+    private List<ResourceNavigationLinkInner> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /**
+     * Get the resource navigation links in a subnet.
+     *
+     * @return the value value
+     */
+    public List<ResourceNavigationLinkInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the resource navigation links in a subnet.
+     *
+     * @param value the value value to set
+     * @return the ResourceNavigationLinksListResultInner object itself.
+     */
+    public ResourceNavigationLinksListResultInner withValue(List<ResourceNavigationLinkInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterImpl.java
new file mode 100644
index 000000000000..ae3b9876be06
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilter;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ExpressRouteCircuitPeering;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilterRule;
+
+class RouteFilterImpl extends GroupableResourceCoreImpl<RouteFilter, RouteFilterInner, RouteFilterImpl, NetworkManager> implements RouteFilter, RouteFilter.Definition, RouteFilter.Update {
+    RouteFilterImpl(String name, RouteFilterInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<RouteFilter> createResourceAsync() {
+        RouteFiltersInner client = this.manager().inner().routeFilters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<RouteFilter> updateResourceAsync() {
+        RouteFiltersInner client = this.manager().inner().routeFilters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<RouteFilterInner> getInnerAsync() {
+        RouteFiltersInner client = this.manager().inner().routeFilters();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<ExpressRouteCircuitPeering> ipv6Peerings() {
+        List<ExpressRouteCircuitPeering> lst = new ArrayList<ExpressRouteCircuitPeering>();
+        if (this.inner().ipv6Peerings() != null) {
+            for (ExpressRouteCircuitPeeringInner inner : this.inner().ipv6Peerings()) {
+                lst.add( new ExpressRouteCircuitPeeringImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<ExpressRouteCircuitPeering> peerings() {
+        List<ExpressRouteCircuitPeering> lst = new ArrayList<ExpressRouteCircuitPeering>();
+        if (this.inner().peerings() != null) {
+            for (ExpressRouteCircuitPeeringInner inner : this.inner().peerings()) {
+                lst.add( new ExpressRouteCircuitPeeringImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<RouteFilterRule> rules() {
+        List<RouteFilterRule> lst = new ArrayList<RouteFilterRule>();
+        if (this.inner().rules() != null) {
+            for (RouteFilterRuleInner inner : this.inner().rules()) {
+                lst.add( new RouteFilterRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public RouteFilterImpl withRules(List<RouteFilterRuleInner> rules) {
+        this.inner().withRules(rules);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterInner.java
new file mode 100644
index 000000000000..a07ae6c27667
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterInner.java
@@ -0,0 +1,137 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Route Filter Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class RouteFilterInner extends Resource {
+    /**
+     * Collection of RouteFilterRules contained within a route filter.
+     */
+    @JsonProperty(value = "properties.rules")
+    private List<RouteFilterRuleInner> rules;
+
+    /**
+     * A collection of references to express route circuit peerings.
+     */
+    @JsonProperty(value = "properties.peerings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ExpressRouteCircuitPeeringInner> peerings;
+
+    /**
+     * A collection of references to express route circuit ipv6 peerings.
+     */
+    @JsonProperty(value = "properties.ipv6Peerings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ExpressRouteCircuitPeeringInner> ipv6Peerings;
+
+    /**
+     * The provisioning state of the route filter resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get collection of RouteFilterRules contained within a route filter.
+     *
+     * @return the rules value
+     */
+    public List<RouteFilterRuleInner> rules() {
+        return this.rules;
+    }
+
+    /**
+     * Set collection of RouteFilterRules contained within a route filter.
+     *
+     * @param rules the rules value to set
+     * @return the RouteFilterInner object itself.
+     */
+    public RouteFilterInner withRules(List<RouteFilterRuleInner> rules) {
+        this.rules = rules;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to express route circuit peerings.
+     *
+     * @return the peerings value
+     */
+    public List<ExpressRouteCircuitPeeringInner> peerings() {
+        return this.peerings;
+    }
+
+    /**
+     * Get a collection of references to express route circuit ipv6 peerings.
+     *
+     * @return the ipv6Peerings value
+     */
+    public List<ExpressRouteCircuitPeeringInner> ipv6Peerings() {
+        return this.ipv6Peerings;
+    }
+
+    /**
+     * Get the provisioning state of the route filter resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the RouteFilterInner object itself.
+     */
+    public RouteFilterInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleImpl.java
new file mode 100644
index 000000000000..80d2154c6b73
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleImpl.java
@@ -0,0 +1,158 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilterRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.Access;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class RouteFilterRuleImpl extends CreatableUpdatableImpl<RouteFilterRule, RouteFilterRuleInner, RouteFilterRuleImpl> implements RouteFilterRule, RouteFilterRule.Definition, RouteFilterRule.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String routeFilterName;
+    private String ruleName;
+
+    RouteFilterRuleImpl(String name, NetworkManager manager) {
+        super(name, new RouteFilterRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.ruleName = name;
+        //
+    }
+
+    RouteFilterRuleImpl(RouteFilterRuleInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.ruleName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.routeFilterName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeFilters");
+        this.ruleName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeFilterRules");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<RouteFilterRule> createResourceAsync() {
+        RouteFilterRulesInner client = this.manager().inner().routeFilterRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.routeFilterName, this.ruleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<RouteFilterRule> updateResourceAsync() {
+        RouteFilterRulesInner client = this.manager().inner().routeFilterRules();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.routeFilterName, this.ruleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<RouteFilterRuleInner> getInnerAsync() {
+        RouteFilterRulesInner client = this.manager().inner().routeFilterRules();
+        return client.getAsync(this.resourceGroupName, this.routeFilterName, this.ruleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Access access() {
+        return this.inner().access();
+    }
+
+    @Override
+    public List<String> communities() {
+        return this.inner().communities();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @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 ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String routeFilterRuleType() {
+        return this.inner().routeFilterRuleType();
+    }
+
+    @Override
+    public RouteFilterRuleImpl withExistingRouteFilter(String resourceGroupName, String routeFilterName) {
+        this.resourceGroupName = resourceGroupName;
+        this.routeFilterName = routeFilterName;
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withAccess(Access access) {
+        this.inner().withAccess(access);
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withCommunities(List<String> communities) {
+        this.inner().withCommunities(communities);
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withRouteFilterRuleType(String routeFilterRuleType) {
+        this.inner().withRouteFilterRuleType(routeFilterRuleType);
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withLocation(String location) {
+        this.inner().withLocation(location);
+        return this;
+    }
+
+    @Override
+    public RouteFilterRuleImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleInner.java
new file mode 100644
index 000000000000..e95094bb59d4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRuleInner.java
@@ -0,0 +1,195 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Access;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Route Filter Rule Resource.
+ */
+@JsonFlatten
+public class RouteFilterRuleInner extends SubResource {
+    /**
+     * The access type of the rule. Possible values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "properties.access", required = true)
+    private Access access;
+
+    /**
+     * The rule type of the rule.
+     */
+    @JsonProperty(value = "properties.routeFilterRuleType", required = true)
+    private String routeFilterRuleType;
+
+    /**
+     * The collection for bgp community values to filter on. e.g.
+     * ['12076:5010','12076:5020'].
+     */
+    @JsonProperty(value = "properties.communities", required = true)
+    private List<String> communities;
+
+    /**
+     * The provisioning state of the route filter rule resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Creates an instance of RouteFilterRuleInner class.
+     * @param access the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     * @param communities the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     */
+    public RouteFilterRuleInner() {
+        routeFilterRuleType = "Community";
+    }
+
+    /**
+     * Get the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the access value
+     */
+    public Access access() {
+        return this.access;
+    }
+
+    /**
+     * Set the access type of the rule. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param access the access value to set
+     * @return the RouteFilterRuleInner object itself.
+     */
+    public RouteFilterRuleInner withAccess(Access access) {
+        this.access = access;
+        return this;
+    }
+
+    /**
+     * Get the rule type of the rule.
+     *
+     * @return the routeFilterRuleType value
+     */
+    public String routeFilterRuleType() {
+        return this.routeFilterRuleType;
+    }
+
+    /**
+     * Set the rule type of the rule.
+     *
+     * @param routeFilterRuleType the routeFilterRuleType value to set
+     * @return the RouteFilterRuleInner object itself.
+     */
+    public RouteFilterRuleInner withRouteFilterRuleType(String routeFilterRuleType) {
+        this.routeFilterRuleType = routeFilterRuleType;
+        return this;
+    }
+
+    /**
+     * Get the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     *
+     * @return the communities value
+     */
+    public List<String> communities() {
+        return this.communities;
+    }
+
+    /**
+     * Set the collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020'].
+     *
+     * @param communities the communities value to set
+     * @return the RouteFilterRuleInner object itself.
+     */
+    public RouteFilterRuleInner withCommunities(List<String> communities) {
+        this.communities = communities;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the route filter rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the RouteFilterRuleInner object itself.
+     */
+    public RouteFilterRuleInner withName(String name) {
+        this.name = name;
+        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 RouteFilterRuleInner object itself.
+     */
+    public RouteFilterRuleInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesImpl.java
new file mode 100644
index 000000000000..12d14e8ad498
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilterRules;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilterRule;
+
+class RouteFilterRulesImpl extends WrapperImpl<RouteFilterRulesInner> implements RouteFilterRules {
+    private final NetworkManager manager;
+
+    RouteFilterRulesImpl(NetworkManager manager) {
+        super(manager.inner().routeFilterRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public RouteFilterRuleImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private RouteFilterRuleImpl wrapModel(RouteFilterRuleInner inner) {
+        return  new RouteFilterRuleImpl(inner, manager());
+    }
+
+    private RouteFilterRuleImpl wrapModel(String name) {
+        return new RouteFilterRuleImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<RouteFilterRule> listByRouteFilterAsync(final String resourceGroupName, final String routeFilterName) {
+        RouteFilterRulesInner client = this.inner();
+        return client.listByRouteFilterAsync(resourceGroupName, routeFilterName)
+        .flatMapIterable(new Func1<Page<RouteFilterRuleInner>, Iterable<RouteFilterRuleInner>>() {
+            @Override
+            public Iterable<RouteFilterRuleInner> call(Page<RouteFilterRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteFilterRuleInner, RouteFilterRule>() {
+            @Override
+            public RouteFilterRule call(RouteFilterRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RouteFilterRule> getAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        RouteFilterRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, routeFilterName, ruleName)
+        .flatMap(new Func1<RouteFilterRuleInner, Observable<RouteFilterRule>>() {
+            @Override
+            public Observable<RouteFilterRule> call(RouteFilterRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((RouteFilterRule)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        RouteFilterRulesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, routeFilterName, ruleName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesInner.java
new file mode 100644
index 000000000000..01956d3653df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFilterRulesInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 RouteFilterRules.
+ */
+public class RouteFilterRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RouteFilterRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RouteFilterRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RouteFilterRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(RouteFilterRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RouteFilterRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RouteFilterRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.RouteFilterRules delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("ruleName") String ruleName, @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.network.v2020_04_01.RouteFilterRules beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("ruleName") String ruleName, @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.network.v2020_04_01.RouteFilterRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("ruleName") String ruleName, @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.network.v2020_04_01.RouteFilterRules createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("ruleName") String ruleName, @Path("subscriptionId") String subscriptionId, @Body RouteFilterRuleInner routeFilterRuleParameters, @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.network.v2020_04_01.RouteFilterRules beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("ruleName") String ruleName, @Path("subscriptionId") String subscriptionId, @Body RouteFilterRuleInner routeFilterRuleParameters, @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.network.v2020_04_01.RouteFilterRules listByRouteFilter" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules")
+        Observable<Response<ResponseBody>> listByRouteFilter(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @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.network.v2020_04_01.RouteFilterRules listByRouteFilterNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByRouteFilterNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @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 routeFilterName, String ruleName) {
+        deleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of 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<Void> deleteAsync(String resourceGroupName, String routeFilterName, String ruleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (ruleName == null) {
+            throw new IllegalArgumentException("Parameter ruleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, routeFilterName, ruleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @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 routeFilterName, String ruleName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of 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<Void> beginDeleteAsync(String resourceGroupName, String routeFilterName, String ruleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (ruleName == null) {
+            throw new IllegalArgumentException("Parameter ruleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, routeFilterName, ruleName, this.client.subscriptionId(), 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 specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @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 RouteFilterRuleInner object if successful.
+     */
+    public RouteFilterRuleInner get(String resourceGroupName, String routeFilterName, String ruleName) {
+        return getWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of 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<RouteFilterRuleInner> getAsync(String resourceGroupName, String routeFilterName, String ruleName, final ServiceCallback<RouteFilterRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterRuleInner object
+     */
+    public Observable<RouteFilterRuleInner> getAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        return getWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName).map(new Func1<ServiceResponse<RouteFilterRuleInner>, RouteFilterRuleInner>() {
+            @Override
+            public RouteFilterRuleInner call(ServiceResponse<RouteFilterRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified rule from a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterRuleInner object
+     */
+    public Observable<ServiceResponse<RouteFilterRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String ruleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (ruleName == null) {
+            throw new IllegalArgumentException("Parameter ruleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, routeFilterName, ruleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteFilterRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteFilterRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteFilterRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule 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 RouteFilterRuleInner object if successful.
+     */
+    public RouteFilterRuleInner createOrUpdate(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @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<RouteFilterRuleInner> createOrUpdateAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters, final ServiceCallback<RouteFilterRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<RouteFilterRuleInner> createOrUpdateAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters).map(new Func1<ServiceResponse<RouteFilterRuleInner>, RouteFilterRuleInner>() {
+            @Override
+            public RouteFilterRuleInner call(ServiceResponse<RouteFilterRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<RouteFilterRuleInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (ruleName == null) {
+            throw new IllegalArgumentException("Parameter ruleName 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 (routeFilterRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter routeFilterRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(routeFilterRuleParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, routeFilterName, ruleName, this.client.subscriptionId(), routeFilterRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<RouteFilterRuleInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule 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 RouteFilterRuleInner object if successful.
+     */
+    public RouteFilterRuleInner beginCreateOrUpdate(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @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<RouteFilterRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters, final ServiceCallback<RouteFilterRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterRuleInner object
+     */
+    public Observable<RouteFilterRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters).map(new Func1<ServiceResponse<RouteFilterRuleInner>, RouteFilterRuleInner>() {
+            @Override
+            public RouteFilterRuleInner call(ServiceResponse<RouteFilterRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route in the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param ruleName The name of the route filter rule.
+     * @param routeFilterRuleParameters Parameters supplied to the create or update route filter rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterRuleInner object
+     */
+    public Observable<ServiceResponse<RouteFilterRuleInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String ruleName, RouteFilterRuleInner routeFilterRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (ruleName == null) {
+            throw new IllegalArgumentException("Parameter ruleName 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 (routeFilterRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter routeFilterRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(routeFilterRuleParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, routeFilterName, ruleName, this.client.subscriptionId(), routeFilterRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterRuleInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteFilterRuleInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteFilterRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteFilterRuleInner>() { }.getType())
+                .register(201, new TypeToken<RouteFilterRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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;RouteFilterRuleInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterRuleInner> listByRouteFilter(final String resourceGroupName, final String routeFilterName) {
+        ServiceResponse<Page<RouteFilterRuleInner>> response = listByRouteFilterSinglePageAsync(resourceGroupName, routeFilterName).toBlocking().single();
+        return new PagedList<RouteFilterRuleInner>(response.body()) {
+            @Override
+            public Page<RouteFilterRuleInner> nextPage(String nextPageLink) {
+                return listByRouteFilterNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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<RouteFilterRuleInner>> listByRouteFilterAsync(final String resourceGroupName, final String routeFilterName, final ListOperationCallback<RouteFilterRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByRouteFilterSinglePageAsync(resourceGroupName, routeFilterName),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(String nextPageLink) {
+                    return listByRouteFilterNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterRuleInner&gt; object
+     */
+    public Observable<Page<RouteFilterRuleInner>> listByRouteFilterAsync(final String resourceGroupName, final String routeFilterName) {
+        return listByRouteFilterWithServiceResponseAsync(resourceGroupName, routeFilterName)
+            .map(new Func1<ServiceResponse<Page<RouteFilterRuleInner>>, Page<RouteFilterRuleInner>>() {
+                @Override
+                public Page<RouteFilterRuleInner> call(ServiceResponse<Page<RouteFilterRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> listByRouteFilterWithServiceResponseAsync(final String resourceGroupName, final String routeFilterName) {
+        return listByRouteFilterSinglePageAsync(resourceGroupName, routeFilterName)
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterRuleInner>>, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(ServiceResponse<Page<RouteFilterRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByRouteFilterNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+    ServiceResponse<PageImpl<RouteFilterRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RouteFilterRuleInner>> * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> listByRouteFilterSinglePageAsync(final String resourceGroupName, final String routeFilterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByRouteFilter(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterRuleInner>> result = listByRouteFilterDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterRuleInner>> listByRouteFilterDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @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;RouteFilterRuleInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterRuleInner> listByRouteFilterNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteFilterRuleInner>> response = listByRouteFilterNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteFilterRuleInner>(response.body()) {
+            @Override
+            public Page<RouteFilterRuleInner> nextPage(String nextPageLink) {
+                return listByRouteFilterNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @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<RouteFilterRuleInner>> listByRouteFilterNextAsync(final String nextPageLink, final ServiceFuture<List<RouteFilterRuleInner>> serviceFuture, final ListOperationCallback<RouteFilterRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByRouteFilterNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(String nextPageLink) {
+                    return listByRouteFilterNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @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;RouteFilterRuleInner&gt; object
+     */
+    public Observable<Page<RouteFilterRuleInner>> listByRouteFilterNextAsync(final String nextPageLink) {
+        return listByRouteFilterNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteFilterRuleInner>>, Page<RouteFilterRuleInner>>() {
+                @Override
+                public Page<RouteFilterRuleInner> call(ServiceResponse<Page<RouteFilterRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+     * @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;RouteFilterRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> listByRouteFilterNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByRouteFilterNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterRuleInner>>, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(ServiceResponse<Page<RouteFilterRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByRouteFilterNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all RouteFilterRules in a route filter.
+     *
+    ServiceResponse<PageImpl<RouteFilterRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> listByRouteFilterNextSinglePageAsync(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.listByRouteFilterNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterRuleInner>> result = listByRouteFilterNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterRuleInner>> listByRouteFilterNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersImpl.java
new file mode 100644
index 000000000000..167e17bd0ef2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilters;
+import com.microsoft.azure.management.network.v2020_04_01.RouteFilter;
+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;
+
+class RouteFiltersImpl extends GroupableResourcesCoreImpl<RouteFilter, RouteFilterImpl, RouteFilterInner, RouteFiltersInner, NetworkManager>  implements RouteFilters {
+    protected RouteFiltersImpl(NetworkManager manager) {
+        super(manager.inner().routeFilters(), manager);
+    }
+
+    @Override
+    protected Observable<RouteFilterInner> getInnerAsync(String resourceGroupName, String name) {
+        RouteFiltersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        RouteFiltersInner 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<RouteFilter> listByResourceGroup(String resourceGroupName) {
+        RouteFiltersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<RouteFilter> listByResourceGroupAsync(String resourceGroupName) {
+        RouteFiltersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<RouteFilterInner>, Iterable<RouteFilterInner>>() {
+            @Override
+            public Iterable<RouteFilterInner> call(Page<RouteFilterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteFilterInner, RouteFilter>() {
+            @Override
+            public RouteFilter call(RouteFilterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<RouteFilter> list() {
+        RouteFiltersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<RouteFilter> listAsync() {
+        RouteFiltersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<RouteFilterInner>, Iterable<RouteFilterInner>>() {
+            @Override
+            public Iterable<RouteFilterInner> call(Page<RouteFilterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteFilterInner, RouteFilter>() {
+            @Override
+            public RouteFilter call(RouteFilterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public RouteFilterImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected RouteFilterImpl wrapModel(RouteFilterInner inner) {
+        return  new RouteFilterImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected RouteFilterImpl wrapModel(String name) {
+        return new RouteFilterImpl(name, new RouteFilterInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersInner.java
new file mode 100644
index 000000000000..183180d852ff
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteFiltersInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 RouteFilters.
+ */
+public class RouteFiltersInner implements InnerSupportsGet<RouteFilterInner>, InnerSupportsDelete<Void>, InnerSupportsListing<RouteFilterInner> {
+    /** The Retrofit service to perform REST calls. */
+    private RouteFiltersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RouteFiltersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RouteFiltersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(RouteFiltersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RouteFilters to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RouteFiltersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.RouteFilters delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @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.network.v2020_04_01.RouteFilters beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @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.network.v2020_04_01.RouteFilters getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.RouteFilters createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("subscriptionId") String subscriptionId, @Body RouteFilterInner routeFilterParameters, @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.network.v2020_04_01.RouteFilters beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("subscriptionId") String subscriptionId, @Body RouteFilterInner routeFilterParameters, @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.network.v2020_04_01.RouteFilters updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("routeFilterName") String routeFilterName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.RouteFilters listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters")
+        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.network.v2020_04_01.RouteFilters list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/routeFilters")
+        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.network.v2020_04_01.RouteFilters 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.network.v2020_04_01.RouteFilters listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 routeFilterName) {
+        deleteWithServiceResponseAsync(resourceGroupName, routeFilterName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 routeFilterName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, routeFilterName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String routeFilterName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, routeFilterName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String routeFilterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 routeFilterName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 routeFilterName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String routeFilterName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, routeFilterName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String routeFilterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, routeFilterName, this.client.subscriptionId(), 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 specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner getByResourceGroup(String resourceGroupName, String routeFilterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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<RouteFilterInner> getByResourceGroupAsync(String resourceGroupName, String routeFilterName, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<RouteFilterInner> getByResourceGroupAsync(String resourceGroupName, String routeFilterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String routeFilterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param expand Expands referenced express route bgp peering resources.
+     * @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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner getByResourceGroup(String resourceGroupName, String routeFilterName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param expand Expands referenced express route bgp peering resources.
+     * @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<RouteFilterInner> getByResourceGroupAsync(String resourceGroupName, String routeFilterName, String expand, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param expand Expands referenced express route bgp peering resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<RouteFilterInner> getByResourceGroupAsync(String resourceGroupName, String routeFilterName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeFilterName, expand).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param expand Expands referenced express route bgp peering resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String routeFilterName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteFilterInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteFilterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteFilterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter 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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner createOrUpdate(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @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<RouteFilterInner> createOrUpdateAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<RouteFilterInner> createOrUpdateAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName 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 (routeFilterParameters == null) {
+            throw new IllegalArgumentException("Parameter routeFilterParameters is required and cannot be null.");
+        }
+        Validator.validate(routeFilterParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, routeFilterName, this.client.subscriptionId(), routeFilterParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<RouteFilterInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter 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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner beginCreateOrUpdate(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @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<RouteFilterInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<RouteFilterInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeFilterName, routeFilterParameters).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route filter in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param routeFilterParameters Parameters supplied to the create or update route filter operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeFilterName, RouteFilterInner routeFilterParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName 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 (routeFilterParameters == null) {
+            throw new IllegalArgumentException("Parameter routeFilterParameters is required and cannot be null.");
+        }
+        Validator.validate(routeFilterParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, routeFilterName, this.client.subscriptionId(), routeFilterParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteFilterInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteFilterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteFilterInner>() { }.getType())
+                .register(201, new TypeToken<RouteFilterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner updateTags(String resourceGroupName, String routeFilterName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @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<RouteFilterInner> updateTagsAsync(String resourceGroupName, String routeFilterName, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<RouteFilterInner> updateTagsAsync(String resourceGroupName, String routeFilterName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String routeFilterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param tags Resource tags.
+     * @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 RouteFilterInner object if successful.
+     */
+    public RouteFilterInner updateTags(String resourceGroupName, String routeFilterName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param tags Resource tags.
+     * @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<RouteFilterInner> updateTagsAsync(String resourceGroupName, String routeFilterName, Map<String, String> tags, final ServiceCallback<RouteFilterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<RouteFilterInner> updateTagsAsync(String resourceGroupName, String routeFilterName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeFilterName, tags).map(new Func1<ServiceResponse<RouteFilterInner>, RouteFilterInner>() {
+            @Override
+            public RouteFilterInner call(ServiceResponse<RouteFilterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a route filter.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeFilterName The name of the route filter.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteFilterInner object
+     */
+    public Observable<ServiceResponse<RouteFilterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String routeFilterName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeFilterName == null) {
+            throw new IllegalArgumentException("Parameter routeFilterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, routeFilterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteFilterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteFilterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteFilterInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteFilterInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteFilterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteFilterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;RouteFilterInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<RouteFilterInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<RouteFilterInner>(response.body()) {
+            @Override
+            public Page<RouteFilterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<RouteFilterInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<RouteFilterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterInner&gt; object
+     */
+    public Observable<Page<RouteFilterInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<RouteFilterInner>>, Page<RouteFilterInner>>() {
+                @Override
+                public Page<RouteFilterInner> call(ServiceResponse<Page<RouteFilterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterInner>>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(ServiceResponse<Page<RouteFilterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+    ServiceResponse<PageImpl<RouteFilterInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route filters in a 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;RouteFilterInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterInner> list() {
+        ServiceResponse<Page<RouteFilterInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<RouteFilterInner>(response.body()) {
+            @Override
+            public Page<RouteFilterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route filters in a 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<RouteFilterInner>> listAsync(final ListOperationCallback<RouteFilterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterInner&gt; object
+     */
+    public Observable<Page<RouteFilterInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<RouteFilterInner>>, Page<RouteFilterInner>>() {
+                @Override
+                public Page<RouteFilterInner> call(ServiceResponse<Page<RouteFilterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteFilterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterInner>>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(ServiceResponse<Page<RouteFilterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route filters in 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;RouteFilterInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteFilterInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteFilterInner>(response.body()) {
+            @Override
+            public Page<RouteFilterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route filters in 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<RouteFilterInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<RouteFilterInner>> serviceFuture, final ListOperationCallback<RouteFilterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route filters in 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;RouteFilterInner&gt; object
+     */
+    public Observable<Page<RouteFilterInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteFilterInner>>, Page<RouteFilterInner>>() {
+                @Override
+                public Page<RouteFilterInner> call(ServiceResponse<Page<RouteFilterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in 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;RouteFilterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterInner>>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(ServiceResponse<Page<RouteFilterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a resource group.
+     *
+    ServiceResponse<PageImpl<RouteFilterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> 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<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @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;RouteFilterInner&gt; object if successful.
+     */
+    public PagedList<RouteFilterInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteFilterInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteFilterInner>(response.body()) {
+            @Override
+            public Page<RouteFilterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @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<RouteFilterInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<RouteFilterInner>> serviceFuture, final ListOperationCallback<RouteFilterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @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;RouteFilterInner&gt; object
+     */
+    public Observable<Page<RouteFilterInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteFilterInner>>, Page<RouteFilterInner>>() {
+                @Override
+                public Page<RouteFilterInner> call(ServiceResponse<Page<RouteFilterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+     * @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;RouteFilterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteFilterInner>>, Observable<ServiceResponse<Page<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(ServiceResponse<Page<RouteFilterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route filters in a subscription.
+     *
+    ServiceResponse<PageImpl<RouteFilterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteFilterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteFilterInner>>> 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<RouteFilterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteFilterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteFilterInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteFilterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteFilterInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteFilterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteFilterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteImpl.java
new file mode 100644
index 000000000000..69da6dc6ba55
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Route;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.RouteNextHopType;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class RouteImpl extends CreatableUpdatableImpl<Route, RouteInner, RouteImpl> implements Route, Route.Definition, Route.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String routeTableName;
+    private String routeName;
+
+    RouteImpl(String name, NetworkManager manager) {
+        super(name, new RouteInner());
+        this.manager = manager;
+        // Set resource name
+        this.routeName = name;
+        //
+    }
+
+    RouteImpl(RouteInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.routeName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.routeTableName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeTables");
+        this.routeName = IdParsingUtils.getValueFromIdByName(inner.id(), "routes");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Route> createResourceAsync() {
+        RoutesInner client = this.manager().inner().routes();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.routeTableName, this.routeName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<Route> updateResourceAsync() {
+        RoutesInner client = this.manager().inner().routes();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.routeTableName, this.routeName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<RouteInner> getInnerAsync() {
+        RoutesInner client = this.manager().inner().routes();
+        return client.getAsync(this.resourceGroupName, this.routeTableName, this.routeName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String addressPrefix() {
+        return this.inner().addressPrefix();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String nextHopIpAddress() {
+        return this.inner().nextHopIpAddress();
+    }
+
+    @Override
+    public RouteNextHopType nextHopType() {
+        return this.inner().nextHopType();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public RouteImpl withExistingRouteTable(String resourceGroupName, String routeTableName) {
+        this.resourceGroupName = resourceGroupName;
+        this.routeTableName = routeTableName;
+        return this;
+    }
+
+    @Override
+    public RouteImpl withNextHopType(RouteNextHopType nextHopType) {
+        this.inner().withNextHopType(nextHopType);
+        return this;
+    }
+
+    @Override
+    public RouteImpl withAddressPrefix(String addressPrefix) {
+        this.inner().withAddressPrefix(addressPrefix);
+        return this;
+    }
+
+    @Override
+    public RouteImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public RouteImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public RouteImpl withNextHopIpAddress(String nextHopIpAddress) {
+        this.inner().withNextHopIpAddress(nextHopIpAddress);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteInner.java
new file mode 100644
index 000000000000..913f9dbc3b8c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteInner.java
@@ -0,0 +1,161 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.RouteNextHopType;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Route resource.
+ */
+@JsonFlatten
+public class RouteInner extends SubResource {
+    /**
+     * The destination CIDR to which the route applies.
+     */
+    @JsonProperty(value = "properties.addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * The type of Azure hop the packet should be sent to. Possible values
+     * include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet',
+     * 'VirtualAppliance', 'None'.
+     */
+    @JsonProperty(value = "properties.nextHopType", required = true)
+    private RouteNextHopType nextHopType;
+
+    /**
+     * The IP address packets should be forwarded to. Next hop values are only
+     * allowed in routes where the next hop type is VirtualAppliance.
+     */
+    @JsonProperty(value = "properties.nextHopIpAddress")
+    private String nextHopIpAddress;
+
+    /**
+     * The provisioning state of the route resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the destination CIDR to which the route applies.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set the destination CIDR to which the route applies.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the RouteInner object itself.
+     */
+    public RouteInner withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'.
+     *
+     * @return the nextHopType value
+     */
+    public RouteNextHopType nextHopType() {
+        return this.nextHopType;
+    }
+
+    /**
+     * Set the type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'.
+     *
+     * @param nextHopType the nextHopType value to set
+     * @return the RouteInner object itself.
+     */
+    public RouteInner withNextHopType(RouteNextHopType nextHopType) {
+        this.nextHopType = nextHopType;
+        return this;
+    }
+
+    /**
+     * Get the IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance.
+     *
+     * @return the nextHopIpAddress value
+     */
+    public String nextHopIpAddress() {
+        return this.nextHopIpAddress;
+    }
+
+    /**
+     * Set the IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance.
+     *
+     * @param nextHopIpAddress the nextHopIpAddress value to set
+     * @return the RouteInner object itself.
+     */
+    public RouteInner withNextHopIpAddress(String nextHopIpAddress) {
+        this.nextHopIpAddress = nextHopIpAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the route resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the RouteInner object itself.
+     */
+    public RouteInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableImpl.java
new file mode 100644
index 000000000000..4cf5a4badf14
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.RouteTable;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.Route;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class RouteTableImpl extends GroupableResourceCoreImpl<RouteTable, RouteTableInner, RouteTableImpl, NetworkManager> implements RouteTable, RouteTable.Definition, RouteTable.Update {
+    RouteTableImpl(String name, RouteTableInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<RouteTable> createResourceAsync() {
+        RouteTablesInner client = this.manager().inner().routeTables();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<RouteTable> updateResourceAsync() {
+        RouteTablesInner client = this.manager().inner().routeTables();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<RouteTableInner> getInnerAsync() {
+        RouteTablesInner client = this.manager().inner().routeTables();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean disableBgpRoutePropagation() {
+        return this.inner().disableBgpRoutePropagation();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<Route> routes() {
+        List<Route> lst = new ArrayList<Route>();
+        if (this.inner().routes() != null) {
+            for (RouteInner inner : this.inner().routes()) {
+                lst.add( new RouteImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<Subnet> subnets() {
+        List<Subnet> lst = new ArrayList<Subnet>();
+        if (this.inner().subnets() != null) {
+            for (SubnetInner inner : this.inner().subnets()) {
+                lst.add( new SubnetImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public RouteTableImpl withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation) {
+        this.inner().withDisableBgpRoutePropagation(disableBgpRoutePropagation);
+        return this;
+    }
+
+    @Override
+    public RouteTableImpl withRoutes(List<RouteInner> routes) {
+        this.inner().withRoutes(routes);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableInner.java
new file mode 100644
index 000000000000..59b4bd05805b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTableInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Route table resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class RouteTableInner extends Resource {
+    /**
+     * Collection of routes contained within a route table.
+     */
+    @JsonProperty(value = "properties.routes")
+    private List<RouteInner> routes;
+
+    /**
+     * A collection of references to subnets.
+     */
+    @JsonProperty(value = "properties.subnets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubnetInner> subnets;
+
+    /**
+     * Whether to disable the routes learned by BGP on that route table. True
+     * means disable.
+     */
+    @JsonProperty(value = "properties.disableBgpRoutePropagation")
+    private Boolean disableBgpRoutePropagation;
+
+    /**
+     * The provisioning state of the route table resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get collection of routes contained within a route table.
+     *
+     * @return the routes value
+     */
+    public List<RouteInner> routes() {
+        return this.routes;
+    }
+
+    /**
+     * Set collection of routes contained within a route table.
+     *
+     * @param routes the routes value to set
+     * @return the RouteTableInner object itself.
+     */
+    public RouteTableInner withRoutes(List<RouteInner> routes) {
+        this.routes = routes;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to subnets.
+     *
+     * @return the subnets value
+     */
+    public List<SubnetInner> subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * Get whether to disable the routes learned by BGP on that route table. True means disable.
+     *
+     * @return the disableBgpRoutePropagation value
+     */
+    public Boolean disableBgpRoutePropagation() {
+        return this.disableBgpRoutePropagation;
+    }
+
+    /**
+     * Set whether to disable the routes learned by BGP on that route table. True means disable.
+     *
+     * @param disableBgpRoutePropagation the disableBgpRoutePropagation value to set
+     * @return the RouteTableInner object itself.
+     */
+    public RouteTableInner withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation) {
+        this.disableBgpRoutePropagation = disableBgpRoutePropagation;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the route table resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the RouteTableInner object itself.
+     */
+    public RouteTableInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesImpl.java
new file mode 100644
index 000000000000..fb25318aae9c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.RouteTables;
+import com.microsoft.azure.management.network.v2020_04_01.RouteTable;
+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;
+
+class RouteTablesImpl extends GroupableResourcesCoreImpl<RouteTable, RouteTableImpl, RouteTableInner, RouteTablesInner, NetworkManager>  implements RouteTables {
+    protected RouteTablesImpl(NetworkManager manager) {
+        super(manager.inner().routeTables(), manager);
+    }
+
+    @Override
+    protected Observable<RouteTableInner> getInnerAsync(String resourceGroupName, String name) {
+        RouteTablesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        RouteTablesInner 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<RouteTable> listByResourceGroup(String resourceGroupName) {
+        RouteTablesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<RouteTable> listByResourceGroupAsync(String resourceGroupName) {
+        RouteTablesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<RouteTableInner>, Iterable<RouteTableInner>>() {
+            @Override
+            public Iterable<RouteTableInner> call(Page<RouteTableInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteTableInner, RouteTable>() {
+            @Override
+            public RouteTable call(RouteTableInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<RouteTable> list() {
+        RouteTablesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<RouteTable> listAsync() {
+        RouteTablesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<RouteTableInner>, Iterable<RouteTableInner>>() {
+            @Override
+            public Iterable<RouteTableInner> call(Page<RouteTableInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteTableInner, RouteTable>() {
+            @Override
+            public RouteTable call(RouteTableInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public RouteTableImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected RouteTableImpl wrapModel(RouteTableInner inner) {
+        return  new RouteTableImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected RouteTableImpl wrapModel(String name) {
+        return new RouteTableImpl(name, new RouteTableInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesInner.java
new file mode 100644
index 000000000000..d45635159920
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RouteTablesInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 RouteTables.
+ */
+public class RouteTablesInner implements InnerSupportsGet<RouteTableInner>, InnerSupportsDelete<Void>, InnerSupportsListing<RouteTableInner> {
+    /** The Retrofit service to perform REST calls. */
+    private RouteTablesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RouteTablesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RouteTablesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(RouteTablesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RouteTables to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RouteTablesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.RouteTables delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.RouteTables beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.RouteTables getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.RouteTables createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("subscriptionId") String subscriptionId, @Body RouteTableInner 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.network.v2020_04_01.RouteTables beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("subscriptionId") String subscriptionId, @Body RouteTableInner 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.network.v2020_04_01.RouteTables updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.RouteTables listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables")
+        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.network.v2020_04_01.RouteTables list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/routeTables")
+        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.network.v2020_04_01.RouteTables 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.network.v2020_04_01.RouteTables listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 routeTableName) {
+        deleteWithServiceResponseAsync(resourceGroupName, routeTableName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String routeTableName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String routeTableName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 routeTableName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String routeTableName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String routeTableName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, routeTableName, this.client.subscriptionId(), 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 specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 RouteTableInner object if successful.
+     */
+    public RouteTableInner getByResourceGroup(String resourceGroupName, String routeTableName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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<RouteTableInner> getByResourceGroupAsync(String resourceGroupName, String routeTableName, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<RouteTableInner> getByResourceGroupAsync(String resourceGroupName, String routeTableName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<ServiceResponse<RouteTableInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String routeTableName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteTableInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param expand Expands referenced resources.
+     * @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 RouteTableInner object if successful.
+     */
+    public RouteTableInner getByResourceGroup(String resourceGroupName, String routeTableName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param expand Expands referenced resources.
+     * @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<RouteTableInner> getByResourceGroupAsync(String resourceGroupName, String routeTableName, String expand, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<RouteTableInner> getByResourceGroupAsync(String resourceGroupName, String routeTableName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, routeTableName, expand).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<ServiceResponse<RouteTableInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String routeTableName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteTableInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteTableInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteTableInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteTableInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table 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 RouteTableInner object if successful.
+     */
+    public RouteTableInner createOrUpdate(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @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<RouteTableInner> createOrUpdateAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<RouteTableInner> createOrUpdateAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<RouteTableInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, routeTableName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<RouteTableInner>() { }.getType());
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table 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 RouteTableInner object if successful.
+     */
+    public RouteTableInner beginCreateOrUpdate(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @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<RouteTableInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<RouteTableInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, parameters).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or updates a route table in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param parameters Parameters supplied to the create or update route table operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<ServiceResponse<RouteTableInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeTableName, RouteTableInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, routeTableName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteTableInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteTableInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteTableInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteTableInner>() { }.getType())
+                .register(201, new TypeToken<RouteTableInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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 RouteTableInner object if successful.
+     */
+    public RouteTableInner updateTags(String resourceGroupName, String routeTableName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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<RouteTableInner> updateTagsAsync(String resourceGroupName, String routeTableName, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<RouteTableInner> updateTagsAsync(String resourceGroupName, String routeTableName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<ServiceResponse<RouteTableInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String routeTableName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteTableInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param tags Resource tags.
+     * @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 RouteTableInner object if successful.
+     */
+    public RouteTableInner updateTags(String resourceGroupName, String routeTableName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param tags Resource tags.
+     * @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<RouteTableInner> updateTagsAsync(String resourceGroupName, String routeTableName, Map<String, String> tags, final ServiceCallback<RouteTableInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<RouteTableInner> updateTagsAsync(String resourceGroupName, String routeTableName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, routeTableName, tags).map(new Func1<ServiceResponse<RouteTableInner>, RouteTableInner>() {
+            @Override
+            public RouteTableInner call(ServiceResponse<RouteTableInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a route table tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteTableInner object
+     */
+    public Observable<ServiceResponse<RouteTableInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String routeTableName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteTableInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteTableInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteTableInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteTableInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteTableInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteTableInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;RouteTableInner&gt; object if successful.
+     */
+    public PagedList<RouteTableInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<RouteTableInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<RouteTableInner>(response.body()) {
+            @Override
+            public Page<RouteTableInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<RouteTableInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<RouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteTableInner&gt; object
+     */
+    public Observable<Page<RouteTableInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<RouteTableInner>>, Page<RouteTableInner>>() {
+                @Override
+                public Page<RouteTableInner> call(ServiceResponse<Page<RouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<RouteTableInner>>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(ServiceResponse<Page<RouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+    ServiceResponse<PageImpl<RouteTableInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteTableInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteTableInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route tables in a 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;RouteTableInner&gt; object if successful.
+     */
+    public PagedList<RouteTableInner> list() {
+        ServiceResponse<Page<RouteTableInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<RouteTableInner>(response.body()) {
+            @Override
+            public Page<RouteTableInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route tables in a 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<RouteTableInner>> listAsync(final ListOperationCallback<RouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteTableInner&gt; object
+     */
+    public Observable<Page<RouteTableInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<RouteTableInner>>, Page<RouteTableInner>>() {
+                @Override
+                public Page<RouteTableInner> call(ServiceResponse<Page<RouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<RouteTableInner>>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(ServiceResponse<Page<RouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteTableInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteTableInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route tables in 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;RouteTableInner&gt; object if successful.
+     */
+    public PagedList<RouteTableInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteTableInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteTableInner>(response.body()) {
+            @Override
+            public Page<RouteTableInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route tables in 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<RouteTableInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<RouteTableInner>> serviceFuture, final ListOperationCallback<RouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route tables in 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;RouteTableInner&gt; object
+     */
+    public Observable<Page<RouteTableInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteTableInner>>, Page<RouteTableInner>>() {
+                @Override
+                public Page<RouteTableInner> call(ServiceResponse<Page<RouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in 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;RouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteTableInner>>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(ServiceResponse<Page<RouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a resource group.
+     *
+    ServiceResponse<PageImpl<RouteTableInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> 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<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteTableInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteTableInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @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;RouteTableInner&gt; object if successful.
+     */
+    public PagedList<RouteTableInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteTableInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteTableInner>(response.body()) {
+            @Override
+            public Page<RouteTableInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @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<RouteTableInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<RouteTableInner>> serviceFuture, final ListOperationCallback<RouteTableInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @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;RouteTableInner&gt; object
+     */
+    public Observable<Page<RouteTableInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteTableInner>>, Page<RouteTableInner>>() {
+                @Override
+                public Page<RouteTableInner> call(ServiceResponse<Page<RouteTableInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+     * @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;RouteTableInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteTableInner>>, Observable<ServiceResponse<Page<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(ServiceResponse<Page<RouteTableInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all route tables in a subscription.
+     *
+    ServiceResponse<PageImpl<RouteTableInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteTableInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteTableInner>>> 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<RouteTableInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteTableInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteTableInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteTableInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteTableInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteTableInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteTableInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesImpl.java
new file mode 100644
index 000000000000..87ef3028d4ed
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.Routes;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.Route;
+
+class RoutesImpl extends WrapperImpl<RoutesInner> implements Routes {
+    private final NetworkManager manager;
+
+    RoutesImpl(NetworkManager manager) {
+        super(manager.inner().routes());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public RouteImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private RouteImpl wrapModel(RouteInner inner) {
+        return  new RouteImpl(inner, manager());
+    }
+
+    private RouteImpl wrapModel(String name) {
+        return new RouteImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<Route> listAsync(final String resourceGroupName, final String routeTableName) {
+        RoutesInner client = this.inner();
+        return client.listAsync(resourceGroupName, routeTableName)
+        .flatMapIterable(new Func1<Page<RouteInner>, Iterable<RouteInner>>() {
+            @Override
+            public Iterable<RouteInner> call(Page<RouteInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RouteInner, Route>() {
+            @Override
+            public Route call(RouteInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<Route> getAsync(String resourceGroupName, String routeTableName, String routeName) {
+        RoutesInner client = this.inner();
+        return client.getAsync(resourceGroupName, routeTableName, routeName)
+        .flatMap(new Func1<RouteInner, Observable<Route>>() {
+            @Override
+            public Observable<Route> call(RouteInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Route)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String routeTableName, String routeName) {
+        RoutesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, routeTableName, routeName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesInner.java
new file mode 100644
index 000000000000..ee096706a442
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/RoutesInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 Routes.
+ */
+public class RoutesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RoutesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RoutesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RoutesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(RoutesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Routes to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RoutesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.Routes delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("routeName") String routeName, @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.network.v2020_04_01.Routes beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("routeName") String routeName, @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.network.v2020_04_01.Routes get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("routeName") String routeName, @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.network.v2020_04_01.Routes createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("routeName") String routeName, @Path("subscriptionId") String subscriptionId, @Body RouteInner routeParameters, @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.network.v2020_04_01.Routes beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @Path("routeName") String routeName, @Path("subscriptionId") String subscriptionId, @Body RouteInner routeParameters, @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.network.v2020_04_01.Routes list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.Routes listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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 routeTableName, String routeName) {
+        deleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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 routeTableName, String routeName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String routeTableName, String routeName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String routeTableName, String routeName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeName == null) {
+            throw new IllegalArgumentException("Parameter routeName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, routeTableName, routeName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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 routeTableName, String routeName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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 routeTableName, String routeName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String routeTableName, String routeName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String routeTableName, String routeName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeName == null) {
+            throw new IllegalArgumentException("Parameter routeName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, routeTableName, routeName, this.client.subscriptionId(), 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 specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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 RouteInner object if successful.
+     */
+    public RouteInner get(String resourceGroupName, String routeTableName, String routeName) {
+        return getWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @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<RouteInner> getAsync(String resourceGroupName, String routeTableName, String routeName, final ServiceCallback<RouteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, routeTableName, routeName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteInner object
+     */
+    public Observable<RouteInner> getAsync(String resourceGroupName, String routeTableName, String routeName) {
+        return getWithServiceResponseAsync(resourceGroupName, routeTableName, routeName).map(new Func1<ServiceResponse<RouteInner>, RouteInner>() {
+            @Override
+            public RouteInner call(ServiceResponse<RouteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified route from a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteInner object
+     */
+    public Observable<ServiceResponse<RouteInner>> getWithServiceResponseAsync(String resourceGroupName, String routeTableName, String routeName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeName == null) {
+            throw new IllegalArgumentException("Parameter routeName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, routeTableName, routeName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route 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 RouteInner object if successful.
+     */
+    public RouteInner createOrUpdate(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @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<RouteInner> createOrUpdateAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters, final ServiceCallback<RouteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<RouteInner> createOrUpdateAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters).map(new Func1<ServiceResponse<RouteInner>, RouteInner>() {
+            @Override
+            public RouteInner call(ServiceResponse<RouteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<RouteInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeName == null) {
+            throw new IllegalArgumentException("Parameter routeName 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 (routeParameters == null) {
+            throw new IllegalArgumentException("Parameter routeParameters is required and cannot be null.");
+        }
+        Validator.validate(routeParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, routeTableName, routeName, this.client.subscriptionId(), routeParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<RouteInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route 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 RouteInner object if successful.
+     */
+    public RouteInner beginCreateOrUpdate(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @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<RouteInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters, final ServiceCallback<RouteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteInner object
+     */
+    public Observable<RouteInner> beginCreateOrUpdateAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, routeTableName, routeName, routeParameters).map(new Func1<ServiceResponse<RouteInner>, RouteInner>() {
+            @Override
+            public RouteInner call(ServiceResponse<RouteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a route in the specified route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @param routeName The name of the route.
+     * @param routeParameters Parameters supplied to the create or update route operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RouteInner object
+     */
+    public Observable<ServiceResponse<RouteInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String routeTableName, String routeName, RouteInner routeParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (routeName == null) {
+            throw new IllegalArgumentException("Parameter routeName 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 (routeParameters == null) {
+            throw new IllegalArgumentException("Parameter routeParameters is required and cannot be null.");
+        }
+        Validator.validate(routeParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, routeTableName, routeName, this.client.subscriptionId(), routeParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RouteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RouteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RouteInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RouteInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RouteInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RouteInner>() { }.getType())
+                .register(201, new TypeToken<RouteInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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;RouteInner&gt; object if successful.
+     */
+    public PagedList<RouteInner> list(final String resourceGroupName, final String routeTableName) {
+        ServiceResponse<Page<RouteInner>> response = listSinglePageAsync(resourceGroupName, routeTableName).toBlocking().single();
+        return new PagedList<RouteInner>(response.body()) {
+            @Override
+            public Page<RouteInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @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<RouteInner>> listAsync(final String resourceGroupName, final String routeTableName, final ListOperationCallback<RouteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, routeTableName),
+            new Func1<String, Observable<ServiceResponse<Page<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteInner&gt; object
+     */
+    public Observable<Page<RouteInner>> listAsync(final String resourceGroupName, final String routeTableName) {
+        return listWithServiceResponseAsync(resourceGroupName, routeTableName)
+            .map(new Func1<ServiceResponse<Page<RouteInner>>, Page<RouteInner>>() {
+                @Override
+                public Page<RouteInner> call(ServiceResponse<Page<RouteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RouteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String routeTableName) {
+        return listSinglePageAsync(resourceGroupName, routeTableName)
+            .concatMap(new Func1<ServiceResponse<Page<RouteInner>>, Observable<ServiceResponse<Page<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(ServiceResponse<Page<RouteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+    ServiceResponse<PageImpl<RouteInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RouteInner>> * @param routeTableName The name of the route table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteInner>>> listSinglePageAsync(final String resourceGroupName, final String routeTableName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, routeTableName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @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;RouteInner&gt; object if successful.
+     */
+    public PagedList<RouteInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<RouteInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RouteInner>(response.body()) {
+            @Override
+            public Page<RouteInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @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<RouteInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<RouteInner>> serviceFuture, final ListOperationCallback<RouteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @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;RouteInner&gt; object
+     */
+    public Observable<Page<RouteInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RouteInner>>, Page<RouteInner>>() {
+                @Override
+                public Page<RouteInner> call(ServiceResponse<Page<RouteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+     * @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;RouteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RouteInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RouteInner>>, Observable<ServiceResponse<Page<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(ServiceResponse<Page<RouteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all routes in a route table.
+     *
+    ServiceResponse<PageImpl<RouteInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RouteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RouteInner>>> 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<RouteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RouteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RouteInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RouteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RouteInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RouteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RouteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultImpl.java
new file mode 100644
index 000000000000..04684d6671a9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.SecurityGroupViewResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityGroupNetworkInterface;
+
+class SecurityGroupViewResultImpl extends WrapperImpl<SecurityGroupViewResultInner> implements SecurityGroupViewResult {
+    private final NetworkManager manager;
+    SecurityGroupViewResultImpl(SecurityGroupViewResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<SecurityGroupNetworkInterface> networkInterfaces() {
+        return this.inner().networkInterfaces();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultInner.java
new file mode 100644
index 000000000000..fc41c6973391
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityGroupViewResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityGroupNetworkInterface;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The information about security rules applied to the specified VM.
+ */
+public class SecurityGroupViewResultInner {
+    /**
+     * List of network interfaces on the specified VM.
+     */
+    @JsonProperty(value = "networkInterfaces")
+    private List<SecurityGroupNetworkInterface> networkInterfaces;
+
+    /**
+     * Get list of network interfaces on the specified VM.
+     *
+     * @return the networkInterfaces value
+     */
+    public List<SecurityGroupNetworkInterface> networkInterfaces() {
+        return this.networkInterfaces;
+    }
+
+    /**
+     * Set list of network interfaces on the specified VM.
+     *
+     * @param networkInterfaces the networkInterfaces value to set
+     * @return the SecurityGroupViewResultInner object itself.
+     */
+    public SecurityGroupViewResultInner withNetworkInterfaces(List<SecurityGroupNetworkInterface> networkInterfaces) {
+        this.networkInterfaces = networkInterfaces;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderImpl.java
new file mode 100644
index 000000000000..b7ba39e48644
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderImpl.java
@@ -0,0 +1,87 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProvider;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityProviderName;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviderConnectionStatus;
+import com.microsoft.azure.SubResource;
+
+class SecurityPartnerProviderImpl extends GroupableResourceCoreImpl<SecurityPartnerProvider, SecurityPartnerProviderInner, SecurityPartnerProviderImpl, NetworkManager> implements SecurityPartnerProvider, SecurityPartnerProvider.Definition, SecurityPartnerProvider.Update {
+    SecurityPartnerProviderImpl(String name, SecurityPartnerProviderInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<SecurityPartnerProvider> createResourceAsync() {
+        SecurityPartnerProvidersInner client = this.manager().inner().securityPartnerProviders();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<SecurityPartnerProvider> updateResourceAsync() {
+        SecurityPartnerProvidersInner client = this.manager().inner().securityPartnerProviders();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SecurityPartnerProviderInner> getInnerAsync() {
+        SecurityPartnerProvidersInner client = this.manager().inner().securityPartnerProviders();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public SecurityPartnerProviderConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SecurityProviderName securityProviderName() {
+        return this.inner().securityProviderName();
+    }
+
+    @Override
+    public SubResource virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public SecurityPartnerProviderImpl withSecurityProviderName(SecurityProviderName securityProviderName) {
+        this.inner().withSecurityProviderName(securityProviderName);
+        return this;
+    }
+
+    @Override
+    public SecurityPartnerProviderImpl withVirtualHub(SubResource virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderInner.java
new file mode 100644
index 000000000000..aad236cfbaf1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProviderInner.java
@@ -0,0 +1,153 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityProviderName;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviderConnectionStatus;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Security Partner Provider resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class SecurityPartnerProviderInner extends Resource {
+    /**
+     * The provisioning state of the Security Partner Provider resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The security provider name. Possible values include: 'ZScaler', 'IBoss',
+     * 'Checkpoint'.
+     */
+    @JsonProperty(value = "properties.securityProviderName")
+    private SecurityProviderName securityProviderName;
+
+    /**
+     * The connection status with the Security Partner Provider. Possible
+     * values include: 'Unknown', 'PartiallyConnected', 'Connected',
+     * 'NotConnected'.
+     */
+    @JsonProperty(value = "properties.connectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private SecurityPartnerProviderConnectionStatus connectionStatus;
+
+    /**
+     * The virtualHub to which the Security Partner Provider belongs.
+     */
+    @JsonProperty(value = "properties.virtualHub")
+    private SubResource virtualHub;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the provisioning state of the Security Partner Provider resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the security provider name. Possible values include: 'ZScaler', 'IBoss', 'Checkpoint'.
+     *
+     * @return the securityProviderName value
+     */
+    public SecurityProviderName securityProviderName() {
+        return this.securityProviderName;
+    }
+
+    /**
+     * Set the security provider name. Possible values include: 'ZScaler', 'IBoss', 'Checkpoint'.
+     *
+     * @param securityProviderName the securityProviderName value to set
+     * @return the SecurityPartnerProviderInner object itself.
+     */
+    public SecurityPartnerProviderInner withSecurityProviderName(SecurityProviderName securityProviderName) {
+        this.securityProviderName = securityProviderName;
+        return this;
+    }
+
+    /**
+     * Get the connection status with the Security Partner Provider. Possible values include: 'Unknown', 'PartiallyConnected', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public SecurityPartnerProviderConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Get the virtualHub to which the Security Partner Provider belongs.
+     *
+     * @return the virtualHub value
+     */
+    public SubResource virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the virtualHub to which the Security Partner Provider belongs.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the SecurityPartnerProviderInner object itself.
+     */
+    public SecurityPartnerProviderInner withVirtualHub(SubResource virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the SecurityPartnerProviderInner object itself.
+     */
+    public SecurityPartnerProviderInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersImpl.java
new file mode 100644
index 000000000000..3c15bfb20c86
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviders;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProvider;
+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;
+
+class SecurityPartnerProvidersImpl extends GroupableResourcesCoreImpl<SecurityPartnerProvider, SecurityPartnerProviderImpl, SecurityPartnerProviderInner, SecurityPartnerProvidersInner, NetworkManager>  implements SecurityPartnerProviders {
+    protected SecurityPartnerProvidersImpl(NetworkManager manager) {
+        super(manager.inner().securityPartnerProviders(), manager);
+    }
+
+    @Override
+    protected Observable<SecurityPartnerProviderInner> getInnerAsync(String resourceGroupName, String name) {
+        SecurityPartnerProvidersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        SecurityPartnerProvidersInner 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<SecurityPartnerProvider> listByResourceGroup(String resourceGroupName) {
+        SecurityPartnerProvidersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<SecurityPartnerProvider> listByResourceGroupAsync(String resourceGroupName) {
+        SecurityPartnerProvidersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<SecurityPartnerProviderInner>, Iterable<SecurityPartnerProviderInner>>() {
+            @Override
+            public Iterable<SecurityPartnerProviderInner> call(Page<SecurityPartnerProviderInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SecurityPartnerProviderInner, SecurityPartnerProvider>() {
+            @Override
+            public SecurityPartnerProvider call(SecurityPartnerProviderInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<SecurityPartnerProvider> list() {
+        SecurityPartnerProvidersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<SecurityPartnerProvider> listAsync() {
+        SecurityPartnerProvidersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<SecurityPartnerProviderInner>, Iterable<SecurityPartnerProviderInner>>() {
+            @Override
+            public Iterable<SecurityPartnerProviderInner> call(Page<SecurityPartnerProviderInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SecurityPartnerProviderInner, SecurityPartnerProvider>() {
+            @Override
+            public SecurityPartnerProvider call(SecurityPartnerProviderInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public SecurityPartnerProviderImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected SecurityPartnerProviderImpl wrapModel(SecurityPartnerProviderInner inner) {
+        return  new SecurityPartnerProviderImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected SecurityPartnerProviderImpl wrapModel(String name) {
+        return new SecurityPartnerProviderImpl(name, new SecurityPartnerProviderInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersInner.java
new file mode 100644
index 000000000000..b7f9ac8f1c6f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityPartnerProvidersInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 SecurityPartnerProviders.
+ */
+public class SecurityPartnerProvidersInner implements InnerSupportsGet<SecurityPartnerProviderInner>, InnerSupportsDelete<Void>, InnerSupportsListing<SecurityPartnerProviderInner> {
+    /** The Retrofit service to perform REST calls. */
+    private SecurityPartnerProvidersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of SecurityPartnerProvidersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SecurityPartnerProvidersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(SecurityPartnerProvidersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SecurityPartnerProviders to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SecurityPartnerProvidersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviders delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @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.network.v2020_04_01.SecurityPartnerProviders beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @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.network.v2020_04_01.SecurityPartnerProviders getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @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.network.v2020_04_01.SecurityPartnerProviders createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @Path("subscriptionId") String subscriptionId, @Body SecurityPartnerProviderInner 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.network.v2020_04_01.SecurityPartnerProviders beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @Path("subscriptionId") String subscriptionId, @Body SecurityPartnerProviderInner 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.network.v2020_04_01.SecurityPartnerProviders updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("securityPartnerProviderName") String securityPartnerProviderName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.SecurityPartnerProviders listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders")
+        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.network.v2020_04_01.SecurityPartnerProviders list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/securityPartnerProviders")
+        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.network.v2020_04_01.SecurityPartnerProviders 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.network.v2020_04_01.SecurityPartnerProviders listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 securityPartnerProviderName) {
+        deleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 securityPartnerProviderName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String securityPartnerProviderName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 securityPartnerProviderName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 securityPartnerProviderName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String securityPartnerProviderName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), 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 specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 SecurityPartnerProviderInner object if successful.
+     */
+    public SecurityPartnerProviderInner getByResourceGroup(String resourceGroupName, String securityPartnerProviderName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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<SecurityPartnerProviderInner> getByResourceGroupAsync(String resourceGroupName, String securityPartnerProviderName, final ServiceCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<SecurityPartnerProviderInner> getByResourceGroupAsync(String resourceGroupName, String securityPartnerProviderName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).map(new Func1<ServiceResponse<SecurityPartnerProviderInner>, SecurityPartnerProviderInner>() {
+            @Override
+            public SecurityPartnerProviderInner call(ServiceResponse<SecurityPartnerProviderInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<ServiceResponse<SecurityPartnerProviderInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityPartnerProviderInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityPartnerProviderInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityPartnerProviderInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityPartnerProviderInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityPartnerProviderInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityPartnerProviderInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider 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 SecurityPartnerProviderInner object if successful.
+     */
+    public SecurityPartnerProviderInner createOrUpdate(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @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<SecurityPartnerProviderInner> createOrUpdateAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters, final ServiceCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SecurityPartnerProviderInner> createOrUpdateAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters).map(new Func1<ServiceResponse<SecurityPartnerProviderInner>, SecurityPartnerProviderInner>() {
+            @Override
+            public SecurityPartnerProviderInner call(ServiceResponse<SecurityPartnerProviderInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<SecurityPartnerProviderInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<SecurityPartnerProviderInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider 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 SecurityPartnerProviderInner object if successful.
+     */
+    public SecurityPartnerProviderInner beginCreateOrUpdate(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @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<SecurityPartnerProviderInner> beginCreateOrUpdateAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters, final ServiceCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<SecurityPartnerProviderInner> beginCreateOrUpdateAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, parameters).map(new Func1<ServiceResponse<SecurityPartnerProviderInner>, SecurityPartnerProviderInner>() {
+            @Override
+            public SecurityPartnerProviderInner call(ServiceResponse<SecurityPartnerProviderInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Security Partner Provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param parameters Parameters supplied to the create or update Security Partner Provider operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<ServiceResponse<SecurityPartnerProviderInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName, SecurityPartnerProviderInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityPartnerProviderInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityPartnerProviderInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityPartnerProviderInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityPartnerProviderInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityPartnerProviderInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityPartnerProviderInner>() { }.getType())
+                .register(201, new TypeToken<SecurityPartnerProviderInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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 SecurityPartnerProviderInner object if successful.
+     */
+    public SecurityPartnerProviderInner updateTags(String resourceGroupName, String securityPartnerProviderName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @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<SecurityPartnerProviderInner> updateTagsAsync(String resourceGroupName, String securityPartnerProviderName, final ServiceCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<SecurityPartnerProviderInner> updateTagsAsync(String resourceGroupName, String securityPartnerProviderName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName).map(new Func1<ServiceResponse<SecurityPartnerProviderInner>, SecurityPartnerProviderInner>() {
+            @Override
+            public SecurityPartnerProviderInner call(ServiceResponse<SecurityPartnerProviderInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<ServiceResponse<SecurityPartnerProviderInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityPartnerProviderInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityPartnerProviderInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityPartnerProviderInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param tags Resource tags.
+     * @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 SecurityPartnerProviderInner object if successful.
+     */
+    public SecurityPartnerProviderInner updateTags(String resourceGroupName, String securityPartnerProviderName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param tags Resource tags.
+     * @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<SecurityPartnerProviderInner> updateTagsAsync(String resourceGroupName, String securityPartnerProviderName, Map<String, String> tags, final ServiceCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<SecurityPartnerProviderInner> updateTagsAsync(String resourceGroupName, String securityPartnerProviderName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, securityPartnerProviderName, tags).map(new Func1<ServiceResponse<SecurityPartnerProviderInner>, SecurityPartnerProviderInner>() {
+            @Override
+            public SecurityPartnerProviderInner call(ServiceResponse<SecurityPartnerProviderInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a Security Partner Provider resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param securityPartnerProviderName The name of the Security Partner Provider.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityPartnerProviderInner object
+     */
+    public Observable<ServiceResponse<SecurityPartnerProviderInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String securityPartnerProviderName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (securityPartnerProviderName == null) {
+            throw new IllegalArgumentException("Parameter securityPartnerProviderName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, securityPartnerProviderName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityPartnerProviderInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityPartnerProviderInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityPartnerProviderInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityPartnerProviderInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityPartnerProviderInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityPartnerProviderInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;SecurityPartnerProviderInner&gt; object if successful.
+     */
+    public PagedList<SecurityPartnerProviderInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<SecurityPartnerProviderInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<SecurityPartnerProviderInner>(response.body()) {
+            @Override
+            public Page<SecurityPartnerProviderInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<SecurityPartnerProviderInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<Page<SecurityPartnerProviderInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Page<SecurityPartnerProviderInner>>() {
+                @Override
+                public Page<SecurityPartnerProviderInner> call(ServiceResponse<Page<SecurityPartnerProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(ServiceResponse<Page<SecurityPartnerProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+    ServiceResponse<PageImpl<SecurityPartnerProviderInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityPartnerProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityPartnerProviderInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityPartnerProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityPartnerProviderInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityPartnerProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityPartnerProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a 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;SecurityPartnerProviderInner&gt; object if successful.
+     */
+    public PagedList<SecurityPartnerProviderInner> list() {
+        ServiceResponse<Page<SecurityPartnerProviderInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<SecurityPartnerProviderInner>(response.body()) {
+            @Override
+            public Page<SecurityPartnerProviderInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a 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<SecurityPartnerProviderInner>> listAsync(final ListOperationCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<Page<SecurityPartnerProviderInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Page<SecurityPartnerProviderInner>>() {
+                @Override
+                public Page<SecurityPartnerProviderInner> call(ServiceResponse<Page<SecurityPartnerProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(ServiceResponse<Page<SecurityPartnerProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityPartnerProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityPartnerProviderInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityPartnerProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityPartnerProviderInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityPartnerProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityPartnerProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Security Partner Providers in 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;SecurityPartnerProviderInner&gt; object if successful.
+     */
+    public PagedList<SecurityPartnerProviderInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<SecurityPartnerProviderInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SecurityPartnerProviderInner>(response.body()) {
+            @Override
+            public Page<SecurityPartnerProviderInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Security Partner Providers in 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<SecurityPartnerProviderInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<SecurityPartnerProviderInner>> serviceFuture, final ListOperationCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Security Partner Providers in 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;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<Page<SecurityPartnerProviderInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Page<SecurityPartnerProviderInner>>() {
+                @Override
+                public Page<SecurityPartnerProviderInner> call(ServiceResponse<Page<SecurityPartnerProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Security Partner Providers in 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;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(ServiceResponse<Page<SecurityPartnerProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Security Partner Providers in a resource group.
+     *
+    ServiceResponse<PageImpl<SecurityPartnerProviderInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityPartnerProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> 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<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityPartnerProviderInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityPartnerProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityPartnerProviderInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityPartnerProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityPartnerProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @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;SecurityPartnerProviderInner&gt; object if successful.
+     */
+    public PagedList<SecurityPartnerProviderInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<SecurityPartnerProviderInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SecurityPartnerProviderInner>(response.body()) {
+            @Override
+            public Page<SecurityPartnerProviderInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @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<SecurityPartnerProviderInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<SecurityPartnerProviderInner>> serviceFuture, final ListOperationCallback<SecurityPartnerProviderInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @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;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<Page<SecurityPartnerProviderInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Page<SecurityPartnerProviderInner>>() {
+                @Override
+                public Page<SecurityPartnerProviderInner> call(ServiceResponse<Page<SecurityPartnerProviderInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+     * @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;SecurityPartnerProviderInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityPartnerProviderInner>>, Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(ServiceResponse<Page<SecurityPartnerProviderInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Security Partner Providers in a subscription.
+     *
+    ServiceResponse<PageImpl<SecurityPartnerProviderInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityPartnerProviderInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> 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<SecurityPartnerProviderInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityPartnerProviderInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityPartnerProviderInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityPartnerProviderInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityPartnerProviderInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityPartnerProviderInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityPartnerProviderInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRuleInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRuleInner.java
new file mode 100644
index 000000000000..3673ac858a89
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRuleInner.java
@@ -0,0 +1,486 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleProtocol;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleAccess;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRuleDirection;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Network security rule.
+ */
+@JsonFlatten
+public class SecurityRuleInner extends SubResource {
+    /**
+     * A description for this rule. Restricted to 140 chars.
+     */
+    @JsonProperty(value = "properties.description")
+    private String description;
+
+    /**
+     * Network protocol this rule applies to. Possible values include: 'Tcp',
+     * 'Udp', 'Icmp', 'Esp', '*', 'Ah'.
+     */
+    @JsonProperty(value = "properties.protocol", required = true)
+    private SecurityRuleProtocol protocol;
+
+    /**
+     * The source port or range. Integer or range between 0 and 65535. Asterisk
+     * '*' can also be used to match all ports.
+     */
+    @JsonProperty(value = "properties.sourcePortRange")
+    private String sourcePortRange;
+
+    /**
+     * The destination port or range. Integer or range between 0 and 65535.
+     * Asterisk '*' can also be used to match all ports.
+     */
+    @JsonProperty(value = "properties.destinationPortRange")
+    private String destinationPortRange;
+
+    /**
+     * The CIDR or source IP range. Asterisk '*' can also be used to match all
+     * source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer'
+     * and 'Internet' can also be used. If this is an ingress rule, specifies
+     * where network traffic originates from.
+     */
+    @JsonProperty(value = "properties.sourceAddressPrefix")
+    private String sourceAddressPrefix;
+
+    /**
+     * The CIDR or source IP ranges.
+     */
+    @JsonProperty(value = "properties.sourceAddressPrefixes")
+    private List<String> sourceAddressPrefixes;
+
+    /**
+     * The application security group specified as source.
+     */
+    @JsonProperty(value = "properties.sourceApplicationSecurityGroups")
+    private List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups;
+
+    /**
+     * The destination address prefix. CIDR or destination IP range. Asterisk
+     * '*' can also be used to match all source IPs. Default tags such as
+     * 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used.
+     */
+    @JsonProperty(value = "properties.destinationAddressPrefix")
+    private String destinationAddressPrefix;
+
+    /**
+     * The destination address prefixes. CIDR or destination IP ranges.
+     */
+    @JsonProperty(value = "properties.destinationAddressPrefixes")
+    private List<String> destinationAddressPrefixes;
+
+    /**
+     * The application security group specified as destination.
+     */
+    @JsonProperty(value = "properties.destinationApplicationSecurityGroups")
+    private List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups;
+
+    /**
+     * The source port ranges.
+     */
+    @JsonProperty(value = "properties.sourcePortRanges")
+    private List<String> sourcePortRanges;
+
+    /**
+     * The destination port ranges.
+     */
+    @JsonProperty(value = "properties.destinationPortRanges")
+    private List<String> destinationPortRanges;
+
+    /**
+     * The network traffic is allowed or denied. Possible values include:
+     * 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "properties.access", required = true)
+    private SecurityRuleAccess access;
+
+    /**
+     * The priority of the rule. The value can be between 100 and 4096. The
+     * priority number must be unique for each rule in the collection. The
+     * lower the priority number, the higher the priority of the rule.
+     */
+    @JsonProperty(value = "properties.priority")
+    private Integer priority;
+
+    /**
+     * The direction of the rule. The direction specifies if rule will be
+     * evaluated on incoming or outgoing traffic. Possible values include:
+     * 'Inbound', 'Outbound'.
+     */
+    @JsonProperty(value = "properties.direction", required = true)
+    private SecurityRuleDirection direction;
+
+    /**
+     * The provisioning state of the security rule resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get a description for this rule. Restricted to 140 chars.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set a description for this rule. Restricted to 140 chars.
+     *
+     * @param description the description value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get network protocol this rule applies to. Possible values include: 'Tcp', 'Udp', 'Icmp', 'Esp', '*', 'Ah'.
+     *
+     * @return the protocol value
+     */
+    public SecurityRuleProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set network protocol this rule applies to. Possible values include: 'Tcp', 'Udp', 'Icmp', 'Esp', '*', 'Ah'.
+     *
+     * @param protocol the protocol value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports.
+     *
+     * @return the sourcePortRange value
+     */
+    public String sourcePortRange() {
+        return this.sourcePortRange;
+    }
+
+    /**
+     * Set the source port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports.
+     *
+     * @param sourcePortRange the sourcePortRange value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withSourcePortRange(String sourcePortRange) {
+        this.sourcePortRange = sourcePortRange;
+        return this;
+    }
+
+    /**
+     * Get the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports.
+     *
+     * @return the destinationPortRange value
+     */
+    public String destinationPortRange() {
+        return this.destinationPortRange;
+    }
+
+    /**
+     * Set the destination port or range. Integer or range between 0 and 65535. Asterisk '*' can also be used to match all ports.
+     *
+     * @param destinationPortRange the destinationPortRange value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDestinationPortRange(String destinationPortRange) {
+        this.destinationPortRange = destinationPortRange;
+        return this;
+    }
+
+    /**
+     * Get the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from.
+     *
+     * @return the sourceAddressPrefix value
+     */
+    public String sourceAddressPrefix() {
+        return this.sourceAddressPrefix;
+    }
+
+    /**
+     * Set the CIDR or source IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from.
+     *
+     * @param sourceAddressPrefix the sourceAddressPrefix value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withSourceAddressPrefix(String sourceAddressPrefix) {
+        this.sourceAddressPrefix = sourceAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the CIDR or source IP ranges.
+     *
+     * @return the sourceAddressPrefixes value
+     */
+    public List<String> sourceAddressPrefixes() {
+        return this.sourceAddressPrefixes;
+    }
+
+    /**
+     * Set the CIDR or source IP ranges.
+     *
+     * @param sourceAddressPrefixes the sourceAddressPrefixes value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withSourceAddressPrefixes(List<String> sourceAddressPrefixes) {
+        this.sourceAddressPrefixes = sourceAddressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the application security group specified as source.
+     *
+     * @return the sourceApplicationSecurityGroups value
+     */
+    public List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups() {
+        return this.sourceApplicationSecurityGroups;
+    }
+
+    /**
+     * Set the application security group specified as source.
+     *
+     * @param sourceApplicationSecurityGroups the sourceApplicationSecurityGroups value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups) {
+        this.sourceApplicationSecurityGroups = sourceApplicationSecurityGroups;
+        return this;
+    }
+
+    /**
+     * Get the destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used.
+     *
+     * @return the destinationAddressPrefix value
+     */
+    public String destinationAddressPrefix() {
+        return this.destinationAddressPrefix;
+    }
+
+    /**
+     * Set the destination address prefix. CIDR or destination IP range. Asterisk '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used.
+     *
+     * @param destinationAddressPrefix the destinationAddressPrefix value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDestinationAddressPrefix(String destinationAddressPrefix) {
+        this.destinationAddressPrefix = destinationAddressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the destination address prefixes. CIDR or destination IP ranges.
+     *
+     * @return the destinationAddressPrefixes value
+     */
+    public List<String> destinationAddressPrefixes() {
+        return this.destinationAddressPrefixes;
+    }
+
+    /**
+     * Set the destination address prefixes. CIDR or destination IP ranges.
+     *
+     * @param destinationAddressPrefixes the destinationAddressPrefixes value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDestinationAddressPrefixes(List<String> destinationAddressPrefixes) {
+        this.destinationAddressPrefixes = destinationAddressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the application security group specified as destination.
+     *
+     * @return the destinationApplicationSecurityGroups value
+     */
+    public List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups() {
+        return this.destinationApplicationSecurityGroups;
+    }
+
+    /**
+     * Set the application security group specified as destination.
+     *
+     * @param destinationApplicationSecurityGroups the destinationApplicationSecurityGroups value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups) {
+        this.destinationApplicationSecurityGroups = destinationApplicationSecurityGroups;
+        return this;
+    }
+
+    /**
+     * Get the source port ranges.
+     *
+     * @return the sourcePortRanges value
+     */
+    public List<String> sourcePortRanges() {
+        return this.sourcePortRanges;
+    }
+
+    /**
+     * Set the source port ranges.
+     *
+     * @param sourcePortRanges the sourcePortRanges value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withSourcePortRanges(List<String> sourcePortRanges) {
+        this.sourcePortRanges = sourcePortRanges;
+        return this;
+    }
+
+    /**
+     * Get the destination port ranges.
+     *
+     * @return the destinationPortRanges value
+     */
+    public List<String> destinationPortRanges() {
+        return this.destinationPortRanges;
+    }
+
+    /**
+     * Set the destination port ranges.
+     *
+     * @param destinationPortRanges the destinationPortRanges value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDestinationPortRanges(List<String> destinationPortRanges) {
+        this.destinationPortRanges = destinationPortRanges;
+        return this;
+    }
+
+    /**
+     * Get the network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the access value
+     */
+    public SecurityRuleAccess access() {
+        return this.access;
+    }
+
+    /**
+     * Set the network traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param access the access value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withAccess(SecurityRuleAccess access) {
+        this.access = access;
+        return this;
+    }
+
+    /**
+     * Get the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule.
+     *
+     * @param priority the priority value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @return the direction value
+     */
+    public SecurityRuleDirection direction() {
+        return this.direction;
+    }
+
+    /**
+     * Set the direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @param direction the direction value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withDirection(SecurityRuleDirection direction) {
+        this.direction = direction;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the security rule resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the SecurityRuleInner object itself.
+     */
+    public SecurityRuleInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesImpl.java
new file mode 100644
index 000000000000..e4ea14f3f4c8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.SecurityRules;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroupSecurityRule;
+
+class SecurityRulesImpl extends WrapperImpl<SecurityRulesInner> implements SecurityRules {
+    private final NetworkManager manager;
+
+    SecurityRulesImpl(NetworkManager manager) {
+        super(manager.inner().securityRules());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public NetworkSecurityGroupSecurityRuleImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private NetworkSecurityGroupSecurityRuleImpl wrapModel(SecurityRuleInner inner) {
+        return  new NetworkSecurityGroupSecurityRuleImpl(inner, manager());
+    }
+
+    private NetworkSecurityGroupSecurityRuleImpl wrapModel(String name) {
+        return new NetworkSecurityGroupSecurityRuleImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRule> listAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        SecurityRulesInner client = this.inner();
+        return client.listAsync(resourceGroupName, networkSecurityGroupName)
+        .flatMapIterable(new Func1<Page<SecurityRuleInner>, Iterable<SecurityRuleInner>>() {
+            @Override
+            public Iterable<SecurityRuleInner> call(Page<SecurityRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SecurityRuleInner, NetworkSecurityGroupSecurityRule>() {
+            @Override
+            public NetworkSecurityGroupSecurityRule call(SecurityRuleInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkSecurityGroupSecurityRule> getAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        SecurityRulesInner client = this.inner();
+        return client.getAsync(resourceGroupName, networkSecurityGroupName, securityRuleName)
+        .flatMap(new Func1<SecurityRuleInner, Observable<NetworkSecurityGroupSecurityRule>>() {
+            @Override
+            public Observable<NetworkSecurityGroupSecurityRule> call(SecurityRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NetworkSecurityGroupSecurityRule)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        SecurityRulesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesInner.java
new file mode 100644
index 000000000000..1d8a72dd69e7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SecurityRulesInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 SecurityRules.
+ */
+public class SecurityRulesInner {
+    /** The Retrofit service to perform REST calls. */
+    private SecurityRulesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of SecurityRulesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SecurityRulesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(SecurityRulesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SecurityRules to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SecurityRulesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.SecurityRules delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("securityRuleName") String securityRuleName, @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.network.v2020_04_01.SecurityRules beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("securityRuleName") String securityRuleName, @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.network.v2020_04_01.SecurityRules get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("securityRuleName") String securityRuleName, @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.network.v2020_04_01.SecurityRules createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("securityRuleName") String securityRuleName, @Path("subscriptionId") String subscriptionId, @Body SecurityRuleInner securityRuleParameters, @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.network.v2020_04_01.SecurityRules beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @Path("securityRuleName") String securityRuleName, @Path("subscriptionId") String subscriptionId, @Body SecurityRuleInner securityRuleParameters, @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.network.v2020_04_01.SecurityRules list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("networkSecurityGroupName") String networkSecurityGroupName, @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.network.v2020_04_01.SecurityRules listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @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 networkSecurityGroupName, String securityRuleName) {
+        deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security 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<Void> deleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (securityRuleName == null) {
+            throw new IllegalArgumentException("Parameter securityRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, networkSecurityGroupName, securityRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @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 networkSecurityGroupName, String securityRuleName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security 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<Void> beginDeleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (securityRuleName == null) {
+            throw new IllegalArgumentException("Parameter securityRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, networkSecurityGroupName, securityRuleName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Get the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @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 SecurityRuleInner object if successful.
+     */
+    public SecurityRuleInner get(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security 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<SecurityRuleInner> getAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, final ServiceCallback<SecurityRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName), serviceCallback);
+    }
+
+    /**
+     * Get the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<SecurityRuleInner> getAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        return getWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName).map(new Func1<ServiceResponse<SecurityRuleInner>, SecurityRuleInner>() {
+            @Override
+            public SecurityRuleInner call(ServiceResponse<SecurityRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified network security rule.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<ServiceResponse<SecurityRuleInner>> getWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (securityRuleName == null) {
+            throw new IllegalArgumentException("Parameter securityRuleName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, networkSecurityGroupName, securityRuleName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityRuleInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityRuleInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule 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 SecurityRuleInner object if successful.
+     */
+    public SecurityRuleInner createOrUpdate(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @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<SecurityRuleInner> createOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters, final ServiceCallback<SecurityRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SecurityRuleInner> createOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters).map(new Func1<ServiceResponse<SecurityRuleInner>, SecurityRuleInner>() {
+            @Override
+            public SecurityRuleInner call(ServiceResponse<SecurityRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<SecurityRuleInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (securityRuleName == null) {
+            throw new IllegalArgumentException("Parameter securityRuleName 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 (securityRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter securityRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(securityRuleParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, networkSecurityGroupName, securityRuleName, this.client.subscriptionId(), securityRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<SecurityRuleInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule 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 SecurityRuleInner object if successful.
+     */
+    public SecurityRuleInner beginCreateOrUpdate(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @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<SecurityRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters, final ServiceCallback<SecurityRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<SecurityRuleInner> beginCreateOrUpdateAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters).map(new Func1<ServiceResponse<SecurityRuleInner>, SecurityRuleInner>() {
+            @Override
+            public SecurityRuleInner call(ServiceResponse<SecurityRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a security rule in the specified network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @param securityRuleName The name of the security rule.
+     * @param securityRuleParameters Parameters supplied to the create or update network security rule operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SecurityRuleInner object
+     */
+    public Observable<ServiceResponse<SecurityRuleInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String networkSecurityGroupName, String securityRuleName, SecurityRuleInner securityRuleParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (securityRuleName == null) {
+            throw new IllegalArgumentException("Parameter securityRuleName 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 (securityRuleParameters == null) {
+            throw new IllegalArgumentException("Parameter securityRuleParameters is required and cannot be null.");
+        }
+        Validator.validate(securityRuleParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, networkSecurityGroupName, securityRuleName, this.client.subscriptionId(), securityRuleParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SecurityRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SecurityRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SecurityRuleInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SecurityRuleInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityRuleInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SecurityRuleInner>() { }.getType())
+                .register(201, new TypeToken<SecurityRuleInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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;SecurityRuleInner&gt; object if successful.
+     */
+    public PagedList<SecurityRuleInner> list(final String resourceGroupName, final String networkSecurityGroupName) {
+        ServiceResponse<Page<SecurityRuleInner>> response = listSinglePageAsync(resourceGroupName, networkSecurityGroupName).toBlocking().single();
+        return new PagedList<SecurityRuleInner>(response.body()) {
+            @Override
+            public Page<SecurityRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @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<SecurityRuleInner>> listAsync(final String resourceGroupName, final String networkSecurityGroupName, final ListOperationCallback<SecurityRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, networkSecurityGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityRuleInner&gt; object
+     */
+    public Observable<Page<SecurityRuleInner>> listAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        return listWithServiceResponseAsync(resourceGroupName, networkSecurityGroupName)
+            .map(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Page<SecurityRuleInner>>() {
+                @Override
+                public Page<SecurityRuleInner> call(ServiceResponse<Page<SecurityRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SecurityRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        return listSinglePageAsync(resourceGroupName, networkSecurityGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(ServiceResponse<Page<SecurityRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param networkSecurityGroupName The name of the network security group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listSinglePageAsync(final String resourceGroupName, final String networkSecurityGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkSecurityGroupName == null) {
+            throw new IllegalArgumentException("Parameter networkSecurityGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, networkSecurityGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityRuleInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityRuleInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all security rules in a network security 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;SecurityRuleInner&gt; object if successful.
+     */
+    public PagedList<SecurityRuleInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<SecurityRuleInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SecurityRuleInner>(response.body()) {
+            @Override
+            public Page<SecurityRuleInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all security rules in a network security 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<SecurityRuleInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<SecurityRuleInner>> serviceFuture, final ListOperationCallback<SecurityRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all security rules in a network security 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;SecurityRuleInner&gt; object
+     */
+    public Observable<Page<SecurityRuleInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Page<SecurityRuleInner>>() {
+                @Override
+                public Page<SecurityRuleInner> call(ServiceResponse<Page<SecurityRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all security rules in a network security 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;SecurityRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SecurityRuleInner>>, Observable<ServiceResponse<Page<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(ServiceResponse<Page<SecurityRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all security rules in a network security group.
+     *
+    ServiceResponse<PageImpl<SecurityRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SecurityRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SecurityRuleInner>>> 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<SecurityRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SecurityRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SecurityRuleInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SecurityRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SecurityRuleInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SecurityRuleInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SecurityRuleInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinkInner.java
new file mode 100644
index 000000000000..9794a7065596
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinkInner.java
@@ -0,0 +1,199 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * ServiceAssociationLink resource.
+ */
+@JsonFlatten
+public class ServiceAssociationLinkInner extends SubResource {
+    /**
+     * Resource type of the linked resource.
+     */
+    @JsonProperty(value = "properties.linkedResourceType")
+    private String linkedResourceType;
+
+    /**
+     * Link to the external resource.
+     */
+    @JsonProperty(value = "properties.link")
+    private String link;
+
+    /**
+     * The provisioning state of the service association link resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * If true, the resource can be deleted.
+     */
+    @JsonProperty(value = "properties.allowDelete")
+    private Boolean allowDelete;
+
+    /**
+     * A list of locations.
+     */
+    @JsonProperty(value = "properties.locations")
+    private List<String> locations;
+
+    /**
+     * Name of the resource that is unique within a resource group. This name
+     * can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get resource type of the linked resource.
+     *
+     * @return the linkedResourceType value
+     */
+    public String linkedResourceType() {
+        return this.linkedResourceType;
+    }
+
+    /**
+     * Set resource type of the linked resource.
+     *
+     * @param linkedResourceType the linkedResourceType value to set
+     * @return the ServiceAssociationLinkInner object itself.
+     */
+    public ServiceAssociationLinkInner withLinkedResourceType(String linkedResourceType) {
+        this.linkedResourceType = linkedResourceType;
+        return this;
+    }
+
+    /**
+     * Get link to the external resource.
+     *
+     * @return the link value
+     */
+    public String link() {
+        return this.link;
+    }
+
+    /**
+     * Set link to the external resource.
+     *
+     * @param link the link value to set
+     * @return the ServiceAssociationLinkInner object itself.
+     */
+    public ServiceAssociationLinkInner withLink(String link) {
+        this.link = link;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the service association link resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get if true, the resource can be deleted.
+     *
+     * @return the allowDelete value
+     */
+    public Boolean allowDelete() {
+        return this.allowDelete;
+    }
+
+    /**
+     * Set if true, the resource can be deleted.
+     *
+     * @param allowDelete the allowDelete value to set
+     * @return the ServiceAssociationLinkInner object itself.
+     */
+    public ServiceAssociationLinkInner withAllowDelete(Boolean allowDelete) {
+        this.allowDelete = allowDelete;
+        return this;
+    }
+
+    /**
+     * Get a list of locations.
+     *
+     * @return the locations value
+     */
+    public List<String> locations() {
+        return this.locations;
+    }
+
+    /**
+     * Set a list of locations.
+     *
+     * @param locations the locations value to set
+     * @return the ServiceAssociationLinkInner object itself.
+     */
+    public ServiceAssociationLinkInner withLocations(List<String> locations) {
+        this.locations = locations;
+        return this;
+    }
+
+    /**
+     * Get name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ServiceAssociationLinkInner object itself.
+     */
+    public ServiceAssociationLinkInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksImpl.java
new file mode 100644
index 000000000000..a781ee0abcb5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceAssociationLinks;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceAssociationLinksListResult;
+
+class ServiceAssociationLinksImpl extends WrapperImpl<ServiceAssociationLinksInner> implements ServiceAssociationLinks {
+    private final NetworkManager manager;
+
+    ServiceAssociationLinksImpl(NetworkManager manager) {
+        super(manager.inner().serviceAssociationLinks());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ServiceAssociationLinksListResult> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        ServiceAssociationLinksInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualNetworkName, subnetName)
+        .map(new Func1<ServiceAssociationLinksListResultInner, ServiceAssociationLinksListResult>() {
+            @Override
+            public ServiceAssociationLinksListResult call(ServiceAssociationLinksListResultInner inner) {
+                return new ServiceAssociationLinksListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksInner.java
new file mode 100644
index 000000000000..796c6b130c7c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksInner.java
@@ -0,0 +1,151 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ServiceAssociationLinks.
+ */
+public class ServiceAssociationLinksInner {
+    /** The Retrofit service to perform REST calls. */
+    private ServiceAssociationLinksService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ServiceAssociationLinksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServiceAssociationLinksInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ServiceAssociationLinksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServiceAssociationLinks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServiceAssociationLinksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ServiceAssociationLinks list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ServiceAssociationLinks")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of service association links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 ServiceAssociationLinksListResultInner object if successful.
+     */
+    public ServiceAssociationLinksListResultInner list(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of service association links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<ServiceAssociationLinksListResultInner> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<ServiceAssociationLinksListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Gets a list of service association links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceAssociationLinksListResultInner object
+     */
+    public Observable<ServiceAssociationLinksListResultInner> listAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<ServiceAssociationLinksListResultInner>, ServiceAssociationLinksListResultInner>() {
+            @Override
+            public ServiceAssociationLinksListResultInner call(ServiceResponse<ServiceAssociationLinksListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of service association links for a subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceAssociationLinksListResultInner object
+     */
+    public Observable<ServiceResponse<ServiceAssociationLinksListResultInner>> listWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceAssociationLinksListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceAssociationLinksListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceAssociationLinksListResultInner> clientResponse = listDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceAssociationLinksListResultInner> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceAssociationLinksListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceAssociationLinksListResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultImpl.java
new file mode 100644
index 000000000000..173f1d20e0eb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ServiceAssociationLinksListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class ServiceAssociationLinksListResultImpl extends WrapperImpl<ServiceAssociationLinksListResultInner> implements ServiceAssociationLinksListResult {
+    private final NetworkManager manager;
+    ServiceAssociationLinksListResultImpl(ServiceAssociationLinksListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String nextLink() {
+        return this.inner().nextLink();
+    }
+
+    @Override
+    public List<ServiceAssociationLinkInner> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultInner.java
new file mode 100644
index 000000000000..4e93971c4a01
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceAssociationLinksListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for ServiceAssociationLinks_List operation.
+ */
+public class ServiceAssociationLinksListResultInner {
+    /**
+     * The service association links in a subnet.
+     */
+    @JsonProperty(value = "value")
+    private List<ServiceAssociationLinkInner> value;
+
+    /**
+     * The URL to get the next set of results.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /**
+     * Get the service association links in a subnet.
+     *
+     * @return the value value
+     */
+    public List<ServiceAssociationLinkInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the service association links in a subnet.
+     *
+     * @param value the value value to set
+     * @return the ServiceAssociationLinksListResultInner object itself.
+     */
+    public ServiceAssociationLinksListResultInner withValue(List<ServiceAssociationLinkInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the URL to get the next set of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesImpl.java
new file mode 100644
index 000000000000..e1d542a438d6
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicy;
+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;
+
+class ServiceEndpointPoliciesImpl extends GroupableResourcesCoreImpl<ServiceEndpointPolicy, ServiceEndpointPolicyImpl, ServiceEndpointPolicyInner, ServiceEndpointPoliciesInner, NetworkManager>  implements ServiceEndpointPolicies {
+    protected ServiceEndpointPoliciesImpl(NetworkManager manager) {
+        super(manager.inner().serviceEndpointPolicies(), manager);
+    }
+
+    @Override
+    protected Observable<ServiceEndpointPolicyInner> getInnerAsync(String resourceGroupName, String name) {
+        ServiceEndpointPoliciesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ServiceEndpointPoliciesInner 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<ServiceEndpointPolicy> listByResourceGroup(String resourceGroupName) {
+        ServiceEndpointPoliciesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicy> listByResourceGroupAsync(String resourceGroupName) {
+        ServiceEndpointPoliciesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ServiceEndpointPolicyInner>, Iterable<ServiceEndpointPolicyInner>>() {
+            @Override
+            public Iterable<ServiceEndpointPolicyInner> call(Page<ServiceEndpointPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ServiceEndpointPolicyInner, ServiceEndpointPolicy>() {
+            @Override
+            public ServiceEndpointPolicy call(ServiceEndpointPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ServiceEndpointPolicy> list() {
+        ServiceEndpointPoliciesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicy> listAsync() {
+        ServiceEndpointPoliciesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ServiceEndpointPolicyInner>, Iterable<ServiceEndpointPolicyInner>>() {
+            @Override
+            public Iterable<ServiceEndpointPolicyInner> call(Page<ServiceEndpointPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ServiceEndpointPolicyInner, ServiceEndpointPolicy>() {
+            @Override
+            public ServiceEndpointPolicy call(ServiceEndpointPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ServiceEndpointPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ServiceEndpointPolicyImpl wrapModel(ServiceEndpointPolicyInner inner) {
+        return  new ServiceEndpointPolicyImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ServiceEndpointPolicyImpl wrapModel(String name) {
+        return new ServiceEndpointPolicyImpl(name, new ServiceEndpointPolicyInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesInner.java
new file mode 100644
index 000000000000..f2d436b67ac4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPoliciesInner.java
@@ -0,0 +1,1208 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 ServiceEndpointPolicies.
+ */
+public class ServiceEndpointPoliciesInner implements InnerSupportsGet<ServiceEndpointPolicyInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ServiceEndpointPolicyInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ServiceEndpointPoliciesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ServiceEndpointPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServiceEndpointPoliciesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ServiceEndpointPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServiceEndpointPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServiceEndpointPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicies delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @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.network.v2020_04_01.ServiceEndpointPolicies beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @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.network.v2020_04_01.ServiceEndpointPolicies getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.ServiceEndpointPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("subscriptionId") String subscriptionId, @Body ServiceEndpointPolicyInner 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.network.v2020_04_01.ServiceEndpointPolicies beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("subscriptionId") String subscriptionId, @Body ServiceEndpointPolicyInner 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.network.v2020_04_01.ServiceEndpointPolicies updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicies list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ServiceEndpointPolicies")
+        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.network.v2020_04_01.ServiceEndpointPolicies listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies")
+        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.network.v2020_04_01.ServiceEndpointPolicies 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.network.v2020_04_01.ServiceEndpointPolicies listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 serviceEndpointPolicyName) {
+        deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 serviceEndpointPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 serviceEndpointPolicyName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 serviceEndpointPolicyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), 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 specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner getByResourceGroup(String resourceGroupName, String serviceEndpointPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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<ServiceEndpointPolicyInner> getByResourceGroupAsync(String resourceGroupName, String serviceEndpointPolicyName, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceEndpointPolicyInner> getByResourceGroupAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param expand Expands referenced resources.
+     * @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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner getByResourceGroup(String resourceGroupName, String serviceEndpointPolicyName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param expand Expands referenced resources.
+     * @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<ServiceEndpointPolicyInner> getByResourceGroupAsync(String resourceGroupName, String serviceEndpointPolicyName, String expand, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceEndpointPolicyInner> getByResourceGroupAsync(String resourceGroupName, String serviceEndpointPolicyName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, expand).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified service Endpoint Policies in a specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceEndpointPolicyInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceEndpointPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceEndpointPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy 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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner createOrUpdate(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @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<ServiceEndpointPolicyInner> createOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceEndpointPolicyInner> createOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ServiceEndpointPolicyInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy 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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner beginCreateOrUpdate(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @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<ServiceEndpointPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceEndpointPolicyInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, parameters).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a service Endpoint Policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param parameters Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, ServiceEndpointPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceEndpointPolicyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceEndpointPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceEndpointPolicyInner>() { }.getType())
+                .register(201, new TypeToken<ServiceEndpointPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner updateTags(String resourceGroupName, String serviceEndpointPolicyName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @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<ServiceEndpointPolicyInner> updateTagsAsync(String resourceGroupName, String serviceEndpointPolicyName, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceEndpointPolicyInner> updateTagsAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param tags Resource tags.
+     * @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 ServiceEndpointPolicyInner object if successful.
+     */
+    public ServiceEndpointPolicyInner updateTags(String resourceGroupName, String serviceEndpointPolicyName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param tags Resource tags.
+     * @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<ServiceEndpointPolicyInner> updateTagsAsync(String resourceGroupName, String serviceEndpointPolicyName, Map<String, String> tags, final ServiceCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceEndpointPolicyInner> updateTagsAsync(String resourceGroupName, String serviceEndpointPolicyName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, tags).map(new Func1<ServiceResponse<ServiceEndpointPolicyInner>, ServiceEndpointPolicyInner>() {
+            @Override
+            public ServiceEndpointPolicyInner call(ServiceResponse<ServiceEndpointPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags of a service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceEndpointPolicyInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceEndpointPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceEndpointPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the service endpoint policies in a 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;ServiceEndpointPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyInner> list() {
+        ServiceResponse<Page<ServiceEndpointPolicyInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the service endpoint policies in a 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<ServiceEndpointPolicyInner>> listAsync(final ListOperationCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Page<ServiceEndpointPolicyInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyInner> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;ServiceEndpointPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ServiceEndpointPolicyInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<ServiceEndpointPolicyInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Page<ServiceEndpointPolicyInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyInner> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+    ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @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;ServiceEndpointPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ServiceEndpointPolicyInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @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<ServiceEndpointPolicyInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ServiceEndpointPolicyInner>> serviceFuture, final ListOperationCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @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;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Page<ServiceEndpointPolicyInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyInner> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+     * @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;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the service endpoint policies in a subscription.
+     *
+    ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> 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<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all service endpoint Policies in 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;ServiceEndpointPolicyInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ServiceEndpointPolicyInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all service endpoint Policies in 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<ServiceEndpointPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ServiceEndpointPolicyInner>> serviceFuture, final ListOperationCallback<ServiceEndpointPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all service endpoint Policies in 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;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Page<ServiceEndpointPolicyInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyInner> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint Policies in 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;ServiceEndpointPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint Policies in a resource group.
+     *
+    ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> 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<ServiceEndpointPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionImpl.java
new file mode 100644
index 000000000000..266a4f80e67b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinition;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class ServiceEndpointPolicyDefinitionImpl extends CreatableUpdatableImpl<ServiceEndpointPolicyDefinition, ServiceEndpointPolicyDefinitionInner, ServiceEndpointPolicyDefinitionImpl> implements ServiceEndpointPolicyDefinition, ServiceEndpointPolicyDefinition.Definition, ServiceEndpointPolicyDefinition.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String serviceEndpointPolicyName;
+    private String serviceEndpointPolicyDefinitionName;
+
+    ServiceEndpointPolicyDefinitionImpl(String name, NetworkManager manager) {
+        super(name, new ServiceEndpointPolicyDefinitionInner());
+        this.manager = manager;
+        // Set resource name
+        this.serviceEndpointPolicyDefinitionName = name;
+        //
+    }
+
+    ServiceEndpointPolicyDefinitionImpl(ServiceEndpointPolicyDefinitionInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.serviceEndpointPolicyDefinitionName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.serviceEndpointPolicyName = IdParsingUtils.getValueFromIdByName(inner.id(), "serviceEndpointPolicies");
+        this.serviceEndpointPolicyDefinitionName = IdParsingUtils.getValueFromIdByName(inner.id(), "serviceEndpointPolicyDefinitions");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicyDefinition> createResourceAsync() {
+        ServiceEndpointPolicyDefinitionsInner client = this.manager().inner().serviceEndpointPolicyDefinitions();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.serviceEndpointPolicyName, this.serviceEndpointPolicyDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicyDefinition> updateResourceAsync() {
+        ServiceEndpointPolicyDefinitionsInner client = this.manager().inner().serviceEndpointPolicyDefinitions();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.serviceEndpointPolicyName, this.serviceEndpointPolicyDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ServiceEndpointPolicyDefinitionInner> getInnerAsync() {
+        ServiceEndpointPolicyDefinitionsInner client = this.manager().inner().serviceEndpointPolicyDefinitions();
+        return client.getAsync(this.resourceGroupName, this.serviceEndpointPolicyName, this.serviceEndpointPolicyDefinitionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String service() {
+        return this.inner().service();
+    }
+
+    @Override
+    public List<String> serviceResources() {
+        return this.inner().serviceResources();
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withExistingServiceEndpointPolicy(String resourceGroupName, String serviceEndpointPolicyName) {
+        this.resourceGroupName = resourceGroupName;
+        this.serviceEndpointPolicyName = serviceEndpointPolicyName;
+        return this;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withDescription(String description) {
+        this.inner().withDescription(description);
+        return this;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withService(String service) {
+        this.inner().withService(service);
+        return this;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl withServiceResources(List<String> serviceResources) {
+        this.inner().withServiceResources(serviceResources);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionInner.java
new file mode 100644
index 000000000000..6d8ac900a970
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Service Endpoint policy definitions.
+ */
+@JsonFlatten
+public class ServiceEndpointPolicyDefinitionInner extends SubResource {
+    /**
+     * A description for this rule. Restricted to 140 chars.
+     */
+    @JsonProperty(value = "properties.description")
+    private String description;
+
+    /**
+     * Service endpoint name.
+     */
+    @JsonProperty(value = "properties.service")
+    private String service;
+
+    /**
+     * A list of service resources.
+     */
+    @JsonProperty(value = "properties.serviceResources")
+    private List<String> serviceResources;
+
+    /**
+     * The provisioning state of the service endpoint policy definition
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get a description for this rule. Restricted to 140 chars.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set a description for this rule. Restricted to 140 chars.
+     *
+     * @param description the description value to set
+     * @return the ServiceEndpointPolicyDefinitionInner object itself.
+     */
+    public ServiceEndpointPolicyDefinitionInner withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get service endpoint name.
+     *
+     * @return the service value
+     */
+    public String service() {
+        return this.service;
+    }
+
+    /**
+     * Set service endpoint name.
+     *
+     * @param service the service value to set
+     * @return the ServiceEndpointPolicyDefinitionInner object itself.
+     */
+    public ServiceEndpointPolicyDefinitionInner withService(String service) {
+        this.service = service;
+        return this;
+    }
+
+    /**
+     * Get a list of service resources.
+     *
+     * @return the serviceResources value
+     */
+    public List<String> serviceResources() {
+        return this.serviceResources;
+    }
+
+    /**
+     * Set a list of service resources.
+     *
+     * @param serviceResources the serviceResources value to set
+     * @return the ServiceEndpointPolicyDefinitionInner object itself.
+     */
+    public ServiceEndpointPolicyDefinitionInner withServiceResources(List<String> serviceResources) {
+        this.serviceResources = serviceResources;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the service endpoint policy definition resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the ServiceEndpointPolicyDefinitionInner object itself.
+     */
+    public ServiceEndpointPolicyDefinitionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsImpl.java
new file mode 100644
index 000000000000..e4bae35f972c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinitions;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinition;
+
+class ServiceEndpointPolicyDefinitionsImpl extends WrapperImpl<ServiceEndpointPolicyDefinitionsInner> implements ServiceEndpointPolicyDefinitions {
+    private final NetworkManager manager;
+
+    ServiceEndpointPolicyDefinitionsImpl(NetworkManager manager) {
+        super(manager.inner().serviceEndpointPolicyDefinitions());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ServiceEndpointPolicyDefinitionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ServiceEndpointPolicyDefinitionImpl wrapModel(ServiceEndpointPolicyDefinitionInner inner) {
+        return  new ServiceEndpointPolicyDefinitionImpl(inner, manager());
+    }
+
+    private ServiceEndpointPolicyDefinitionImpl wrapModel(String name) {
+        return new ServiceEndpointPolicyDefinitionImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicyDefinition> listByResourceGroupAsync(final String resourceGroupName, final String serviceEndpointPolicyName) {
+        ServiceEndpointPolicyDefinitionsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName, serviceEndpointPolicyName)
+        .flatMapIterable(new Func1<Page<ServiceEndpointPolicyDefinitionInner>, Iterable<ServiceEndpointPolicyDefinitionInner>>() {
+            @Override
+            public Iterable<ServiceEndpointPolicyDefinitionInner> call(Page<ServiceEndpointPolicyDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ServiceEndpointPolicyDefinitionInner, ServiceEndpointPolicyDefinition>() {
+            @Override
+            public ServiceEndpointPolicyDefinition call(ServiceEndpointPolicyDefinitionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicyDefinition> getAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        ServiceEndpointPolicyDefinitionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName)
+        .flatMap(new Func1<ServiceEndpointPolicyDefinitionInner, Observable<ServiceEndpointPolicyDefinition>>() {
+            @Override
+            public Observable<ServiceEndpointPolicyDefinition> call(ServiceEndpointPolicyDefinitionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ServiceEndpointPolicyDefinition)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        ServiceEndpointPolicyDefinitionsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsInner.java
new file mode 100644
index 000000000000..824d642cb7de
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyDefinitionsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 ServiceEndpointPolicyDefinitions.
+ */
+public class ServiceEndpointPolicyDefinitionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ServiceEndpointPolicyDefinitionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ServiceEndpointPolicyDefinitionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServiceEndpointPolicyDefinitionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ServiceEndpointPolicyDefinitionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServiceEndpointPolicyDefinitions to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServiceEndpointPolicyDefinitionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinitions delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("serviceEndpointPolicyDefinitionName") String serviceEndpointPolicyDefinitionName, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("serviceEndpointPolicyDefinitionName") String serviceEndpointPolicyDefinitionName, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("serviceEndpointPolicyDefinitionName") String serviceEndpointPolicyDefinitionName, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("serviceEndpointPolicyDefinitionName") String serviceEndpointPolicyDefinitionName, @Path("subscriptionId") String subscriptionId, @Body ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @Path("serviceEndpointPolicyDefinitionName") String serviceEndpointPolicyDefinitionName, @Path("subscriptionId") String subscriptionId, @Body ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("serviceEndpointPolicyName") String serviceEndpointPolicyName, @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.network.v2020_04_01.ServiceEndpointPolicyDefinitions listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @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 serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @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 serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @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 serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @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 serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified ServiceEndpoint policy definitions.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the Service Endpoint Policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Get the specified service endpoint policy definitions from service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition 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 ServiceEndpointPolicyDefinitionInner object if successful.
+     */
+    public ServiceEndpointPolicyDefinitionInner get(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        return getWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Get the specified service endpoint policy definitions from service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition 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<ServiceEndpointPolicyDefinitionInner> getAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, final ServiceCallback<ServiceEndpointPolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Get the specified service endpoint policy definitions from service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyDefinitionInner object
+     */
+    public Observable<ServiceEndpointPolicyDefinitionInner> getAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        return getWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName).map(new Func1<ServiceResponse<ServiceEndpointPolicyDefinitionInner>, ServiceEndpointPolicyDefinitionInner>() {
+            @Override
+            public ServiceEndpointPolicyDefinitionInner call(ServiceResponse<ServiceEndpointPolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get the specified service endpoint policy definitions from service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>> getWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyDefinitionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceEndpointPolicyDefinitionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceEndpointPolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceEndpointPolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy 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 ServiceEndpointPolicyDefinitionInner object if successful.
+     */
+    public ServiceEndpointPolicyDefinitionInner createOrUpdate(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @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<ServiceEndpointPolicyDefinitionInner> createOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions, final ServiceCallback<ServiceEndpointPolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceEndpointPolicyDefinitionInner> createOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions).map(new Func1<ServiceResponse<ServiceEndpointPolicyDefinitionInner>, ServiceEndpointPolicyDefinitionInner>() {
+            @Override
+            public ServiceEndpointPolicyDefinitionInner call(ServiceResponse<ServiceEndpointPolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitionName 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 (serviceEndpointPolicyDefinitions == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitions is required and cannot be null.");
+        }
+        Validator.validate(serviceEndpointPolicyDefinitions);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, this.client.subscriptionId(), serviceEndpointPolicyDefinitions, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ServiceEndpointPolicyDefinitionInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy 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 ServiceEndpointPolicyDefinitionInner object if successful.
+     */
+    public ServiceEndpointPolicyDefinitionInner beginCreateOrUpdate(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @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<ServiceEndpointPolicyDefinitionInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions, final ServiceCallback<ServiceEndpointPolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyDefinitionInner object
+     */
+    public Observable<ServiceEndpointPolicyDefinitionInner> beginCreateOrUpdateAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, serviceEndpointPolicyDefinitions).map(new Func1<ServiceResponse<ServiceEndpointPolicyDefinitionInner>, ServiceEndpointPolicyDefinitionInner>() {
+            @Override
+            public ServiceEndpointPolicyDefinitionInner call(ServiceResponse<ServiceEndpointPolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a service endpoint policy definition in the specified service endpoint policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy.
+     * @param serviceEndpointPolicyDefinitionName The name of the service endpoint policy definition name.
+     * @param serviceEndpointPolicyDefinitions Parameters supplied to the create or update service endpoint policy operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceEndpointPolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String serviceEndpointPolicyName, String serviceEndpointPolicyDefinitionName, ServiceEndpointPolicyDefinitionInner serviceEndpointPolicyDefinitions) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitionName 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 (serviceEndpointPolicyDefinitions == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyDefinitions is required and cannot be null.");
+        }
+        Validator.validate(serviceEndpointPolicyDefinitions);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, serviceEndpointPolicyName, serviceEndpointPolicyDefinitionName, this.client.subscriptionId(), serviceEndpointPolicyDefinitions, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceEndpointPolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceEndpointPolicyDefinitionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceEndpointPolicyDefinitionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceEndpointPolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceEndpointPolicyDefinitionInner>() { }.getType())
+                .register(201, new TypeToken<ServiceEndpointPolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy 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;ServiceEndpointPolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyDefinitionInner> listByResourceGroup(final String resourceGroupName, final String serviceEndpointPolicyName) {
+        ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName, serviceEndpointPolicyName).toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy 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<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupAsync(final String resourceGroupName, final String serviceEndpointPolicyName, final ListOperationCallback<ServiceEndpointPolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName, serviceEndpointPolicyName),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupAsync(final String resourceGroupName, final String serviceEndpointPolicyName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName, serviceEndpointPolicyName)
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>, Page<ServiceEndpointPolicyDefinitionInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyDefinitionInner> call(ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ServiceEndpointPolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName, final String serviceEndpointPolicyName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName, serviceEndpointPolicyName)
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+    ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> * @param serviceEndpointPolicyName The name of the service endpoint policy name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName, final String serviceEndpointPolicyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (serviceEndpointPolicyName == null) {
+            throw new IllegalArgumentException("Parameter serviceEndpointPolicyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, serviceEndpointPolicyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @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;ServiceEndpointPolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<ServiceEndpointPolicyDefinitionInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ServiceEndpointPolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<ServiceEndpointPolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @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<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ServiceEndpointPolicyDefinitionInner>> serviceFuture, final ListOperationCallback<ServiceEndpointPolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @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;ServiceEndpointPolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>, Page<ServiceEndpointPolicyDefinitionInner>>() {
+                @Override
+                public Page<ServiceEndpointPolicyDefinitionInner> call(ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+     * @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;ServiceEndpointPolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>, Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all service endpoint policy definitions in a service end point policy.
+     *
+    ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ServiceEndpointPolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> 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<ServiceEndpointPolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ServiceEndpointPolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ServiceEndpointPolicyDefinitionInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ServiceEndpointPolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ServiceEndpointPolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyImpl.java
new file mode 100644
index 000000000000..1d746aa871a5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicy;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicyDefinition;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class ServiceEndpointPolicyImpl extends GroupableResourceCoreImpl<ServiceEndpointPolicy, ServiceEndpointPolicyInner, ServiceEndpointPolicyImpl, NetworkManager> implements ServiceEndpointPolicy, ServiceEndpointPolicy.Definition, ServiceEndpointPolicy.Update {
+    ServiceEndpointPolicyImpl(String name, ServiceEndpointPolicyInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicy> createResourceAsync() {
+        ServiceEndpointPoliciesInner client = this.manager().inner().serviceEndpointPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ServiceEndpointPolicy> updateResourceAsync() {
+        ServiceEndpointPoliciesInner client = this.manager().inner().serviceEndpointPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ServiceEndpointPolicyInner> getInnerAsync() {
+        ServiceEndpointPoliciesInner client = this.manager().inner().serviceEndpointPolicies();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<ServiceEndpointPolicyDefinition> serviceEndpointPolicyDefinitions() {
+        List<ServiceEndpointPolicyDefinition> lst = new ArrayList<ServiceEndpointPolicyDefinition>();
+        if (this.inner().serviceEndpointPolicyDefinitions() != null) {
+            for (ServiceEndpointPolicyDefinitionInner inner : this.inner().serviceEndpointPolicyDefinitions()) {
+                lst.add( new ServiceEndpointPolicyDefinitionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<Subnet> subnets() {
+        List<Subnet> lst = new ArrayList<Subnet>();
+        if (this.inner().subnets() != null) {
+            for (SubnetInner inner : this.inner().subnets()) {
+                lst.add( new SubnetImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ServiceEndpointPolicyImpl withServiceEndpointPolicyDefinitions(List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions) {
+        this.inner().withServiceEndpointPolicyDefinitions(serviceEndpointPolicyDefinitions);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyInner.java
new file mode 100644
index 000000000000..f7ed1aea8216
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceEndpointPolicyInner.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Service End point policy resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ServiceEndpointPolicyInner extends Resource {
+    /**
+     * A collection of service endpoint policy definitions of the service
+     * endpoint policy.
+     */
+    @JsonProperty(value = "properties.serviceEndpointPolicyDefinitions")
+    private List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions;
+
+    /**
+     * A collection of references to subnets.
+     */
+    @JsonProperty(value = "properties.subnets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubnetInner> subnets;
+
+    /**
+     * The resource GUID property of the service endpoint policy resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the service endpoint policy resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get a collection of service endpoint policy definitions of the service endpoint policy.
+     *
+     * @return the serviceEndpointPolicyDefinitions value
+     */
+    public List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions() {
+        return this.serviceEndpointPolicyDefinitions;
+    }
+
+    /**
+     * Set a collection of service endpoint policy definitions of the service endpoint policy.
+     *
+     * @param serviceEndpointPolicyDefinitions the serviceEndpointPolicyDefinitions value to set
+     * @return the ServiceEndpointPolicyInner object itself.
+     */
+    public ServiceEndpointPolicyInner withServiceEndpointPolicyDefinitions(List<ServiceEndpointPolicyDefinitionInner> serviceEndpointPolicyDefinitions) {
+        this.serviceEndpointPolicyDefinitions = serviceEndpointPolicyDefinitions;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to subnets.
+     *
+     * @return the subnets value
+     */
+    public List<SubnetInner> subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * Get the resource GUID property of the service endpoint policy resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the service endpoint policy resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the ServiceEndpointPolicyInner object itself.
+     */
+    public ServiceEndpointPolicyInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsImpl.java
new file mode 100644
index 000000000000..0eeea5ccd302
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTags;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTagsListResult;
+
+class ServiceTagsImpl extends WrapperImpl<ServiceTagsInner> implements ServiceTags {
+    private final NetworkManager manager;
+
+    ServiceTagsImpl(NetworkManager manager) {
+        super(manager.inner().serviceTags());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ServiceTagsListResult> listAsync(String location) {
+        ServiceTagsInner client = this.inner();
+        return client.listAsync(location)
+        .map(new Func1<ServiceTagsListResultInner, ServiceTagsListResult>() {
+            @Override
+            public ServiceTagsListResult call(ServiceTagsListResultInner inner) {
+                return new ServiceTagsListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsInner.java
new file mode 100644
index 000000000000..d080e0c06c54
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsInner.java
@@ -0,0 +1,137 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ServiceTags.
+ */
+public class ServiceTagsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ServiceTagsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ServiceTagsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServiceTagsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(ServiceTagsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServiceTags to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServiceTagsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.ServiceTags list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/serviceTags")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of service tag information resources.
+     *
+     * @param location The location that will be used as a reference for version (not as a filter based on location, you will get the list of service tags with prefix details across all regions but limited to the cloud that your subscription belongs to).
+     * @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 ServiceTagsListResultInner object if successful.
+     */
+    public ServiceTagsListResultInner list(String location) {
+        return listWithServiceResponseAsync(location).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of service tag information resources.
+     *
+     * @param location The location that will be used as a reference for version (not as a filter based on location, you will get the list of service tags with prefix details across all regions but limited to the cloud that your subscription belongs to).
+     * @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<ServiceTagsListResultInner> listAsync(String location, final ServiceCallback<ServiceTagsListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(location), serviceCallback);
+    }
+
+    /**
+     * Gets a list of service tag information resources.
+     *
+     * @param location The location that will be used as a reference for version (not as a filter based on location, you will get the list of service tags with prefix details across all regions but limited to the cloud that your subscription belongs to).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceTagsListResultInner object
+     */
+    public Observable<ServiceTagsListResultInner> listAsync(String location) {
+        return listWithServiceResponseAsync(location).map(new Func1<ServiceResponse<ServiceTagsListResultInner>, ServiceTagsListResultInner>() {
+            @Override
+            public ServiceTagsListResultInner call(ServiceResponse<ServiceTagsListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of service tag information resources.
+     *
+     * @param location The location that will be used as a reference for version (not as a filter based on location, you will get the list of service tags with prefix details across all regions but limited to the cloud that your subscription belongs to).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServiceTagsListResultInner object
+     */
+    public Observable<ServiceResponse<ServiceTagsListResultInner>> listWithServiceResponseAsync(String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ServiceTagsListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ServiceTagsListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ServiceTagsListResultInner> clientResponse = listDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ServiceTagsListResultInner> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServiceTagsListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServiceTagsListResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultImpl.java
new file mode 100644
index 000000000000..c6b2bd15a15f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTagsListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTagInformation;
+
+class ServiceTagsListResultImpl extends WrapperImpl<ServiceTagsListResultInner> implements ServiceTagsListResult {
+    private final NetworkManager manager;
+    ServiceTagsListResultImpl(ServiceTagsListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String changeNumber() {
+        return this.inner().changeNumber();
+    }
+
+    @Override
+    public String cloud() {
+        return this.inner().cloud();
+    }
+
+    @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 List<ServiceTagInformation> values() {
+        return this.inner().values();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultInner.java
new file mode 100644
index 000000000000..499b9aee77bd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/ServiceTagsListResultInner.java
@@ -0,0 +1,109 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceTagInformation;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Response for the ListServiceTags API service call.
+ */
+public class ServiceTagsListResultInner {
+    /**
+     * The name of the cloud.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The ID of the cloud.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * The azure resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * The iteration number.
+     */
+    @JsonProperty(value = "changeNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private String changeNumber;
+
+    /**
+     * The name of the cloud.
+     */
+    @JsonProperty(value = "cloud", access = JsonProperty.Access.WRITE_ONLY)
+    private String cloud;
+
+    /**
+     * The list of service tag information resources.
+     */
+    @JsonProperty(value = "values", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ServiceTagInformation> values;
+
+    /**
+     * Get the name of the cloud.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the ID of the cloud.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the azure resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the iteration number.
+     *
+     * @return the changeNumber value
+     */
+    public String changeNumber() {
+        return this.changeNumber;
+    }
+
+    /**
+     * Get the name of the cloud.
+     *
+     * @return the cloud value
+     */
+    public String cloud() {
+        return this.cloud;
+    }
+
+    /**
+     * Get the list of service tag information resources.
+     *
+     * @return the values value
+     */
+    public List<ServiceTagInformation> values() {
+        return this.values;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetImpl.java
new file mode 100644
index 000000000000..418921f1366c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetImpl.java
@@ -0,0 +1,296 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPropertiesFormat;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfigurationProfile;
+import com.microsoft.azure.management.network.v2020_04_01.Delegation;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkSecurityGroup;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.PrivateEndpoint;
+import com.microsoft.azure.management.network.v2020_04_01.RouteTable;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPolicy;
+
+class SubnetImpl extends CreatableUpdatableImpl<Subnet, SubnetInner, SubnetImpl> implements Subnet, Subnet.Definition, Subnet.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualNetworkName;
+    private String subnetName;
+
+    SubnetImpl(String name, NetworkManager manager) {
+        super(name, new SubnetInner());
+        this.manager = manager;
+        // Set resource name
+        this.subnetName = name;
+        //
+    }
+
+    SubnetImpl(SubnetInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.subnetName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualNetworkName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworks");
+        this.subnetName = IdParsingUtils.getValueFromIdByName(inner.id(), "subnets");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Subnet> createResourceAsync() {
+        SubnetsInner client = this.manager().inner().subnets();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualNetworkName, this.subnetName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<Subnet> updateResourceAsync() {
+        SubnetsInner client = this.manager().inner().subnets();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualNetworkName, this.subnetName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SubnetInner> getInnerAsync() {
+        SubnetsInner client = this.manager().inner().subnets();
+        return client.getAsync(this.resourceGroupName, this.virtualNetworkName, this.subnetName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String addressPrefix() {
+        return this.inner().addressPrefix();
+    }
+
+    @Override
+    public List<String> addressPrefixes() {
+        return this.inner().addressPrefixes();
+    }
+
+    @Override
+    public List<Delegation> delegations() {
+        return this.inner().delegations();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<SubResource> ipAllocations() {
+        return this.inner().ipAllocations();
+    }
+
+    @Override
+    public List<IPConfigurationProfile> ipConfigurationProfiles() {
+        return this.inner().ipConfigurationProfiles();
+    }
+
+    @Override
+    public List<IPConfiguration> ipConfigurations() {
+        return this.inner().ipConfigurations();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource natGateway() {
+        return this.inner().natGateway();
+    }
+
+    @Override
+    public NetworkSecurityGroup networkSecurityGroup() {
+        NetworkSecurityGroupInner inner = this.inner().networkSecurityGroup();
+        if (inner != null) {
+            return  new NetworkSecurityGroupImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String privateEndpointNetworkPolicies() {
+        return this.inner().privateEndpointNetworkPolicies();
+    }
+
+    @Override
+    public List<PrivateEndpoint> privateEndpoints() {
+        List<PrivateEndpoint> lst = new ArrayList<PrivateEndpoint>();
+        if (this.inner().privateEndpoints() != null) {
+            for (PrivateEndpointInner inner : this.inner().privateEndpoints()) {
+                lst.add( new PrivateEndpointImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String privateLinkServiceNetworkPolicies() {
+        return this.inner().privateLinkServiceNetworkPolicies();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String purpose() {
+        return this.inner().purpose();
+    }
+
+    @Override
+    public List<ResourceNavigationLinkInner> resourceNavigationLinks() {
+        return this.inner().resourceNavigationLinks();
+    }
+
+    @Override
+    public RouteTable routeTable() {
+        RouteTableInner inner = this.inner().routeTable();
+        if (inner != null) {
+            return  new RouteTableImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public List<ServiceAssociationLinkInner> serviceAssociationLinks() {
+        return this.inner().serviceAssociationLinks();
+    }
+
+    @Override
+    public List<ServiceEndpointPolicy> serviceEndpointPolicies() {
+        List<ServiceEndpointPolicy> lst = new ArrayList<ServiceEndpointPolicy>();
+        if (this.inner().serviceEndpointPolicies() != null) {
+            for (ServiceEndpointPolicyInner inner : this.inner().serviceEndpointPolicies()) {
+                lst.add( new ServiceEndpointPolicyImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<ServiceEndpointPropertiesFormat> serviceEndpoints() {
+        return this.inner().serviceEndpoints();
+    }
+
+    @Override
+    public SubnetImpl withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName) {
+        this.resourceGroupName = resourceGroupName;
+        this.virtualNetworkName = virtualNetworkName;
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withAddressPrefix(String addressPrefix) {
+        this.inner().withAddressPrefix(addressPrefix);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withAddressPrefixes(List<String> addressPrefixes) {
+        this.inner().withAddressPrefixes(addressPrefixes);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withDelegations(List<Delegation> delegations) {
+        this.inner().withDelegations(delegations);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withIpAllocations(List<SubResource> ipAllocations) {
+        this.inner().withIpAllocations(ipAllocations);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withNatGateway(SubResource natGateway) {
+        this.inner().withNatGateway(natGateway);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup) {
+        this.inner().withNetworkSecurityGroup(networkSecurityGroup);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withPrivateEndpointNetworkPolicies(String privateEndpointNetworkPolicies) {
+        this.inner().withPrivateEndpointNetworkPolicies(privateEndpointNetworkPolicies);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withPrivateLinkServiceNetworkPolicies(String privateLinkServiceNetworkPolicies) {
+        this.inner().withPrivateLinkServiceNetworkPolicies(privateLinkServiceNetworkPolicies);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withRouteTable(RouteTableInner routeTable) {
+        this.inner().withRouteTable(routeTable);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withServiceEndpointPolicies(List<ServiceEndpointPolicyInner> serviceEndpointPolicies) {
+        this.inner().withServiceEndpointPolicies(serviceEndpointPolicies);
+        return this;
+    }
+
+    @Override
+    public SubnetImpl withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints) {
+        this.inner().withServiceEndpoints(serviceEndpoints);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetInner.java
new file mode 100644
index 000000000000..12e4318a193d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetInner.java
@@ -0,0 +1,464 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ServiceEndpointPropertiesFormat;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.IPConfigurationProfile;
+import com.microsoft.azure.management.network.v2020_04_01.Delegation;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Subnet in a virtual network resource.
+ */
+@JsonFlatten
+public class SubnetInner extends SubResource {
+    /**
+     * The address prefix for the subnet.
+     */
+    @JsonProperty(value = "properties.addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * List of address prefixes for the subnet.
+     */
+    @JsonProperty(value = "properties.addressPrefixes")
+    private List<String> addressPrefixes;
+
+    /**
+     * The reference to the NetworkSecurityGroup resource.
+     */
+    @JsonProperty(value = "properties.networkSecurityGroup")
+    private NetworkSecurityGroupInner networkSecurityGroup;
+
+    /**
+     * The reference to the RouteTable resource.
+     */
+    @JsonProperty(value = "properties.routeTable")
+    private RouteTableInner routeTable;
+
+    /**
+     * Nat gateway associated with this subnet.
+     */
+    @JsonProperty(value = "properties.natGateway")
+    private SubResource natGateway;
+
+    /**
+     * An array of service endpoints.
+     */
+    @JsonProperty(value = "properties.serviceEndpoints")
+    private List<ServiceEndpointPropertiesFormat> serviceEndpoints;
+
+    /**
+     * An array of service endpoint policies.
+     */
+    @JsonProperty(value = "properties.serviceEndpointPolicies")
+    private List<ServiceEndpointPolicyInner> serviceEndpointPolicies;
+
+    /**
+     * An array of references to private endpoints.
+     */
+    @JsonProperty(value = "properties.privateEndpoints", access = JsonProperty.Access.WRITE_ONLY)
+    private List<PrivateEndpointInner> privateEndpoints;
+
+    /**
+     * An array of references to the network interface IP configurations using
+     * subnet.
+     */
+    @JsonProperty(value = "properties.ipConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<IPConfiguration> ipConfigurations;
+
+    /**
+     * Array of IP configuration profiles which reference this subnet.
+     */
+    @JsonProperty(value = "properties.ipConfigurationProfiles", access = JsonProperty.Access.WRITE_ONLY)
+    private List<IPConfigurationProfile> ipConfigurationProfiles;
+
+    /**
+     * Array of IpAllocation which reference this subnet.
+     */
+    @JsonProperty(value = "properties.ipAllocations")
+    private List<SubResource> ipAllocations;
+
+    /**
+     * An array of references to the external resources using subnet.
+     */
+    @JsonProperty(value = "properties.resourceNavigationLinks", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ResourceNavigationLinkInner> resourceNavigationLinks;
+
+    /**
+     * An array of references to services injecting into this subnet.
+     */
+    @JsonProperty(value = "properties.serviceAssociationLinks", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ServiceAssociationLinkInner> serviceAssociationLinks;
+
+    /**
+     * An array of references to the delegations on the subnet.
+     */
+    @JsonProperty(value = "properties.delegations")
+    private List<Delegation> delegations;
+
+    /**
+     * A read-only string identifying the intention of use for this subnet
+     * based on delegations and other user-defined properties.
+     */
+    @JsonProperty(value = "properties.purpose", access = JsonProperty.Access.WRITE_ONLY)
+    private String purpose;
+
+    /**
+     * The provisioning state of the subnet resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Enable or Disable apply network policies on private end point in the
+     * subnet.
+     */
+    @JsonProperty(value = "properties.privateEndpointNetworkPolicies")
+    private String privateEndpointNetworkPolicies;
+
+    /**
+     * Enable or Disable apply network policies on private link service in the
+     * subnet.
+     */
+    @JsonProperty(value = "properties.privateLinkServiceNetworkPolicies")
+    private String privateLinkServiceNetworkPolicies;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get the address prefix for the subnet.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set the address prefix for the subnet.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get list of address prefixes for the subnet.
+     *
+     * @return the addressPrefixes value
+     */
+    public List<String> addressPrefixes() {
+        return this.addressPrefixes;
+    }
+
+    /**
+     * Set list of address prefixes for the subnet.
+     *
+     * @param addressPrefixes the addressPrefixes value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withAddressPrefixes(List<String> addressPrefixes) {
+        this.addressPrefixes = addressPrefixes;
+        return this;
+    }
+
+    /**
+     * Get the reference to the NetworkSecurityGroup resource.
+     *
+     * @return the networkSecurityGroup value
+     */
+    public NetworkSecurityGroupInner networkSecurityGroup() {
+        return this.networkSecurityGroup;
+    }
+
+    /**
+     * Set the reference to the NetworkSecurityGroup resource.
+     *
+     * @param networkSecurityGroup the networkSecurityGroup value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup) {
+        this.networkSecurityGroup = networkSecurityGroup;
+        return this;
+    }
+
+    /**
+     * Get the reference to the RouteTable resource.
+     *
+     * @return the routeTable value
+     */
+    public RouteTableInner routeTable() {
+        return this.routeTable;
+    }
+
+    /**
+     * Set the reference to the RouteTable resource.
+     *
+     * @param routeTable the routeTable value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withRouteTable(RouteTableInner routeTable) {
+        this.routeTable = routeTable;
+        return this;
+    }
+
+    /**
+     * Get nat gateway associated with this subnet.
+     *
+     * @return the natGateway value
+     */
+    public SubResource natGateway() {
+        return this.natGateway;
+    }
+
+    /**
+     * Set nat gateway associated with this subnet.
+     *
+     * @param natGateway the natGateway value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withNatGateway(SubResource natGateway) {
+        this.natGateway = natGateway;
+        return this;
+    }
+
+    /**
+     * Get an array of service endpoints.
+     *
+     * @return the serviceEndpoints value
+     */
+    public List<ServiceEndpointPropertiesFormat> serviceEndpoints() {
+        return this.serviceEndpoints;
+    }
+
+    /**
+     * Set an array of service endpoints.
+     *
+     * @param serviceEndpoints the serviceEndpoints value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints) {
+        this.serviceEndpoints = serviceEndpoints;
+        return this;
+    }
+
+    /**
+     * Get an array of service endpoint policies.
+     *
+     * @return the serviceEndpointPolicies value
+     */
+    public List<ServiceEndpointPolicyInner> serviceEndpointPolicies() {
+        return this.serviceEndpointPolicies;
+    }
+
+    /**
+     * Set an array of service endpoint policies.
+     *
+     * @param serviceEndpointPolicies the serviceEndpointPolicies value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withServiceEndpointPolicies(List<ServiceEndpointPolicyInner> serviceEndpointPolicies) {
+        this.serviceEndpointPolicies = serviceEndpointPolicies;
+        return this;
+    }
+
+    /**
+     * Get an array of references to private endpoints.
+     *
+     * @return the privateEndpoints value
+     */
+    public List<PrivateEndpointInner> privateEndpoints() {
+        return this.privateEndpoints;
+    }
+
+    /**
+     * Get an array of references to the network interface IP configurations using subnet.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<IPConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Get array of IP configuration profiles which reference this subnet.
+     *
+     * @return the ipConfigurationProfiles value
+     */
+    public List<IPConfigurationProfile> ipConfigurationProfiles() {
+        return this.ipConfigurationProfiles;
+    }
+
+    /**
+     * Get array of IpAllocation which reference this subnet.
+     *
+     * @return the ipAllocations value
+     */
+    public List<SubResource> ipAllocations() {
+        return this.ipAllocations;
+    }
+
+    /**
+     * Set array of IpAllocation which reference this subnet.
+     *
+     * @param ipAllocations the ipAllocations value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withIpAllocations(List<SubResource> ipAllocations) {
+        this.ipAllocations = ipAllocations;
+        return this;
+    }
+
+    /**
+     * Get an array of references to the external resources using subnet.
+     *
+     * @return the resourceNavigationLinks value
+     */
+    public List<ResourceNavigationLinkInner> resourceNavigationLinks() {
+        return this.resourceNavigationLinks;
+    }
+
+    /**
+     * Get an array of references to services injecting into this subnet.
+     *
+     * @return the serviceAssociationLinks value
+     */
+    public List<ServiceAssociationLinkInner> serviceAssociationLinks() {
+        return this.serviceAssociationLinks;
+    }
+
+    /**
+     * Get an array of references to the delegations on the subnet.
+     *
+     * @return the delegations value
+     */
+    public List<Delegation> delegations() {
+        return this.delegations;
+    }
+
+    /**
+     * Set an array of references to the delegations on the subnet.
+     *
+     * @param delegations the delegations value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withDelegations(List<Delegation> delegations) {
+        this.delegations = delegations;
+        return this;
+    }
+
+    /**
+     * Get a read-only string identifying the intention of use for this subnet based on delegations and other user-defined properties.
+     *
+     * @return the purpose value
+     */
+    public String purpose() {
+        return this.purpose;
+    }
+
+    /**
+     * Get the provisioning state of the subnet resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get enable or Disable apply network policies on private end point in the subnet.
+     *
+     * @return the privateEndpointNetworkPolicies value
+     */
+    public String privateEndpointNetworkPolicies() {
+        return this.privateEndpointNetworkPolicies;
+    }
+
+    /**
+     * Set enable or Disable apply network policies on private end point in the subnet.
+     *
+     * @param privateEndpointNetworkPolicies the privateEndpointNetworkPolicies value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withPrivateEndpointNetworkPolicies(String privateEndpointNetworkPolicies) {
+        this.privateEndpointNetworkPolicies = privateEndpointNetworkPolicies;
+        return this;
+    }
+
+    /**
+     * Get enable or Disable apply network policies on private link service in the subnet.
+     *
+     * @return the privateLinkServiceNetworkPolicies value
+     */
+    public String privateLinkServiceNetworkPolicies() {
+        return this.privateLinkServiceNetworkPolicies;
+    }
+
+    /**
+     * Set enable or Disable apply network policies on private link service in the subnet.
+     *
+     * @param privateLinkServiceNetworkPolicies the privateLinkServiceNetworkPolicies value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withPrivateLinkServiceNetworkPolicies(String privateLinkServiceNetworkPolicies) {
+        this.privateLinkServiceNetworkPolicies = privateLinkServiceNetworkPolicies;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the SubnetInner object itself.
+     */
+    public SubnetInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsImpl.java
new file mode 100644
index 000000000000..f8d6ed17bf22
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.Subnets;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.PrepareNetworkPoliciesRequest;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+
+class SubnetsImpl extends WrapperImpl<SubnetsInner> implements Subnets {
+    private final NetworkManager manager;
+
+    SubnetsImpl(NetworkManager manager) {
+        super(manager.inner().subnets());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public SubnetImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private SubnetImpl wrapModel(SubnetInner inner) {
+        return  new SubnetImpl(inner, manager());
+    }
+
+    private SubnetImpl wrapModel(String name) {
+        return new SubnetImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable prepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        SubnetsInner client = this.inner();
+        return client.prepareNetworkPoliciesAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters).toCompletable();
+    }
+
+    @Override
+    public Completable unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        SubnetsInner client = this.inner();
+        return client.unprepareNetworkPoliciesAsync(resourceGroupName, virtualNetworkName, subnetName).toCompletable();
+    }
+
+    @Override
+    public Observable<Subnet> listAsync(final String resourceGroupName, final String virtualNetworkName) {
+        SubnetsInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualNetworkName)
+        .flatMapIterable(new Func1<Page<SubnetInner>, Iterable<SubnetInner>>() {
+            @Override
+            public Iterable<SubnetInner> call(Page<SubnetInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SubnetInner, Subnet>() {
+            @Override
+            public Subnet call(SubnetInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<Subnet> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        SubnetsInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualNetworkName, subnetName)
+        .flatMap(new Func1<SubnetInner, Observable<Subnet>>() {
+            @Override
+            public Observable<Subnet> call(SubnetInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Subnet)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        SubnetsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, virtualNetworkName, subnetName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsInner.java
new file mode 100644
index 000000000000..0764543f949a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/SubnetsInner.java
@@ -0,0 +1,1391 @@
+/**
+ * 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.network.v2020_04_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.network.v2020_04_01.PrepareNetworkPoliciesRequest;
+import com.microsoft.azure.management.network.v2020_04_01.UnprepareNetworkPoliciesRequest;
+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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Subnets.
+ */
+public class SubnetsInner {
+    /** The Retrofit service to perform REST calls. */
+    private SubnetsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of SubnetsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SubnetsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(SubnetsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Subnets to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SubnetsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.Subnets delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @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.network.v2020_04_01.Subnets beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @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.network.v2020_04_01.Subnets get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.Subnets createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Body SubnetInner subnetParameters, @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.network.v2020_04_01.Subnets beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Body SubnetInner subnetParameters, @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.network.v2020_04_01.Subnets prepareNetworkPolicies" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/PrepareNetworkPolicies")
+        Observable<Response<ResponseBody>> prepareNetworkPolicies(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Body PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, @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.network.v2020_04_01.Subnets beginPrepareNetworkPolicies" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/PrepareNetworkPolicies")
+        Observable<Response<ResponseBody>> beginPrepareNetworkPolicies(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Body PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, @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.network.v2020_04_01.Subnets unprepareNetworkPolicies" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/UnprepareNetworkPolicies")
+        Observable<Response<ResponseBody>> unprepareNetworkPolicies(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.Subnets beginUnprepareNetworkPolicies" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/UnprepareNetworkPolicies")
+        Observable<Response<ResponseBody>> beginUnprepareNetworkPolicies(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subnetName") String subnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.Subnets list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @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.network.v2020_04_01.Subnets listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 virtualNetworkName, String subnetName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<Void> deleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 virtualNetworkName, String subnetName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified subnet.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), 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 specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 SubnetInner object if successful.
+     */
+    public SubnetInner get(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<SubnetInner> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<SubnetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<SubnetInner> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<SubnetInner>, SubnetInner>() {
+            @Override
+            public SubnetInner call(ServiceResponse<SubnetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<ServiceResponse<SubnetInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.get(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SubnetInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SubnetInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SubnetInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @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 SubnetInner object if successful.
+     */
+    public SubnetInner get(String resourceGroupName, String virtualNetworkName, String subnetName, String expand) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @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<SubnetInner> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String expand, final ServiceCallback<SubnetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<SubnetInner> getAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String expand) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, expand).map(new Func1<ServiceResponse<SubnetInner>, SubnetInner>() {
+            @Override
+            public SubnetInner call(ServiceResponse<SubnetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified subnet by virtual network and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<ServiceResponse<SubnetInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SubnetInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SubnetInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SubnetInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SubnetInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubnetInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubnetInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet 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 SubnetInner object if successful.
+     */
+    public SubnetInner createOrUpdate(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @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<SubnetInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters, final ServiceCallback<SubnetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<SubnetInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters).map(new Func1<ServiceResponse<SubnetInner>, SubnetInner>() {
+            @Override
+            public SubnetInner call(ServiceResponse<SubnetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<SubnetInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName 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 (subnetParameters == null) {
+            throw new IllegalArgumentException("Parameter subnetParameters is required and cannot be null.");
+        }
+        Validator.validate(subnetParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), subnetParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<SubnetInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet 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 SubnetInner object if successful.
+     */
+    public SubnetInner beginCreateOrUpdate(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @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<SubnetInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters, final ServiceCallback<SubnetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<SubnetInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, subnetParameters).map(new Func1<ServiceResponse<SubnetInner>, SubnetInner>() {
+            @Override
+            public SubnetInner call(ServiceResponse<SubnetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a subnet in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param subnetParameters Parameters supplied to the create or update subnet operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SubnetInner object
+     */
+    public Observable<ServiceResponse<SubnetInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, SubnetInner subnetParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName 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 (subnetParameters == null) {
+            throw new IllegalArgumentException("Parameter subnetParameters is required and cannot be null.");
+        }
+        Validator.validate(subnetParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), subnetParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SubnetInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SubnetInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SubnetInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SubnetInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SubnetInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SubnetInner>() { }.getType())
+                .register(201, new TypeToken<SubnetInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @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 prepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        prepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @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> prepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(prepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters), serviceCallback);
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> prepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        return prepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> prepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName 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 (prepareNetworkPoliciesRequestParameters == null) {
+            throw new IllegalArgumentException("Parameter prepareNetworkPoliciesRequestParameters is required and cannot be null.");
+        }
+        Validator.validate(prepareNetworkPoliciesRequestParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.prepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), prepareNetworkPoliciesRequestParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @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 beginPrepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        beginPrepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @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> beginPrepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginPrepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters), serviceCallback);
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginPrepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        return beginPrepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, prepareNetworkPoliciesRequestParameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Prepares a subnet by applying network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param prepareNetworkPoliciesRequestParameters Parameters supplied to prepare subnet by applying network intent policies.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginPrepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName 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 (prepareNetworkPoliciesRequestParameters == null) {
+            throw new IllegalArgumentException("Parameter prepareNetworkPoliciesRequestParameters is required and cannot be null.");
+        }
+        Validator.validate(prepareNetworkPoliciesRequestParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginPrepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), prepareNetworkPoliciesRequestParameters, 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 = beginPrepareNetworkPoliciesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginPrepareNetworkPoliciesDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 unprepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().last().body();
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<Void> unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> unprepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String serviceName = null;
+        UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters = new UnprepareNetworkPoliciesRequest();
+        unprepareNetworkPoliciesRequestParameters.withServiceName(null);
+        Observable<Response<ResponseBody>> observable = service.unprepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), unprepareNetworkPoliciesRequestParameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @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 unprepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName).toBlocking().last().body();
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @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> unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName), serviceCallback);
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> unprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        return unprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> unprepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters = new UnprepareNetworkPoliciesRequest();
+        unprepareNetworkPoliciesRequestParameters.withServiceName(serviceName);
+        Observable<Response<ResponseBody>> observable = service.unprepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), unprepareNetworkPoliciesRequestParameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @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 beginUnprepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).toBlocking().single().body();
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the 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<Void> beginUnprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName), serviceCallback);
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginUnprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        return beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginUnprepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String serviceName = null;
+        UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters = new UnprepareNetworkPoliciesRequest();
+        unprepareNetworkPoliciesRequestParameters.withServiceName(null);
+        return service.beginUnprepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), unprepareNetworkPoliciesRequestParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginUnprepareNetworkPoliciesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @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 beginUnprepareNetworkPolicies(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName).toBlocking().single().body();
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @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> beginUnprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName), serviceCallback);
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginUnprepareNetworkPoliciesAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        return beginUnprepareNetworkPoliciesWithServiceResponseAsync(resourceGroupName, virtualNetworkName, subnetName, serviceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Unprepares a subnet by removing network intent policies.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param subnetName The name of the subnet.
+     * @param serviceName The name of the service for which subnet is being unprepared for.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginUnprepareNetworkPoliciesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String subnetName, String serviceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (subnetName == null) {
+            throw new IllegalArgumentException("Parameter subnetName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters = new UnprepareNetworkPoliciesRequest();
+        unprepareNetworkPoliciesRequestParameters.withServiceName(serviceName);
+        return service.beginUnprepareNetworkPolicies(resourceGroupName, virtualNetworkName, subnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), unprepareNetworkPoliciesRequestParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginUnprepareNetworkPoliciesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginUnprepareNetworkPoliciesDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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;SubnetInner&gt; object if successful.
+     */
+    public PagedList<SubnetInner> list(final String resourceGroupName, final String virtualNetworkName) {
+        ServiceResponse<Page<SubnetInner>> response = listSinglePageAsync(resourceGroupName, virtualNetworkName).toBlocking().single();
+        return new PagedList<SubnetInner>(response.body()) {
+            @Override
+            public Page<SubnetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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<SubnetInner>> listAsync(final String resourceGroupName, final String virtualNetworkName, final ListOperationCallback<SubnetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualNetworkName),
+            new Func1<String, Observable<ServiceResponse<Page<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SubnetInner&gt; object
+     */
+    public Observable<Page<SubnetInner>> listAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName)
+            .map(new Func1<ServiceResponse<Page<SubnetInner>>, Page<SubnetInner>>() {
+                @Override
+                public Page<SubnetInner> call(ServiceResponse<Page<SubnetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SubnetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SubnetInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listSinglePageAsync(resourceGroupName, virtualNetworkName)
+            .concatMap(new Func1<ServiceResponse<Page<SubnetInner>>, Observable<ServiceResponse<Page<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(ServiceResponse<Page<SubnetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+    ServiceResponse<PageImpl<SubnetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<SubnetInner>> * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SubnetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SubnetInner>>> listSinglePageAsync(final String resourceGroupName, final String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SubnetInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SubnetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SubnetInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SubnetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SubnetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @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;SubnetInner&gt; object if successful.
+     */
+    public PagedList<SubnetInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<SubnetInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SubnetInner>(response.body()) {
+            @Override
+            public Page<SubnetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @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<SubnetInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<SubnetInner>> serviceFuture, final ListOperationCallback<SubnetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @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;SubnetInner&gt; object
+     */
+    public Observable<Page<SubnetInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SubnetInner>>, Page<SubnetInner>>() {
+                @Override
+                public Page<SubnetInner> call(ServiceResponse<Page<SubnetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+     * @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;SubnetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SubnetInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SubnetInner>>, Observable<ServiceResponse<Page<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(ServiceResponse<Page<SubnetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all subnets in a virtual network.
+     *
+    ServiceResponse<PageImpl<SubnetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SubnetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SubnetInner>>> 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<SubnetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SubnetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SubnetInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SubnetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SubnetInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SubnetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SubnetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyImpl.java
new file mode 100644
index 000000000000..c32758428eb3
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyImpl.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.
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Topology;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TopologyResource;
+
+class TopologyImpl extends WrapperImpl<TopologyInner> implements Topology {
+    private final NetworkManager manager;
+    TopologyImpl(TopologyInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public DateTime createdDateTime() {
+        return this.inner().createdDateTime();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public DateTime lastModified() {
+        return this.inner().lastModified();
+    }
+
+    @Override
+    public List<TopologyResource> resources() {
+        return this.inner().resources();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyInner.java
new file mode 100644
index 000000000000..32c8216272df
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TopologyInner.java
@@ -0,0 +1,92 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TopologyResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Topology of the specified resource group.
+ */
+public class TopologyInner {
+    /**
+     * GUID representing the operation id.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * The datetime when the topology was initially created for the resource
+     * group.
+     */
+    @JsonProperty(value = "createdDateTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdDateTime;
+
+    /**
+     * The datetime when the topology was last modified.
+     */
+    @JsonProperty(value = "lastModified", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastModified;
+
+    /**
+     * A list of topology resources.
+     */
+    @JsonProperty(value = "resources")
+    private List<TopologyResource> resources;
+
+    /**
+     * Get gUID representing the operation id.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the datetime when the topology was initially created for the resource group.
+     *
+     * @return the createdDateTime value
+     */
+    public DateTime createdDateTime() {
+        return this.createdDateTime;
+    }
+
+    /**
+     * Get the datetime when the topology was last modified.
+     *
+     * @return the lastModified value
+     */
+    public DateTime lastModified() {
+        return this.lastModified;
+    }
+
+    /**
+     * Get a list of topology resources.
+     *
+     * @return the resources value
+     */
+    public List<TopologyResource> resources() {
+        return this.resources;
+    }
+
+    /**
+     * Set a list of topology resources.
+     *
+     * @param resources the resources value to set
+     * @return the TopologyInner object itself.
+     */
+    public TopologyInner withResources(List<TopologyResource> resources) {
+        this.resources = resources;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultImpl.java
new file mode 100644
index 000000000000..422ab3a8897a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultImpl.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.
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingDetails;
+
+class TroubleshootingResultImpl extends WrapperImpl<TroubleshootingResultInner> implements TroubleshootingResult {
+    private final NetworkManager manager;
+    TroubleshootingResultImpl(TroubleshootingResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String code() {
+        return this.inner().code();
+    }
+
+    @Override
+    public DateTime endTime() {
+        return this.inner().endTime();
+    }
+
+    @Override
+    public List<TroubleshootingDetails> results() {
+        return this.inner().results();
+    }
+
+    @Override
+    public DateTime startTime() {
+        return this.inner().startTime();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultInner.java
new file mode 100644
index 000000000000..150b60802a83
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/TroubleshootingResultInner.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.network.v2020_04_01.implementation;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TroubleshootingDetails;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Troubleshooting information gained from specified resource.
+ */
+public class TroubleshootingResultInner {
+    /**
+     * The start time of the troubleshooting.
+     */
+    @JsonProperty(value = "startTime")
+    private DateTime startTime;
+
+    /**
+     * The end time of the troubleshooting.
+     */
+    @JsonProperty(value = "endTime")
+    private DateTime endTime;
+
+    /**
+     * The result code of the troubleshooting.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Information from troubleshooting.
+     */
+    @JsonProperty(value = "results")
+    private List<TroubleshootingDetails> results;
+
+    /**
+     * Get the start time of the troubleshooting.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Set the start time of the troubleshooting.
+     *
+     * @param startTime the startTime value to set
+     * @return the TroubleshootingResultInner object itself.
+     */
+    public TroubleshootingResultInner withStartTime(DateTime startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    /**
+     * Get the end time of the troubleshooting.
+     *
+     * @return the endTime value
+     */
+    public DateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Set the end time of the troubleshooting.
+     *
+     * @param endTime the endTime value to set
+     * @return the TroubleshootingResultInner object itself.
+     */
+    public TroubleshootingResultInner withEndTime(DateTime endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+    /**
+     * Get the result code of the troubleshooting.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set the result code of the troubleshooting.
+     *
+     * @param code the code value to set
+     * @return the TroubleshootingResultInner object itself.
+     */
+    public TroubleshootingResultInner withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get information from troubleshooting.
+     *
+     * @return the results value
+     */
+    public List<TroubleshootingDetails> results() {
+        return this.results;
+    }
+
+    /**
+     * Set information from troubleshooting.
+     *
+     * @param results the results value to set
+     * @return the TroubleshootingResultInner object itself.
+     */
+    public TroubleshootingResultInner withResults(List<TroubleshootingDetails> results) {
+        this.results = results;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageImpl.java
new file mode 100644
index 000000000000..e558a4c90c77
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Usage;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.UsageName;
+
+class UsageImpl extends WrapperImpl<UsageInner> implements Usage {
+    private final NetworkManager manager;
+
+    UsageImpl(UsageInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public long currentValue() {
+        return this.inner().currentValue();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public long limit() {
+        return this.inner().limit();
+    }
+
+    @Override
+    public UsageName name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String unit() {
+        return this.inner().unit();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageInner.java
new file mode 100644
index 000000000000..916ca258668d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsageInner.java
@@ -0,0 +1,147 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.UsageName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The network resource usage.
+ */
+public class UsageInner {
+    /**
+     * Resource identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * An enum describing the unit of measurement.
+     */
+    @JsonProperty(value = "unit", required = true)
+    private String unit;
+
+    /**
+     * The current value of the usage.
+     */
+    @JsonProperty(value = "currentValue", required = true)
+    private long currentValue;
+
+    /**
+     * The limit of usage.
+     */
+    @JsonProperty(value = "limit", required = true)
+    private long limit;
+
+    /**
+     * The name of the type of usage.
+     */
+    @JsonProperty(value = "name", required = true)
+    private UsageName name;
+
+    /**
+     * Creates an instance of UsageInner class.
+     * @param currentValue the current value of the usage.
+     * @param limit the limit of usage.
+     * @param name the name of the type of usage.
+     */
+    public UsageInner() {
+        unit = "Count";
+    }
+
+    /**
+     * Get resource identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get an enum describing the unit of measurement.
+     *
+     * @return the unit value
+     */
+    public String unit() {
+        return this.unit;
+    }
+
+    /**
+     * Set an enum describing the unit of measurement.
+     *
+     * @param unit the unit value to set
+     * @return the UsageInner object itself.
+     */
+    public UsageInner withUnit(String unit) {
+        this.unit = unit;
+        return this;
+    }
+
+    /**
+     * Get the current value of the usage.
+     *
+     * @return the currentValue value
+     */
+    public long currentValue() {
+        return this.currentValue;
+    }
+
+    /**
+     * Set the current value of the usage.
+     *
+     * @param currentValue the currentValue value to set
+     * @return the UsageInner object itself.
+     */
+    public UsageInner withCurrentValue(long currentValue) {
+        this.currentValue = currentValue;
+        return this;
+    }
+
+    /**
+     * Get the limit of usage.
+     *
+     * @return the limit value
+     */
+    public long limit() {
+        return this.limit;
+    }
+
+    /**
+     * Set the limit of usage.
+     *
+     * @param limit the limit value to set
+     * @return the UsageInner object itself.
+     */
+    public UsageInner withLimit(long limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    /**
+     * Get the name of the type of usage.
+     *
+     * @return the name value
+     */
+    public UsageName name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the type of usage.
+     *
+     * @param name the name value to set
+     * @return the UsageInner object itself.
+     */
+    public UsageInner withName(UsageName name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesImpl.java
new file mode 100644
index 000000000000..fc4eb537590f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.Usages;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.Usage;
+
+class UsagesImpl extends WrapperImpl<UsagesInner> implements Usages {
+    private final NetworkManager manager;
+
+    UsagesImpl(NetworkManager manager) {
+        super(manager.inner().usages());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private UsageImpl wrapModel(UsageInner inner) {
+        return  new UsageImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<Usage> listAsync(final String location) {
+        UsagesInner client = this.inner();
+        return client.listAsync(location)
+        .flatMapIterable(new Func1<Page<UsageInner>, Iterable<UsageInner>>() {
+            @Override
+            public Iterable<UsageInner> call(Page<UsageInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<UsageInner, Usage>() {
+            @Override
+            public Usage call(UsageInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesInner.java
new file mode 100644
index 000000000000..f662716c237b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/UsagesInner.java
@@ -0,0 +1,293 @@
+/**
+ * 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.network.v2020_04_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.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 Usages.
+ */
+public class UsagesInner {
+    /** The Retrofit service to perform REST calls. */
+    private UsagesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of UsagesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public UsagesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(UsagesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Usages to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface UsagesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.Usages list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/usages")
+        Observable<Response<ResponseBody>> list(@Path("location") String location, @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.network.v2020_04_01.Usages listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @param location The location where resource usage is queried.
+     * @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;UsageInner&gt; object if successful.
+     */
+    public PagedList<UsageInner> list(final String location) {
+        ServiceResponse<Page<UsageInner>> response = listSinglePageAsync(location).toBlocking().single();
+        return new PagedList<UsageInner>(response.body()) {
+            @Override
+            public Page<UsageInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @param location The location where resource usage is queried.
+     * @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<UsageInner>> listAsync(final String location, final ListOperationCallback<UsageInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @param location The location where resource usage is queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;UsageInner&gt; object
+     */
+    public Observable<Page<UsageInner>> listAsync(final String location) {
+        return listWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<UsageInner>>, Page<UsageInner>>() {
+                @Override
+                public Page<UsageInner> call(ServiceResponse<Page<UsageInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @param location The location where resource usage is queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;UsageInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<UsageInner>>> listWithServiceResponseAsync(final String location) {
+        return listSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<UsageInner>>, Observable<ServiceResponse<Page<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(ServiceResponse<Page<UsageInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+    ServiceResponse<PageImpl<UsageInner>> * @param location The location where resource usage is queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;UsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<UsageInner>>> listSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<UsageInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<UsageInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<UsageInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<UsageInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @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;UsageInner&gt; object if successful.
+     */
+    public PagedList<UsageInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<UsageInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<UsageInner>(response.body()) {
+            @Override
+            public Page<UsageInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @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<UsageInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<UsageInner>> serviceFuture, final ListOperationCallback<UsageInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @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;UsageInner&gt; object
+     */
+    public Observable<Page<UsageInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<UsageInner>>, Page<UsageInner>>() {
+                @Override
+                public Page<UsageInner> call(ServiceResponse<Page<UsageInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+     * @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;UsageInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<UsageInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<UsageInner>>, Observable<ServiceResponse<Page<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(ServiceResponse<Page<UsageInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List network usages for a subscription.
+     *
+    ServiceResponse<PageImpl<UsageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;UsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<UsageInner>>> 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<UsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<UsageInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<UsageInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<UsageInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<UsageInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultImpl.java
new file mode 100644
index 000000000000..b4e4a6395848
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VerificationIPFlowResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.Access;
+
+class VerificationIPFlowResultImpl extends WrapperImpl<VerificationIPFlowResultInner> implements VerificationIPFlowResult {
+    private final NetworkManager manager;
+    VerificationIPFlowResultImpl(VerificationIPFlowResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Access access() {
+        return this.inner().access();
+    }
+
+    @Override
+    public String ruleName() {
+        return this.inner().ruleName();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultInner.java
new file mode 100644
index 000000000000..ddcb58bc7557
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VerificationIPFlowResultInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.Access;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Results of IP flow verification on the target resource.
+ */
+public class VerificationIPFlowResultInner {
+    /**
+     * Indicates whether the traffic is allowed or denied. Possible values
+     * include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "access")
+    private Access access;
+
+    /**
+     * Name of the rule. If input is not matched against any security rule, it
+     * is not displayed.
+     */
+    @JsonProperty(value = "ruleName")
+    private String ruleName;
+
+    /**
+     * Get indicates whether the traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the access value
+     */
+    public Access access() {
+        return this.access;
+    }
+
+    /**
+     * Set indicates whether the traffic is allowed or denied. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param access the access value to set
+     * @return the VerificationIPFlowResultInner object itself.
+     */
+    public VerificationIPFlowResultInner withAccess(Access access) {
+        this.access = access;
+        return this;
+    }
+
+    /**
+     * Get name of the rule. If input is not matched against any security rule, it is not displayed.
+     *
+     * @return the ruleName value
+     */
+    public String ruleName() {
+        return this.ruleName;
+    }
+
+    /**
+     * Set name of the rule. If input is not matched against any security rule, it is not displayed.
+     *
+     * @param ruleName the ruleName value to set
+     * @return the VerificationIPFlowResultInner object itself.
+     */
+    public VerificationIPFlowResultInner withRuleName(String ruleName) {
+        this.ruleName = ruleName;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubImpl.java
new file mode 100644
index 000000000000..ce2d8b1a21f1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubImpl.java
@@ -0,0 +1,207 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHub;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2;
+import com.microsoft.azure.management.network.v2020_04_01.HubVirtualNetworkConnection;
+
+class VirtualHubImpl extends GroupableResourceCoreImpl<VirtualHub, VirtualHubInner, VirtualHubImpl, NetworkManager> implements VirtualHub, VirtualHub.Definition, VirtualHub.Update {
+    VirtualHubImpl(String name, VirtualHubInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualHub> createResourceAsync() {
+        VirtualHubsInner client = this.manager().inner().virtualHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualHub> updateResourceAsync() {
+        VirtualHubsInner client = this.manager().inner().virtualHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualHubInner> getInnerAsync() {
+        VirtualHubsInner client = this.manager().inner().virtualHubs();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String addressPrefix() {
+        return this.inner().addressPrefix();
+    }
+
+    @Override
+    public SubResource azureFirewall() {
+        return this.inner().azureFirewall();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource expressRouteGateway() {
+        return this.inner().expressRouteGateway();
+    }
+
+    @Override
+    public SubResource p2SVpnGateway() {
+        return this.inner().p2SVpnGateway();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public VirtualHubRouteTable routeTable() {
+        return this.inner().routeTable();
+    }
+
+    @Override
+    public SubResource securityPartnerProvider() {
+        return this.inner().securityPartnerProvider();
+    }
+
+    @Override
+    public String securityProviderName() {
+        return this.inner().securityProviderName();
+    }
+
+    @Override
+    public String sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public List<VirtualHubRouteTableV2> virtualHubRouteTableV2s() {
+        List<VirtualHubRouteTableV2> lst = new ArrayList<VirtualHubRouteTableV2>();
+        if (this.inner().virtualHubRouteTableV2s() != null) {
+            for (VirtualHubRouteTableV2Inner inner : this.inner().virtualHubRouteTableV2s()) {
+                lst.add( new VirtualHubRouteTableV2Impl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<HubVirtualNetworkConnection> virtualNetworkConnections() {
+        List<HubVirtualNetworkConnection> lst = new ArrayList<HubVirtualNetworkConnection>();
+        if (this.inner().virtualNetworkConnections() != null) {
+            for (HubVirtualNetworkConnectionInner inner : this.inner().virtualNetworkConnections()) {
+                lst.add( new HubVirtualNetworkConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public SubResource virtualWan() {
+        return this.inner().virtualWan();
+    }
+
+    @Override
+    public SubResource vpnGateway() {
+        return this.inner().vpnGateway();
+    }
+
+    @Override
+    public VirtualHubImpl withAddressPrefix(String addressPrefix) {
+        this.inner().withAddressPrefix(addressPrefix);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withAzureFirewall(SubResource azureFirewall) {
+        this.inner().withAzureFirewall(azureFirewall);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withExpressRouteGateway(SubResource expressRouteGateway) {
+        this.inner().withExpressRouteGateway(expressRouteGateway);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withP2SVpnGateway(SubResource p2SVpnGateway) {
+        this.inner().withP2SVpnGateway(p2SVpnGateway);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withRouteTable(VirtualHubRouteTable routeTable) {
+        this.inner().withRouteTable(routeTable);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withSecurityPartnerProvider(SubResource securityPartnerProvider) {
+        this.inner().withSecurityPartnerProvider(securityPartnerProvider);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withSecurityProviderName(String securityProviderName) {
+        this.inner().withSecurityProviderName(securityProviderName);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withSku(String sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withVirtualHubRouteTableV2s(List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s) {
+        this.inner().withVirtualHubRouteTableV2s(virtualHubRouteTableV2s);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> virtualNetworkConnections) {
+        this.inner().withVirtualNetworkConnections(virtualNetworkConnections);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withVirtualWan(SubResource virtualWan) {
+        this.inner().withVirtualWan(virtualWan);
+        return this;
+    }
+
+    @Override
+    public VirtualHubImpl withVpnGateway(SubResource vpnGateway) {
+        this.inner().withVpnGateway(vpnGateway);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubInner.java
new file mode 100644
index 000000000000..cd1a6b9621dd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubInner.java
@@ -0,0 +1,395 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VirtualHub Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualHubInner extends Resource {
+    /**
+     * The VirtualWAN to which the VirtualHub belongs.
+     */
+    @JsonProperty(value = "properties.virtualWan")
+    private SubResource virtualWan;
+
+    /**
+     * The VpnGateway associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.vpnGateway")
+    private SubResource vpnGateway;
+
+    /**
+     * The P2SVpnGateway associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.p2SVpnGateway")
+    private SubResource p2SVpnGateway;
+
+    /**
+     * The expressRouteGateway associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.expressRouteGateway")
+    private SubResource expressRouteGateway;
+
+    /**
+     * The azureFirewall associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.azureFirewall")
+    private SubResource azureFirewall;
+
+    /**
+     * The securityPartnerProvider associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.securityPartnerProvider")
+    private SubResource securityPartnerProvider;
+
+    /**
+     * List of all vnet connections with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.virtualNetworkConnections")
+    private List<HubVirtualNetworkConnectionInner> virtualNetworkConnections;
+
+    /**
+     * Address-prefix for this VirtualHub.
+     */
+    @JsonProperty(value = "properties.addressPrefix")
+    private String addressPrefix;
+
+    /**
+     * The routeTable associated with this virtual hub.
+     */
+    @JsonProperty(value = "properties.routeTable")
+    private VirtualHubRouteTable routeTable;
+
+    /**
+     * The provisioning state of the virtual hub resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The Security Provider name.
+     */
+    @JsonProperty(value = "properties.securityProviderName")
+    private String securityProviderName;
+
+    /**
+     * List of all virtual hub route table v2s associated with this VirtualHub.
+     */
+    @JsonProperty(value = "properties.virtualHubRouteTableV2s")
+    private List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s;
+
+    /**
+     * The sku of this VirtualHub.
+     */
+    @JsonProperty(value = "properties.sku")
+    private String sku;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the VirtualWAN to which the VirtualHub belongs.
+     *
+     * @return the virtualWan value
+     */
+    public SubResource virtualWan() {
+        return this.virtualWan;
+    }
+
+    /**
+     * Set the VirtualWAN to which the VirtualHub belongs.
+     *
+     * @param virtualWan the virtualWan value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withVirtualWan(SubResource virtualWan) {
+        this.virtualWan = virtualWan;
+        return this;
+    }
+
+    /**
+     * Get the VpnGateway associated with this VirtualHub.
+     *
+     * @return the vpnGateway value
+     */
+    public SubResource vpnGateway() {
+        return this.vpnGateway;
+    }
+
+    /**
+     * Set the VpnGateway associated with this VirtualHub.
+     *
+     * @param vpnGateway the vpnGateway value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withVpnGateway(SubResource vpnGateway) {
+        this.vpnGateway = vpnGateway;
+        return this;
+    }
+
+    /**
+     * Get the P2SVpnGateway associated with this VirtualHub.
+     *
+     * @return the p2SVpnGateway value
+     */
+    public SubResource p2SVpnGateway() {
+        return this.p2SVpnGateway;
+    }
+
+    /**
+     * Set the P2SVpnGateway associated with this VirtualHub.
+     *
+     * @param p2SVpnGateway the p2SVpnGateway value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withP2SVpnGateway(SubResource p2SVpnGateway) {
+        this.p2SVpnGateway = p2SVpnGateway;
+        return this;
+    }
+
+    /**
+     * Get the expressRouteGateway associated with this VirtualHub.
+     *
+     * @return the expressRouteGateway value
+     */
+    public SubResource expressRouteGateway() {
+        return this.expressRouteGateway;
+    }
+
+    /**
+     * Set the expressRouteGateway associated with this VirtualHub.
+     *
+     * @param expressRouteGateway the expressRouteGateway value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withExpressRouteGateway(SubResource expressRouteGateway) {
+        this.expressRouteGateway = expressRouteGateway;
+        return this;
+    }
+
+    /**
+     * Get the azureFirewall associated with this VirtualHub.
+     *
+     * @return the azureFirewall value
+     */
+    public SubResource azureFirewall() {
+        return this.azureFirewall;
+    }
+
+    /**
+     * Set the azureFirewall associated with this VirtualHub.
+     *
+     * @param azureFirewall the azureFirewall value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withAzureFirewall(SubResource azureFirewall) {
+        this.azureFirewall = azureFirewall;
+        return this;
+    }
+
+    /**
+     * Get the securityPartnerProvider associated with this VirtualHub.
+     *
+     * @return the securityPartnerProvider value
+     */
+    public SubResource securityPartnerProvider() {
+        return this.securityPartnerProvider;
+    }
+
+    /**
+     * Set the securityPartnerProvider associated with this VirtualHub.
+     *
+     * @param securityPartnerProvider the securityPartnerProvider value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withSecurityPartnerProvider(SubResource securityPartnerProvider) {
+        this.securityPartnerProvider = securityPartnerProvider;
+        return this;
+    }
+
+    /**
+     * Get list of all vnet connections with this VirtualHub.
+     *
+     * @return the virtualNetworkConnections value
+     */
+    public List<HubVirtualNetworkConnectionInner> virtualNetworkConnections() {
+        return this.virtualNetworkConnections;
+    }
+
+    /**
+     * Set list of all vnet connections with this VirtualHub.
+     *
+     * @param virtualNetworkConnections the virtualNetworkConnections value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> virtualNetworkConnections) {
+        this.virtualNetworkConnections = virtualNetworkConnections;
+        return this;
+    }
+
+    /**
+     * Get address-prefix for this VirtualHub.
+     *
+     * @return the addressPrefix value
+     */
+    public String addressPrefix() {
+        return this.addressPrefix;
+    }
+
+    /**
+     * Set address-prefix for this VirtualHub.
+     *
+     * @param addressPrefix the addressPrefix value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withAddressPrefix(String addressPrefix) {
+        this.addressPrefix = addressPrefix;
+        return this;
+    }
+
+    /**
+     * Get the routeTable associated with this virtual hub.
+     *
+     * @return the routeTable value
+     */
+    public VirtualHubRouteTable routeTable() {
+        return this.routeTable;
+    }
+
+    /**
+     * Set the routeTable associated with this virtual hub.
+     *
+     * @param routeTable the routeTable value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withRouteTable(VirtualHubRouteTable routeTable) {
+        this.routeTable = routeTable;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the virtual hub resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the Security Provider name.
+     *
+     * @return the securityProviderName value
+     */
+    public String securityProviderName() {
+        return this.securityProviderName;
+    }
+
+    /**
+     * Set the Security Provider name.
+     *
+     * @param securityProviderName the securityProviderName value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withSecurityProviderName(String securityProviderName) {
+        this.securityProviderName = securityProviderName;
+        return this;
+    }
+
+    /**
+     * Get list of all virtual hub route table v2s associated with this VirtualHub.
+     *
+     * @return the virtualHubRouteTableV2s value
+     */
+    public List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s() {
+        return this.virtualHubRouteTableV2s;
+    }
+
+    /**
+     * Set list of all virtual hub route table v2s associated with this VirtualHub.
+     *
+     * @param virtualHubRouteTableV2s the virtualHubRouteTableV2s value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withVirtualHubRouteTableV2s(List<VirtualHubRouteTableV2Inner> virtualHubRouteTableV2s) {
+        this.virtualHubRouteTableV2s = virtualHubRouteTableV2s;
+        return this;
+    }
+
+    /**
+     * Get the sku of this VirtualHub.
+     *
+     * @return the sku value
+     */
+    public String sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku of this VirtualHub.
+     *
+     * @param sku the sku value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withSku(String sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualHubInner object itself.
+     */
+    public VirtualHubInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Impl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Impl.java
new file mode 100644
index 000000000000..139d60b09545
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Impl.java
@@ -0,0 +1,136 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteV2;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualHubRouteTableV2Impl extends CreatableUpdatableImpl<VirtualHubRouteTableV2, VirtualHubRouteTableV2Inner, VirtualHubRouteTableV2Impl> implements VirtualHubRouteTableV2, VirtualHubRouteTableV2.Definition, VirtualHubRouteTableV2.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualHubName;
+    private String routeTableName;
+
+    VirtualHubRouteTableV2Impl(String name, NetworkManager manager) {
+        super(name, new VirtualHubRouteTableV2Inner());
+        this.manager = manager;
+        // Set resource name
+        this.routeTableName = name;
+        //
+    }
+
+    VirtualHubRouteTableV2Impl(VirtualHubRouteTableV2Inner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.routeTableName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualHubs");
+        this.routeTableName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeTables");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VirtualHubRouteTableV2> createResourceAsync() {
+        VirtualHubRouteTableV2sInner client = this.manager().inner().virtualHubRouteTableV2s();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualHubRouteTableV2> updateResourceAsync() {
+        VirtualHubRouteTableV2sInner client = this.manager().inner().virtualHubRouteTableV2s();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualHubRouteTableV2Inner> getInnerAsync() {
+        VirtualHubRouteTableV2sInner client = this.manager().inner().virtualHubRouteTableV2s();
+        return client.getAsync(this.resourceGroupName, this.virtualHubName, this.routeTableName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<String> attachedConnections() {
+        return this.inner().attachedConnections();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<VirtualHubRouteV2> routes() {
+        return this.inner().routes();
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl withExistingVirtualHub(String resourceGroupName, String virtualHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.virtualHubName = virtualHubName;
+        return this;
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl withAttachedConnections(List<String> attachedConnections) {
+        this.inner().withAttachedConnections(attachedConnections);
+        return this;
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl withRoutes(List<VirtualHubRouteV2> routes) {
+        this.inner().withRoutes(routes);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Inner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Inner.java
new file mode 100644
index 000000000000..367780ddd26c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2Inner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteV2;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * VirtualHubRouteTableV2 Resource.
+ */
+@JsonFlatten
+public class VirtualHubRouteTableV2Inner extends SubResource {
+    /**
+     * List of all routes.
+     */
+    @JsonProperty(value = "properties.routes")
+    private List<VirtualHubRouteV2> routes;
+
+    /**
+     * List of all connections attached to this route table v2.
+     */
+    @JsonProperty(value = "properties.attachedConnections")
+    private List<String> attachedConnections;
+
+    /**
+     * The provisioning state of the virtual hub route table v2 resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get list of all routes.
+     *
+     * @return the routes value
+     */
+    public List<VirtualHubRouteV2> routes() {
+        return this.routes;
+    }
+
+    /**
+     * Set list of all routes.
+     *
+     * @param routes the routes value to set
+     * @return the VirtualHubRouteTableV2Inner object itself.
+     */
+    public VirtualHubRouteTableV2Inner withRoutes(List<VirtualHubRouteV2> routes) {
+        this.routes = routes;
+        return this;
+    }
+
+    /**
+     * Get list of all connections attached to this route table v2.
+     *
+     * @return the attachedConnections value
+     */
+    public List<String> attachedConnections() {
+        return this.attachedConnections;
+    }
+
+    /**
+     * Set list of all connections attached to this route table v2.
+     *
+     * @param attachedConnections the attachedConnections value to set
+     * @return the VirtualHubRouteTableV2Inner object itself.
+     */
+    public VirtualHubRouteTableV2Inner withAttachedConnections(List<String> attachedConnections) {
+        this.attachedConnections = attachedConnections;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the virtual hub route table v2 resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VirtualHubRouteTableV2Inner object itself.
+     */
+    public VirtualHubRouteTableV2Inner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sImpl.java
new file mode 100644
index 000000000000..fc1f0269a6bb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2s;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2;
+
+class VirtualHubRouteTableV2sImpl extends WrapperImpl<VirtualHubRouteTableV2sInner> implements VirtualHubRouteTableV2s {
+    private final NetworkManager manager;
+
+    VirtualHubRouteTableV2sImpl(NetworkManager manager) {
+        super(manager.inner().virtualHubRouteTableV2s());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public VirtualHubRouteTableV2Impl define(String name) {
+        return wrapModel(name);
+    }
+
+    private VirtualHubRouteTableV2Impl wrapModel(VirtualHubRouteTableV2Inner inner) {
+        return  new VirtualHubRouteTableV2Impl(inner, manager());
+    }
+
+    private VirtualHubRouteTableV2Impl wrapModel(String name) {
+        return new VirtualHubRouteTableV2Impl(name, this.manager());
+    }
+
+    @Override
+    public Observable<VirtualHubRouteTableV2> listAsync(final String resourceGroupName, final String virtualHubName) {
+        VirtualHubRouteTableV2sInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualHubName)
+        .flatMapIterable(new Func1<Page<VirtualHubRouteTableV2Inner>, Iterable<VirtualHubRouteTableV2Inner>>() {
+            @Override
+            public Iterable<VirtualHubRouteTableV2Inner> call(Page<VirtualHubRouteTableV2Inner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualHubRouteTableV2Inner, VirtualHubRouteTableV2>() {
+            @Override
+            public VirtualHubRouteTableV2 call(VirtualHubRouteTableV2Inner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualHubRouteTableV2> getAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        VirtualHubRouteTableV2sInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualHubName, routeTableName)
+        .flatMap(new Func1<VirtualHubRouteTableV2Inner, Observable<VirtualHubRouteTableV2>>() {
+            @Override
+            public Observable<VirtualHubRouteTableV2> call(VirtualHubRouteTableV2Inner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualHubRouteTableV2)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        VirtualHubRouteTableV2sInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, virtualHubName, routeTableName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sInner.java
new file mode 100644
index 000000000000..13b57269989a
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubRouteTableV2sInner.java
@@ -0,0 +1,765 @@
+/**
+ * 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.network.v2020_04_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.network.v2020_04_01.ErrorException;
+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 VirtualHubRouteTableV2s.
+ */
+public class VirtualHubRouteTableV2sInner {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualHubRouteTableV2sService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualHubRouteTableV2sInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualHubRouteTableV2sInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualHubRouteTableV2sService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualHubRouteTableV2s to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualHubRouteTableV2sService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualHubRouteTableV2s get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.VirtualHubRouteTableV2s createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @Query("api-version") String apiVersion, @Body VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters, @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.network.v2020_04_01.VirtualHubRouteTableV2s beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @Query("api-version") String apiVersion, @Body VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters, @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.network.v2020_04_01.VirtualHubRouteTableV2s delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.VirtualHubRouteTableV2s beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Path("routeTableName") String routeTableName, @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.network.v2020_04_01.VirtualHubRouteTableV2s list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.VirtualHubRouteTableV2s listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualHubRouteTableV2Inner object if successful.
+     */
+    public VirtualHubRouteTableV2Inner get(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @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<VirtualHubRouteTableV2Inner> getAsync(String resourceGroupName, String virtualHubName, String routeTableName, final ServiceCallback<VirtualHubRouteTableV2Inner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubRouteTableV2Inner object
+     */
+    public Observable<VirtualHubRouteTableV2Inner> getAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<VirtualHubRouteTableV2Inner>, VirtualHubRouteTableV2Inner>() {
+            @Override
+            public VirtualHubRouteTableV2Inner call(ServiceResponse<VirtualHubRouteTableV2Inner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubRouteTableV2Inner object
+     */
+    public Observable<ServiceResponse<VirtualHubRouteTableV2Inner>> getWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubRouteTableV2Inner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubRouteTableV2Inner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubRouteTableV2Inner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualHubRouteTableV2Inner> getDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualHubRouteTableV2Inner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualHubRouteTableV2Inner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualHubRouteTableV2Inner object if successful.
+     */
+    public VirtualHubRouteTableV2Inner createOrUpdate(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @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<VirtualHubRouteTableV2Inner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters, final ServiceCallback<VirtualHubRouteTableV2Inner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualHubRouteTableV2Inner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters).map(new Func1<ServiceResponse<VirtualHubRouteTableV2Inner>, VirtualHubRouteTableV2Inner>() {
+            @Override
+            public VirtualHubRouteTableV2Inner call(ServiceResponse<VirtualHubRouteTableV2Inner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualHubRouteTableV2Inner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (virtualHubRouteTableV2Parameters == null) {
+            throw new IllegalArgumentException("Parameter virtualHubRouteTableV2Parameters is required and cannot be null.");
+        }
+        Validator.validate(virtualHubRouteTableV2Parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, virtualHubRouteTableV2Parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualHubRouteTableV2Inner>() { }.getType());
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualHubRouteTableV2Inner object if successful.
+     */
+    public VirtualHubRouteTableV2Inner beginCreateOrUpdate(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @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<VirtualHubRouteTableV2Inner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters, final ServiceCallback<VirtualHubRouteTableV2Inner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubRouteTableV2Inner object
+     */
+    public Observable<VirtualHubRouteTableV2Inner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName, virtualHubRouteTableV2Parameters).map(new Func1<ServiceResponse<VirtualHubRouteTableV2Inner>, VirtualHubRouteTableV2Inner>() {
+            @Override
+            public VirtualHubRouteTableV2Inner call(ServiceResponse<VirtualHubRouteTableV2Inner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @param virtualHubRouteTableV2Parameters Parameters supplied to create or update VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubRouteTableV2Inner object
+     */
+    public Observable<ServiceResponse<VirtualHubRouteTableV2Inner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName, VirtualHubRouteTableV2Inner virtualHubRouteTableV2Parameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        if (virtualHubRouteTableV2Parameters == null) {
+            throw new IllegalArgumentException("Parameter virtualHubRouteTableV2Parameters is required and cannot be null.");
+        }
+        Validator.validate(virtualHubRouteTableV2Parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, virtualHubRouteTableV2Parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubRouteTableV2Inner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubRouteTableV2Inner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubRouteTableV2Inner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualHubRouteTableV2Inner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualHubRouteTableV2Inner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualHubRouteTableV2Inner>() { }.getType())
+                .register(201, new TypeToken<VirtualHubRouteTableV2Inner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualHubName, String routeTableName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @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 virtualHubName, String routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualHubName, String routeTableName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @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 virtualHubName, String routeTableName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName, routeTableName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualHubRouteTableV2.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHubRouteTableV2.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param routeTableName The name of the VirtualHubRouteTableV2.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName, String routeTableName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (routeTableName == null) {
+            throw new IllegalArgumentException("Parameter routeTableName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, virtualHubName, routeTableName, 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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;VirtualHubRouteTableV2Inner&gt; object if successful.
+     */
+    public PagedList<VirtualHubRouteTableV2Inner> list(final String resourceGroupName, final String virtualHubName) {
+        ServiceResponse<Page<VirtualHubRouteTableV2Inner>> response = listSinglePageAsync(resourceGroupName, virtualHubName).toBlocking().single();
+        return new PagedList<VirtualHubRouteTableV2Inner>(response.body()) {
+            @Override
+            public Page<VirtualHubRouteTableV2Inner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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<VirtualHubRouteTableV2Inner>> listAsync(final String resourceGroupName, final String virtualHubName, final ListOperationCallback<VirtualHubRouteTableV2Inner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualHubName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubRouteTableV2Inner&gt; object
+     */
+    public Observable<Page<VirtualHubRouteTableV2Inner>> listAsync(final String resourceGroupName, final String virtualHubName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualHubName)
+            .map(new Func1<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>, Page<VirtualHubRouteTableV2Inner>>() {
+                @Override
+                public Page<VirtualHubRouteTableV2Inner> call(ServiceResponse<Page<VirtualHubRouteTableV2Inner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubRouteTableV2Inner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualHubName) {
+        return listSinglePageAsync(resourceGroupName, virtualHubName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>, Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(ServiceResponse<Page<VirtualHubRouteTableV2Inner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+    ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> * @param resourceGroupName The resource group name of the VirtualHub.
+    ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubRouteTableV2Inner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> listSinglePageAsync(final String resourceGroupName, final String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubRouteTableV2Inner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubRouteTableV2Inner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubRouteTableV2Inner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @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;VirtualHubRouteTableV2Inner&gt; object if successful.
+     */
+    public PagedList<VirtualHubRouteTableV2Inner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualHubRouteTableV2Inner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualHubRouteTableV2Inner>(response.body()) {
+            @Override
+            public Page<VirtualHubRouteTableV2Inner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @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<VirtualHubRouteTableV2Inner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualHubRouteTableV2Inner>> serviceFuture, final ListOperationCallback<VirtualHubRouteTableV2Inner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @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;VirtualHubRouteTableV2Inner&gt; object
+     */
+    public Observable<Page<VirtualHubRouteTableV2Inner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>, Page<VirtualHubRouteTableV2Inner>>() {
+                @Override
+                public Page<VirtualHubRouteTableV2Inner> call(ServiceResponse<Page<VirtualHubRouteTableV2Inner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+     * @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;VirtualHubRouteTableV2Inner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>, Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(ServiceResponse<Page<VirtualHubRouteTableV2Inner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the details of all VirtualHubRouteTableV2s.
+     *
+    ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubRouteTableV2Inner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> 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<VirtualHubRouteTableV2Inner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubRouteTableV2Inner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubRouteTableV2Inner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubRouteTableV2Inner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubRouteTableV2Inner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubRouteTableV2Inner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsImpl.java
new file mode 100644
index 000000000000..ea65c8ac8570
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHubs;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualHub;
+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;
+
+class VirtualHubsImpl extends GroupableResourcesCoreImpl<VirtualHub, VirtualHubImpl, VirtualHubInner, VirtualHubsInner, NetworkManager>  implements VirtualHubs {
+    protected VirtualHubsImpl(NetworkManager manager) {
+        super(manager.inner().virtualHubs(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualHubInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualHubsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualHubsInner 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<VirtualHub> listByResourceGroup(String resourceGroupName) {
+        VirtualHubsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualHub> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualHubsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualHubInner>, Iterable<VirtualHubInner>>() {
+            @Override
+            public Iterable<VirtualHubInner> call(Page<VirtualHubInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualHubInner, VirtualHub>() {
+            @Override
+            public VirtualHub call(VirtualHubInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualHub> list() {
+        VirtualHubsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualHub> listAsync() {
+        VirtualHubsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualHubInner>, Iterable<VirtualHubInner>>() {
+            @Override
+            public Iterable<VirtualHubInner> call(Page<VirtualHubInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualHubInner, VirtualHub>() {
+            @Override
+            public VirtualHub call(VirtualHubInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualHubImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VirtualHubImpl wrapModel(VirtualHubInner inner) {
+        return  new VirtualHubImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualHubImpl wrapModel(String name) {
+        return new VirtualHubImpl(name, new VirtualHubInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsInner.java
new file mode 100644
index 000000000000..9954c6139a25
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualHubsInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VirtualHubs.
+ */
+public class VirtualHubsInner implements InnerSupportsGet<VirtualHubInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VirtualHubInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualHubsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualHubsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualHubsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualHubsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualHubs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualHubsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualHubs getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.VirtualHubs createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Query("api-version") String apiVersion, @Body VirtualHubInner virtualHubParameters, @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.network.v2020_04_01.VirtualHubs beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Query("api-version") String apiVersion, @Body VirtualHubInner virtualHubParameters, @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.network.v2020_04_01.VirtualHubs updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject virtualHubParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualHubs delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.VirtualHubs beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualHubName") String virtualHubName, @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.network.v2020_04_01.VirtualHubs listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs")
+        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.network.v2020_04_01.VirtualHubs list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualHubs")
+        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.network.v2020_04_01.VirtualHubs 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.network.v2020_04_01.VirtualHubs listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 VirtualHubInner object if successful.
+     */
+    public VirtualHubInner getByResourceGroup(String resourceGroupName, String virtualHubName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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<VirtualHubInner> getByResourceGroupAsync(String resourceGroupName, String virtualHubName, final ServiceCallback<VirtualHubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualHubName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<VirtualHubInner> getByResourceGroupAsync(String resourceGroupName, String virtualHubName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualHubName).map(new Func1<ServiceResponse<VirtualHubInner>, VirtualHubInner>() {
+            @Override
+            public VirtualHubInner call(ServiceResponse<VirtualHubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<ServiceResponse<VirtualHubInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualHubInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualHubInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualHubInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @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 VirtualHubInner object if successful.
+     */
+    public VirtualHubInner createOrUpdate(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @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<VirtualHubInner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters, final ServiceCallback<VirtualHubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualHubInner> createOrUpdateAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters).map(new Func1<ServiceResponse<VirtualHubInner>, VirtualHubInner>() {
+            @Override
+            public VirtualHubInner call(ServiceResponse<VirtualHubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualHubInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (virtualHubParameters == null) {
+            throw new IllegalArgumentException("Parameter virtualHubParameters is required and cannot be null.");
+        }
+        Validator.validate(virtualHubParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, virtualHubParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualHubInner>() { }.getType());
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @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 VirtualHubInner object if successful.
+     */
+    public VirtualHubInner beginCreateOrUpdate(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @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<VirtualHubInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters, final ServiceCallback<VirtualHubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<VirtualHubInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualHubName, virtualHubParameters).map(new Func1<ServiceResponse<VirtualHubInner>, VirtualHubInner>() {
+            @Override
+            public VirtualHubInner call(ServiceResponse<VirtualHubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualHub resource if it doesn't exist else updates the existing VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param virtualHubParameters Parameters supplied to create or update VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<ServiceResponse<VirtualHubInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualHubName, VirtualHubInner virtualHubParameters) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        if (virtualHubParameters == null) {
+            throw new IllegalArgumentException("Parameter virtualHubParameters is required and cannot be null.");
+        }
+        Validator.validate(virtualHubParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, virtualHubParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualHubInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualHubInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualHubInner>() { }.getType())
+                .register(201, new TypeToken<VirtualHubInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 VirtualHubInner object if successful.
+     */
+    public VirtualHubInner updateTags(String resourceGroupName, String virtualHubName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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<VirtualHubInner> updateTagsAsync(String resourceGroupName, String virtualHubName, final ServiceCallback<VirtualHubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName), serviceCallback);
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<VirtualHubInner> updateTagsAsync(String resourceGroupName, String virtualHubName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName).map(new Func1<ServiceResponse<VirtualHubInner>, VirtualHubInner>() {
+            @Override
+            public VirtualHubInner call(ServiceResponse<VirtualHubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<ServiceResponse<VirtualHubInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject virtualHubParameters = new TagsObject();
+        virtualHubParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), virtualHubParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param tags Resource tags.
+     * @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 VirtualHubInner object if successful.
+     */
+    public VirtualHubInner updateTags(String resourceGroupName, String virtualHubName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param tags Resource tags.
+     * @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<VirtualHubInner> updateTagsAsync(String resourceGroupName, String virtualHubName, Map<String, String> tags, final ServiceCallback<VirtualHubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<VirtualHubInner> updateTagsAsync(String resourceGroupName, String virtualHubName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualHubName, tags).map(new Func1<ServiceResponse<VirtualHubInner>, VirtualHubInner>() {
+            @Override
+            public VirtualHubInner call(ServiceResponse<VirtualHubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VirtualHub tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualHubInner object
+     */
+    public Observable<ServiceResponse<VirtualHubInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualHubName, Map<String, String> tags) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject virtualHubParameters = new TagsObject();
+        virtualHubParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), virtualHubParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualHubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualHubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualHubInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualHubInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualHubInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualHubInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 virtualHubName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualHubName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 virtualHubName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualHubName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualHubName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualHubName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, virtualHubName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 virtualHubName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @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 virtualHubName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualHubName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualHubName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualHub.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @param virtualHubName The name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualHubName) {
+        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 (virtualHubName == null) {
+            throw new IllegalArgumentException("Parameter virtualHubName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, virtualHubName, 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);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @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;VirtualHubInner&gt; object if successful.
+     */
+    public PagedList<VirtualHubInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualHubInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualHubInner>(response.body()) {
+            @Override
+            public Page<VirtualHubInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @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<VirtualHubInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualHubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubInner&gt; object
+     */
+    public Observable<Page<VirtualHubInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualHubInner>>, Page<VirtualHubInner>>() {
+                @Override
+                public Page<VirtualHubInner> call(ServiceResponse<Page<VirtualHubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubInner>>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(ServiceResponse<Page<VirtualHubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualHubInner>> * @param resourceGroupName The resource group name of the VirtualHub.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a 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;VirtualHubInner&gt; object if successful.
+     */
+    public PagedList<VirtualHubInner> list() {
+        ServiceResponse<Page<VirtualHubInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VirtualHubInner>(response.body()) {
+            @Override
+            public Page<VirtualHubInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualHubs in a 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<VirtualHubInner>> listAsync(final ListOperationCallback<VirtualHubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubInner&gt; object
+     */
+    public Observable<Page<VirtualHubInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VirtualHubInner>>, Page<VirtualHubInner>>() {
+                @Override
+                public Page<VirtualHubInner> call(ServiceResponse<Page<VirtualHubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualHubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubInner>>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(ServiceResponse<Page<VirtualHubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualHubs in 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;VirtualHubInner&gt; object if successful.
+     */
+    public PagedList<VirtualHubInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualHubInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualHubInner>(response.body()) {
+            @Override
+            public Page<VirtualHubInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualHubs in 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<VirtualHubInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualHubInner>> serviceFuture, final ListOperationCallback<VirtualHubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualHubs in 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;VirtualHubInner&gt; object
+     */
+    public Observable<Page<VirtualHubInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualHubInner>>, Page<VirtualHubInner>>() {
+                @Override
+                public Page<VirtualHubInner> call(ServiceResponse<Page<VirtualHubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in 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;VirtualHubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubInner>>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(ServiceResponse<Page<VirtualHubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualHubInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> 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<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @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;VirtualHubInner&gt; object if successful.
+     */
+    public PagedList<VirtualHubInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualHubInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualHubInner>(response.body()) {
+            @Override
+            public Page<VirtualHubInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @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<VirtualHubInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualHubInner>> serviceFuture, final ListOperationCallback<VirtualHubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @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;VirtualHubInner&gt; object
+     */
+    public Observable<Page<VirtualHubInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualHubInner>>, Page<VirtualHubInner>>() {
+                @Override
+                public Page<VirtualHubInner> call(ServiceResponse<Page<VirtualHubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+     * @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;VirtualHubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualHubInner>>, Observable<ServiceResponse<Page<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(ServiceResponse<Page<VirtualHubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualHubs in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualHubInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualHubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualHubInner>>> 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<VirtualHubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualHubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualHubInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualHubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualHubInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualHubInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualHubInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl.java
new file mode 100644
index 000000000000..6986e7027ae7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGatewayBackendAddressPool;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationSecurityGroup;
+import com.microsoft.azure.management.network.v2020_04_01.BackendAddressPool;
+import com.microsoft.azure.management.network.v2020_04_01.InboundNatRule;
+import com.microsoft.azure.management.network.v2020_04_01.IPVersion;
+import com.microsoft.azure.management.network.v2020_04_01.IPAllocationMethod;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.PublicIPAddress;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTap;
+
+class VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl extends IndexableRefreshableWrapperImpl<VirtualMachineScaleSetNetworkInterfaceIPConfiguration, NetworkInterfaceIPConfigurationInner> implements VirtualMachineScaleSetNetworkInterfaceIPConfiguration {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualMachineScaleSetName;
+    private String virtualmachineIndex;
+    private String networkInterfaceName;
+    private String ipConfigurationName;
+
+    VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(NetworkInterfaceIPConfigurationInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualMachineScaleSetName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachineScaleSets");
+        this.virtualmachineIndex = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachines");
+        this.networkInterfaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkInterfaces");
+        this.ipConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "ipConfigurations");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<NetworkInterfaceIPConfigurationInner> getInnerAsync() {
+        NetworkInterfacesInner client = this.manager().inner().networkInterfaces();
+        return client.getVirtualMachineScaleSetIpConfigurationAsync(this.resourceGroupName, this.virtualMachineScaleSetName, this.virtualmachineIndex, this.networkInterfaceName, this.ipConfigurationName);
+    }
+
+
+
+    @Override
+    public List<ApplicationGatewayBackendAddressPool> applicationGatewayBackendAddressPools() {
+        return this.inner().applicationGatewayBackendAddressPools();
+    }
+
+    @Override
+    public List<ApplicationSecurityGroup> applicationSecurityGroups() {
+        List<ApplicationSecurityGroup> lst = new ArrayList<ApplicationSecurityGroup>();
+        if (this.inner().applicationSecurityGroups() != null) {
+            for (ApplicationSecurityGroupInner inner : this.inner().applicationSecurityGroups()) {
+                lst.add( new ApplicationSecurityGroupImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<BackendAddressPool> loadBalancerBackendAddressPools() {
+        List<BackendAddressPool> lst = new ArrayList<BackendAddressPool>();
+        if (this.inner().loadBalancerBackendAddressPools() != null) {
+            for (BackendAddressPoolInner inner : this.inner().loadBalancerBackendAddressPools()) {
+                lst.add( new BackendAddressPoolImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<InboundNatRule> loadBalancerInboundNatRules() {
+        List<InboundNatRule> lst = new ArrayList<InboundNatRule>();
+        if (this.inner().loadBalancerInboundNatRules() != null) {
+            for (InboundNatRuleInner inner : this.inner().loadBalancerInboundNatRules()) {
+                lst.add( new InboundNatRuleImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Boolean primary() {
+        return this.inner().primary();
+    }
+
+    @Override
+    public String privateIPAddress() {
+        return this.inner().privateIPAddress();
+    }
+
+    @Override
+    public IPVersion privateIPAddressVersion() {
+        return this.inner().privateIPAddressVersion();
+    }
+
+    @Override
+    public IPAllocationMethod privateIPAllocationMethod() {
+        return this.inner().privateIPAllocationMethod();
+    }
+
+    @Override
+    public NetworkInterfaceIPConfigurationPrivateLinkConnectionProperties privateLinkConnectionProperties() {
+        return this.inner().privateLinkConnectionProperties();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public PublicIPAddress publicIPAddress() {
+        PublicIPAddressInner inner = this.inner().publicIPAddress();
+        if (inner != null) {
+            return  new PublicIPAddressImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Subnet subnet() {
+        SubnetInner inner = this.inner().subnet();
+        if (inner != null) {
+            return  new SubnetImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public List<VirtualNetworkTap> virtualNetworkTaps() {
+        List<VirtualNetworkTap> lst = new ArrayList<VirtualNetworkTap>();
+        if (this.inner().virtualNetworkTaps() != null) {
+            for (VirtualNetworkTapInner inner : this.inner().virtualNetworkTaps()) {
+                lst.add( new VirtualNetworkTapImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionImpl.java
new file mode 100644
index 000000000000..c1d6099ae8ba
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnection;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionType;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TunnelConnectionHealth;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficSelectorPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.LocalNetworkGateway;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateway;
+
+class VirtualNetworkGatewayConnectionImpl extends GroupableResourceCoreImpl<VirtualNetworkGatewayConnection, VirtualNetworkGatewayConnectionInner, VirtualNetworkGatewayConnectionImpl, NetworkManager> implements VirtualNetworkGatewayConnection, VirtualNetworkGatewayConnection.Definition, VirtualNetworkGatewayConnection.Update {
+    VirtualNetworkGatewayConnectionImpl(String name, VirtualNetworkGatewayConnectionInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualNetworkGatewayConnection> createResourceAsync() {
+        VirtualNetworkGatewayConnectionsInner client = this.manager().inner().virtualNetworkGatewayConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetworkGatewayConnection> updateResourceAsync() {
+        VirtualNetworkGatewayConnectionsInner client = this.manager().inner().virtualNetworkGatewayConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkGatewayConnectionInner> getInnerAsync() {
+        VirtualNetworkGatewayConnectionsInner client = this.manager().inner().virtualNetworkGatewayConnections();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String authorizationKey() {
+        return this.inner().authorizationKey();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionProtocol connectionProtocol() {
+        return this.inner().connectionProtocol();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionType connectionType() {
+        return this.inner().connectionType();
+    }
+
+    @Override
+    public Integer dpdTimeoutSeconds() {
+        return this.inner().dpdTimeoutSeconds();
+    }
+
+    @Override
+    public Long egressBytesTransferred() {
+        return this.inner().egressBytesTransferred();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public Boolean expressRouteGatewayBypass() {
+        return this.inner().expressRouteGatewayBypass();
+    }
+
+    @Override
+    public Long ingressBytesTransferred() {
+        return this.inner().ingressBytesTransferred();
+    }
+
+    @Override
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.inner().ipsecPolicies();
+    }
+
+    @Override
+    public LocalNetworkGateway localNetworkGateway2() {
+        LocalNetworkGatewayInner inner = this.inner().localNetworkGateway2();
+        if (inner != null) {
+            return  new LocalNetworkGatewayImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public SubResource peer() {
+        return this.inner().peer();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public List<TrafficSelectorPolicy> trafficSelectorPolicies() {
+        return this.inner().trafficSelectorPolicies();
+    }
+
+    @Override
+    public List<TunnelConnectionHealth> tunnelConnectionStatus() {
+        return this.inner().tunnelConnectionStatus();
+    }
+
+    @Override
+    public Boolean useLocalAzureIpAddress() {
+        return this.inner().useLocalAzureIpAddress();
+    }
+
+    @Override
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.inner().usePolicyBasedTrafficSelectors();
+    }
+
+    @Override
+    public VirtualNetworkGateway virtualNetworkGateway1() {
+        VirtualNetworkGatewayInner inner = this.inner().virtualNetworkGateway1();
+        if (inner != null) {
+            return  new VirtualNetworkGatewayImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public VirtualNetworkGateway virtualNetworkGateway2() {
+        VirtualNetworkGatewayInner inner = this.inner().virtualNetworkGateway2();
+        if (inner != null) {
+            return  new VirtualNetworkGatewayImpl(inner.name(), inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withConnectionType(VirtualNetworkGatewayConnectionType connectionType) {
+        this.inner().withConnectionType(connectionType);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1) {
+        this.inner().withVirtualNetworkGateway1(virtualNetworkGateway1);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withAuthorizationKey(String authorizationKey) {
+        this.inner().withAuthorizationKey(authorizationKey);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withConnectionProtocol(VirtualNetworkGatewayConnectionProtocol connectionProtocol) {
+        this.inner().withConnectionProtocol(connectionProtocol);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withDpdTimeoutSeconds(Integer dpdTimeoutSeconds) {
+        this.inner().withDpdTimeoutSeconds(dpdTimeoutSeconds);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withEnableBgp(Boolean enableBgp) {
+        this.inner().withEnableBgp(enableBgp);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withExpressRouteGatewayBypass(Boolean expressRouteGatewayBypass) {
+        this.inner().withExpressRouteGatewayBypass(expressRouteGatewayBypass);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.inner().withIpsecPolicies(ipsecPolicies);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2) {
+        this.inner().withLocalNetworkGateway2(localNetworkGateway2);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withPeer(SubResource peer) {
+        this.inner().withPeer(peer);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withRoutingWeight(Integer routingWeight) {
+        this.inner().withRoutingWeight(routingWeight);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withSharedKey(String sharedKey) {
+        this.inner().withSharedKey(sharedKey);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withTrafficSelectorPolicies(List<TrafficSelectorPolicy> trafficSelectorPolicies) {
+        this.inner().withTrafficSelectorPolicies(trafficSelectorPolicies);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress) {
+        this.inner().withUseLocalAzureIpAddress(useLocalAzureIpAddress);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.inner().withUsePolicyBasedTrafficSelectors(usePolicyBasedTrafficSelectors);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2) {
+        this.inner().withVirtualNetworkGateway2(virtualNetworkGateway2);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionInner.java
new file mode 100644
index 000000000000..9b21edb4c117
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionInner.java
@@ -0,0 +1,584 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionType;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TunnelConnectionHealth;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficSelectorPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A common class for general resource information.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualNetworkGatewayConnectionInner extends Resource {
+    /**
+     * The authorizationKey.
+     */
+    @JsonProperty(value = "properties.authorizationKey")
+    private String authorizationKey;
+
+    /**
+     * The reference to virtual network gateway resource.
+     */
+    @JsonProperty(value = "properties.virtualNetworkGateway1", required = true)
+    private VirtualNetworkGatewayInner virtualNetworkGateway1;
+
+    /**
+     * The reference to virtual network gateway resource.
+     */
+    @JsonProperty(value = "properties.virtualNetworkGateway2")
+    private VirtualNetworkGatewayInner virtualNetworkGateway2;
+
+    /**
+     * The reference to local network gateway resource.
+     */
+    @JsonProperty(value = "properties.localNetworkGateway2")
+    private LocalNetworkGatewayInner localNetworkGateway2;
+
+    /**
+     * Gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet',
+     * 'ExpressRoute', 'VPNClient'.
+     */
+    @JsonProperty(value = "properties.connectionType", required = true)
+    private VirtualNetworkGatewayConnectionType connectionType;
+
+    /**
+     * Connection protocol used for this connection. Possible values include:
+     * 'IKEv2', 'IKEv1'.
+     */
+    @JsonProperty(value = "properties.connectionProtocol")
+    private VirtualNetworkGatewayConnectionProtocol connectionProtocol;
+
+    /**
+     * The routing weight.
+     */
+    @JsonProperty(value = "properties.routingWeight")
+    private Integer routingWeight;
+
+    /**
+     * The dead peer detection timeout of this connection in seconds.
+     */
+    @JsonProperty(value = "properties.dpdTimeoutSeconds")
+    private Integer dpdTimeoutSeconds;
+
+    /**
+     * The IPSec shared key.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * Virtual Network Gateway connection status. Possible values include:
+     * 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     */
+    @JsonProperty(value = "properties.connectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private VirtualNetworkGatewayConnectionStatus connectionStatus;
+
+    /**
+     * Collection of all tunnels' connection health status.
+     */
+    @JsonProperty(value = "properties.tunnelConnectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private List<TunnelConnectionHealth> tunnelConnectionStatus;
+
+    /**
+     * The egress bytes transferred in this connection.
+     */
+    @JsonProperty(value = "properties.egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * The ingress bytes transferred in this connection.
+     */
+    @JsonProperty(value = "properties.ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * The reference to peerings resource.
+     */
+    @JsonProperty(value = "properties.peer")
+    private SubResource peer;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableBgp")
+    private Boolean enableBgp;
+
+    /**
+     * Use private local Azure IP for the connection.
+     */
+    @JsonProperty(value = "properties.useLocalAzureIpAddress")
+    private Boolean useLocalAzureIpAddress;
+
+    /**
+     * Enable policy-based traffic selectors.
+     */
+    @JsonProperty(value = "properties.usePolicyBasedTrafficSelectors")
+    private Boolean usePolicyBasedTrafficSelectors;
+
+    /**
+     * The IPSec Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.ipsecPolicies")
+    private List<IpsecPolicy> ipsecPolicies;
+
+    /**
+     * The Traffic Selector Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.trafficSelectorPolicies")
+    private List<TrafficSelectorPolicy> trafficSelectorPolicies;
+
+    /**
+     * The resource GUID property of the virtual network gateway connection
+     * resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the virtual network gateway connection
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Bypass ExpressRoute Gateway for data forwarding.
+     */
+    @JsonProperty(value = "properties.expressRouteGatewayBypass")
+    private Boolean expressRouteGatewayBypass;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the authorizationKey.
+     *
+     * @return the authorizationKey value
+     */
+    public String authorizationKey() {
+        return this.authorizationKey;
+    }
+
+    /**
+     * Set the authorizationKey.
+     *
+     * @param authorizationKey the authorizationKey value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withAuthorizationKey(String authorizationKey) {
+        this.authorizationKey = authorizationKey;
+        return this;
+    }
+
+    /**
+     * Get the reference to virtual network gateway resource.
+     *
+     * @return the virtualNetworkGateway1 value
+     */
+    public VirtualNetworkGatewayInner virtualNetworkGateway1() {
+        return this.virtualNetworkGateway1;
+    }
+
+    /**
+     * Set the reference to virtual network gateway resource.
+     *
+     * @param virtualNetworkGateway1 the virtualNetworkGateway1 value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1) {
+        this.virtualNetworkGateway1 = virtualNetworkGateway1;
+        return this;
+    }
+
+    /**
+     * Get the reference to virtual network gateway resource.
+     *
+     * @return the virtualNetworkGateway2 value
+     */
+    public VirtualNetworkGatewayInner virtualNetworkGateway2() {
+        return this.virtualNetworkGateway2;
+    }
+
+    /**
+     * Set the reference to virtual network gateway resource.
+     *
+     * @param virtualNetworkGateway2 the virtualNetworkGateway2 value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2) {
+        this.virtualNetworkGateway2 = virtualNetworkGateway2;
+        return this;
+    }
+
+    /**
+     * Get the reference to local network gateway resource.
+     *
+     * @return the localNetworkGateway2 value
+     */
+    public LocalNetworkGatewayInner localNetworkGateway2() {
+        return this.localNetworkGateway2;
+    }
+
+    /**
+     * Set the reference to local network gateway resource.
+     *
+     * @param localNetworkGateway2 the localNetworkGateway2 value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2) {
+        this.localNetworkGateway2 = localNetworkGateway2;
+        return this;
+    }
+
+    /**
+     * Get gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'.
+     *
+     * @return the connectionType value
+     */
+    public VirtualNetworkGatewayConnectionType connectionType() {
+        return this.connectionType;
+    }
+
+    /**
+     * Set gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'.
+     *
+     * @param connectionType the connectionType value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withConnectionType(VirtualNetworkGatewayConnectionType connectionType) {
+        this.connectionType = connectionType;
+        return this;
+    }
+
+    /**
+     * Get connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @return the connectionProtocol value
+     */
+    public VirtualNetworkGatewayConnectionProtocol connectionProtocol() {
+        return this.connectionProtocol;
+    }
+
+    /**
+     * Set connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @param connectionProtocol the connectionProtocol value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withConnectionProtocol(VirtualNetworkGatewayConnectionProtocol connectionProtocol) {
+        this.connectionProtocol = connectionProtocol;
+        return this;
+    }
+
+    /**
+     * Get the routing weight.
+     *
+     * @return the routingWeight value
+     */
+    public Integer routingWeight() {
+        return this.routingWeight;
+    }
+
+    /**
+     * Set the routing weight.
+     *
+     * @param routingWeight the routingWeight value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withRoutingWeight(Integer routingWeight) {
+        this.routingWeight = routingWeight;
+        return this;
+    }
+
+    /**
+     * Get the dead peer detection timeout of this connection in seconds.
+     *
+     * @return the dpdTimeoutSeconds value
+     */
+    public Integer dpdTimeoutSeconds() {
+        return this.dpdTimeoutSeconds;
+    }
+
+    /**
+     * Set the dead peer detection timeout of this connection in seconds.
+     *
+     * @param dpdTimeoutSeconds the dpdTimeoutSeconds value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withDpdTimeoutSeconds(Integer dpdTimeoutSeconds) {
+        this.dpdTimeoutSeconds = dpdTimeoutSeconds;
+        return this;
+    }
+
+    /**
+     * Get the IPSec shared key.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set the IPSec shared key.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get virtual Network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public VirtualNetworkGatewayConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Get collection of all tunnels' connection health status.
+     *
+     * @return the tunnelConnectionStatus value
+     */
+    public List<TunnelConnectionHealth> tunnelConnectionStatus() {
+        return this.tunnelConnectionStatus;
+    }
+
+    /**
+     * Get the egress bytes transferred in this connection.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get the ingress bytes transferred in this connection.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get the reference to peerings resource.
+     *
+     * @return the peer value
+     */
+    public SubResource peer() {
+        return this.peer;
+    }
+
+    /**
+     * Set the reference to peerings resource.
+     *
+     * @param peer the peer value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withPeer(SubResource peer) {
+        this.peer = peer;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableBgp value
+     */
+    public Boolean enableBgp() {
+        return this.enableBgp;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableBgp the enableBgp value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withEnableBgp(Boolean enableBgp) {
+        this.enableBgp = enableBgp;
+        return this;
+    }
+
+    /**
+     * Get use private local Azure IP for the connection.
+     *
+     * @return the useLocalAzureIpAddress value
+     */
+    public Boolean useLocalAzureIpAddress() {
+        return this.useLocalAzureIpAddress;
+    }
+
+    /**
+     * Set use private local Azure IP for the connection.
+     *
+     * @param useLocalAzureIpAddress the useLocalAzureIpAddress value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress) {
+        this.useLocalAzureIpAddress = useLocalAzureIpAddress;
+        return this;
+    }
+
+    /**
+     * Get enable policy-based traffic selectors.
+     *
+     * @return the usePolicyBasedTrafficSelectors value
+     */
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.usePolicyBasedTrafficSelectors;
+    }
+
+    /**
+     * Set enable policy-based traffic selectors.
+     *
+     * @param usePolicyBasedTrafficSelectors the usePolicyBasedTrafficSelectors value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.usePolicyBasedTrafficSelectors = usePolicyBasedTrafficSelectors;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Policies to be considered by this connection.
+     *
+     * @return the ipsecPolicies value
+     */
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.ipsecPolicies;
+    }
+
+    /**
+     * Set the IPSec Policies to be considered by this connection.
+     *
+     * @param ipsecPolicies the ipsecPolicies value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.ipsecPolicies = ipsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get the Traffic Selector Policies to be considered by this connection.
+     *
+     * @return the trafficSelectorPolicies value
+     */
+    public List<TrafficSelectorPolicy> trafficSelectorPolicies() {
+        return this.trafficSelectorPolicies;
+    }
+
+    /**
+     * Set the Traffic Selector Policies to be considered by this connection.
+     *
+     * @param trafficSelectorPolicies the trafficSelectorPolicies value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withTrafficSelectorPolicies(List<TrafficSelectorPolicy> trafficSelectorPolicies) {
+        this.trafficSelectorPolicies = trafficSelectorPolicies;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the virtual network gateway connection resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network gateway connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get bypass ExpressRoute Gateway for data forwarding.
+     *
+     * @return the expressRouteGatewayBypass value
+     */
+    public Boolean expressRouteGatewayBypass() {
+        return this.expressRouteGatewayBypass;
+    }
+
+    /**
+     * Set bypass ExpressRoute Gateway for data forwarding.
+     *
+     * @param expressRouteGatewayBypass the expressRouteGatewayBypass value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withExpressRouteGatewayBypass(Boolean expressRouteGatewayBypass) {
+        this.expressRouteGatewayBypass = expressRouteGatewayBypass;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkGatewayConnectionInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityImpl.java
new file mode 100644
index 000000000000..2be4e9615c78
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityImpl.java
@@ -0,0 +1,171 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionListEntity;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionType;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkConnectionGatewayReference;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.Map;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficSelectorPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.TunnelConnectionHealth;
+
+class VirtualNetworkGatewayConnectionListEntityImpl extends WrapperImpl<VirtualNetworkGatewayConnectionListEntityInner> implements VirtualNetworkGatewayConnectionListEntity {
+    private final NetworkManager manager;
+
+    VirtualNetworkGatewayConnectionListEntityImpl(VirtualNetworkGatewayConnectionListEntityInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public String authorizationKey() {
+        return this.inner().authorizationKey();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionProtocol connectionProtocol() {
+        return this.inner().connectionProtocol();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionType connectionType() {
+        return this.inner().connectionType();
+    }
+
+    @Override
+    public Long egressBytesTransferred() {
+        return this.inner().egressBytesTransferred();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public Boolean expressRouteGatewayBypass() {
+        return this.inner().expressRouteGatewayBypass();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Long ingressBytesTransferred() {
+        return this.inner().ingressBytesTransferred();
+    }
+
+    @Override
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.inner().ipsecPolicies();
+    }
+
+    @Override
+    public VirtualNetworkConnectionGatewayReference localNetworkGateway2() {
+        return this.inner().localNetworkGateway2();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public SubResource peer() {
+        return this.inner().peer();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public List<TrafficSelectorPolicy> trafficSelectorPolicies() {
+        return this.inner().trafficSelectorPolicies();
+    }
+
+    @Override
+    public List<TunnelConnectionHealth> tunnelConnectionStatus() {
+        return this.inner().tunnelConnectionStatus();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.inner().usePolicyBasedTrafficSelectors();
+    }
+
+    @Override
+    public VirtualNetworkConnectionGatewayReference virtualNetworkGateway1() {
+        return this.inner().virtualNetworkGateway1();
+    }
+
+    @Override
+    public VirtualNetworkConnectionGatewayReference virtualNetworkGateway2() {
+        return this.inner().virtualNetworkGateway2();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityInner.java
new file mode 100644
index 000000000000..b22e125ee9fd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionListEntityInner.java
@@ -0,0 +1,533 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkConnectionGatewayReference;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionType;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.TunnelConnectionHealth;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.TrafficSelectorPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A common class for general resource information.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualNetworkGatewayConnectionListEntityInner extends Resource {
+    /**
+     * The authorizationKey.
+     */
+    @JsonProperty(value = "properties.authorizationKey")
+    private String authorizationKey;
+
+    /**
+     * The reference to virtual network gateway resource.
+     */
+    @JsonProperty(value = "properties.virtualNetworkGateway1", required = true)
+    private VirtualNetworkConnectionGatewayReference virtualNetworkGateway1;
+
+    /**
+     * The reference to virtual network gateway resource.
+     */
+    @JsonProperty(value = "properties.virtualNetworkGateway2")
+    private VirtualNetworkConnectionGatewayReference virtualNetworkGateway2;
+
+    /**
+     * The reference to local network gateway resource.
+     */
+    @JsonProperty(value = "properties.localNetworkGateway2")
+    private VirtualNetworkConnectionGatewayReference localNetworkGateway2;
+
+    /**
+     * Gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet',
+     * 'ExpressRoute', 'VPNClient'.
+     */
+    @JsonProperty(value = "properties.connectionType", required = true)
+    private VirtualNetworkGatewayConnectionType connectionType;
+
+    /**
+     * Connection protocol used for this connection. Possible values include:
+     * 'IKEv2', 'IKEv1'.
+     */
+    @JsonProperty(value = "properties.connectionProtocol")
+    private VirtualNetworkGatewayConnectionProtocol connectionProtocol;
+
+    /**
+     * The routing weight.
+     */
+    @JsonProperty(value = "properties.routingWeight")
+    private Integer routingWeight;
+
+    /**
+     * The IPSec shared key.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * Virtual Network Gateway connection status. Possible values include:
+     * 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     */
+    @JsonProperty(value = "properties.connectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private VirtualNetworkGatewayConnectionStatus connectionStatus;
+
+    /**
+     * Collection of all tunnels' connection health status.
+     */
+    @JsonProperty(value = "properties.tunnelConnectionStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private List<TunnelConnectionHealth> tunnelConnectionStatus;
+
+    /**
+     * The egress bytes transferred in this connection.
+     */
+    @JsonProperty(value = "properties.egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * The ingress bytes transferred in this connection.
+     */
+    @JsonProperty(value = "properties.ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * The reference to peerings resource.
+     */
+    @JsonProperty(value = "properties.peer")
+    private SubResource peer;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableBgp")
+    private Boolean enableBgp;
+
+    /**
+     * Enable policy-based traffic selectors.
+     */
+    @JsonProperty(value = "properties.usePolicyBasedTrafficSelectors")
+    private Boolean usePolicyBasedTrafficSelectors;
+
+    /**
+     * The IPSec Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.ipsecPolicies")
+    private List<IpsecPolicy> ipsecPolicies;
+
+    /**
+     * The Traffic Selector Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.trafficSelectorPolicies")
+    private List<TrafficSelectorPolicy> trafficSelectorPolicies;
+
+    /**
+     * The resource GUID property of the virtual network gateway connection
+     * resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the virtual network gateway connection
+     * resource. Possible values include: 'Succeeded', 'Updating', 'Deleting',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Bypass ExpressRoute Gateway for data forwarding.
+     */
+    @JsonProperty(value = "properties.expressRouteGatewayBypass")
+    private Boolean expressRouteGatewayBypass;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the authorizationKey.
+     *
+     * @return the authorizationKey value
+     */
+    public String authorizationKey() {
+        return this.authorizationKey;
+    }
+
+    /**
+     * Set the authorizationKey.
+     *
+     * @param authorizationKey the authorizationKey value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withAuthorizationKey(String authorizationKey) {
+        this.authorizationKey = authorizationKey;
+        return this;
+    }
+
+    /**
+     * Get the reference to virtual network gateway resource.
+     *
+     * @return the virtualNetworkGateway1 value
+     */
+    public VirtualNetworkConnectionGatewayReference virtualNetworkGateway1() {
+        return this.virtualNetworkGateway1;
+    }
+
+    /**
+     * Set the reference to virtual network gateway resource.
+     *
+     * @param virtualNetworkGateway1 the virtualNetworkGateway1 value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withVirtualNetworkGateway1(VirtualNetworkConnectionGatewayReference virtualNetworkGateway1) {
+        this.virtualNetworkGateway1 = virtualNetworkGateway1;
+        return this;
+    }
+
+    /**
+     * Get the reference to virtual network gateway resource.
+     *
+     * @return the virtualNetworkGateway2 value
+     */
+    public VirtualNetworkConnectionGatewayReference virtualNetworkGateway2() {
+        return this.virtualNetworkGateway2;
+    }
+
+    /**
+     * Set the reference to virtual network gateway resource.
+     *
+     * @param virtualNetworkGateway2 the virtualNetworkGateway2 value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withVirtualNetworkGateway2(VirtualNetworkConnectionGatewayReference virtualNetworkGateway2) {
+        this.virtualNetworkGateway2 = virtualNetworkGateway2;
+        return this;
+    }
+
+    /**
+     * Get the reference to local network gateway resource.
+     *
+     * @return the localNetworkGateway2 value
+     */
+    public VirtualNetworkConnectionGatewayReference localNetworkGateway2() {
+        return this.localNetworkGateway2;
+    }
+
+    /**
+     * Set the reference to local network gateway resource.
+     *
+     * @param localNetworkGateway2 the localNetworkGateway2 value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withLocalNetworkGateway2(VirtualNetworkConnectionGatewayReference localNetworkGateway2) {
+        this.localNetworkGateway2 = localNetworkGateway2;
+        return this;
+    }
+
+    /**
+     * Get gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'.
+     *
+     * @return the connectionType value
+     */
+    public VirtualNetworkGatewayConnectionType connectionType() {
+        return this.connectionType;
+    }
+
+    /**
+     * Set gateway connection type. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'.
+     *
+     * @param connectionType the connectionType value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withConnectionType(VirtualNetworkGatewayConnectionType connectionType) {
+        this.connectionType = connectionType;
+        return this;
+    }
+
+    /**
+     * Get connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @return the connectionProtocol value
+     */
+    public VirtualNetworkGatewayConnectionProtocol connectionProtocol() {
+        return this.connectionProtocol;
+    }
+
+    /**
+     * Set connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @param connectionProtocol the connectionProtocol value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withConnectionProtocol(VirtualNetworkGatewayConnectionProtocol connectionProtocol) {
+        this.connectionProtocol = connectionProtocol;
+        return this;
+    }
+
+    /**
+     * Get the routing weight.
+     *
+     * @return the routingWeight value
+     */
+    public Integer routingWeight() {
+        return this.routingWeight;
+    }
+
+    /**
+     * Set the routing weight.
+     *
+     * @param routingWeight the routingWeight value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withRoutingWeight(Integer routingWeight) {
+        this.routingWeight = routingWeight;
+        return this;
+    }
+
+    /**
+     * Get the IPSec shared key.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set the IPSec shared key.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get virtual Network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public VirtualNetworkGatewayConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Get collection of all tunnels' connection health status.
+     *
+     * @return the tunnelConnectionStatus value
+     */
+    public List<TunnelConnectionHealth> tunnelConnectionStatus() {
+        return this.tunnelConnectionStatus;
+    }
+
+    /**
+     * Get the egress bytes transferred in this connection.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get the ingress bytes transferred in this connection.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get the reference to peerings resource.
+     *
+     * @return the peer value
+     */
+    public SubResource peer() {
+        return this.peer;
+    }
+
+    /**
+     * Set the reference to peerings resource.
+     *
+     * @param peer the peer value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withPeer(SubResource peer) {
+        this.peer = peer;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableBgp value
+     */
+    public Boolean enableBgp() {
+        return this.enableBgp;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableBgp the enableBgp value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withEnableBgp(Boolean enableBgp) {
+        this.enableBgp = enableBgp;
+        return this;
+    }
+
+    /**
+     * Get enable policy-based traffic selectors.
+     *
+     * @return the usePolicyBasedTrafficSelectors value
+     */
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.usePolicyBasedTrafficSelectors;
+    }
+
+    /**
+     * Set enable policy-based traffic selectors.
+     *
+     * @param usePolicyBasedTrafficSelectors the usePolicyBasedTrafficSelectors value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.usePolicyBasedTrafficSelectors = usePolicyBasedTrafficSelectors;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Policies to be considered by this connection.
+     *
+     * @return the ipsecPolicies value
+     */
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.ipsecPolicies;
+    }
+
+    /**
+     * Set the IPSec Policies to be considered by this connection.
+     *
+     * @param ipsecPolicies the ipsecPolicies value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.ipsecPolicies = ipsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get the Traffic Selector Policies to be considered by this connection.
+     *
+     * @return the trafficSelectorPolicies value
+     */
+    public List<TrafficSelectorPolicy> trafficSelectorPolicies() {
+        return this.trafficSelectorPolicies;
+    }
+
+    /**
+     * Set the Traffic Selector Policies to be considered by this connection.
+     *
+     * @param trafficSelectorPolicies the trafficSelectorPolicies value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withTrafficSelectorPolicies(List<TrafficSelectorPolicy> trafficSelectorPolicies) {
+        this.trafficSelectorPolicies = trafficSelectorPolicies;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the virtual network gateway connection resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network gateway connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get bypass ExpressRoute Gateway for data forwarding.
+     *
+     * @return the expressRouteGatewayBypass value
+     */
+    public Boolean expressRouteGatewayBypass() {
+        return this.expressRouteGatewayBypass;
+    }
+
+    /**
+     * Set bypass ExpressRoute Gateway for data forwarding.
+     *
+     * @param expressRouteGatewayBypass the expressRouteGatewayBypass value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withExpressRouteGatewayBypass(Boolean expressRouteGatewayBypass) {
+        this.expressRouteGatewayBypass = expressRouteGatewayBypass;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
+     */
+    public VirtualNetworkGatewayConnectionListEntityInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsImpl.java
new file mode 100644
index 000000000000..30ee073ab743
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsImpl.java
@@ -0,0 +1,164 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnection;
+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.network.v2020_04_01.ConnectionSharedKey;
+import com.microsoft.azure.management.network.v2020_04_01.ConnectionResetSharedKey;
+
+class VirtualNetworkGatewayConnectionsImpl extends GroupableResourcesCoreImpl<VirtualNetworkGatewayConnection, VirtualNetworkGatewayConnectionImpl, VirtualNetworkGatewayConnectionInner, VirtualNetworkGatewayConnectionsInner, NetworkManager>  implements VirtualNetworkGatewayConnections {
+    protected VirtualNetworkGatewayConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().virtualNetworkGatewayConnections(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualNetworkGatewayConnectionInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkGatewayConnectionsInner 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<VirtualNetworkGatewayConnection> listByResourceGroup(String resourceGroupName) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualNetworkGatewayConnection> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkGatewayConnectionInner>, Iterable<VirtualNetworkGatewayConnectionInner>>() {
+            @Override
+            public Iterable<VirtualNetworkGatewayConnectionInner> call(Page<VirtualNetworkGatewayConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkGatewayConnectionInner, VirtualNetworkGatewayConnection>() {
+            @Override
+            public VirtualNetworkGatewayConnection call(VirtualNetworkGatewayConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<ConnectionSharedKey> setSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.setSharedKeyAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
+        .map(new Func1<ConnectionSharedKeyInner, ConnectionSharedKey>() {
+            @Override
+            public ConnectionSharedKey call(ConnectionSharedKeyInner inner) {
+                return new ConnectionSharedKeyImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConnectionSharedKey> getSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.getSharedKeyAsync(resourceGroupName, virtualNetworkGatewayConnectionName)
+        .map(new Func1<ConnectionSharedKeyInner, ConnectionSharedKey>() {
+            @Override
+            public ConnectionSharedKey call(ConnectionSharedKeyInner inner) {
+                return new ConnectionSharedKeyImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConnectionResetSharedKey> resetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.resetSharedKeyAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength)
+        .map(new Func1<ConnectionResetSharedKeyInner, ConnectionResetSharedKey>() {
+            @Override
+            public ConnectionResetSharedKey call(ConnectionResetSharedKeyInner inner) {
+                return new ConnectionResetSharedKeyImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.startPacketCaptureAsync(resourceGroupName, virtualNetworkGatewayConnectionName)
+    ;}
+
+    @Override
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        VirtualNetworkGatewayConnectionsInner client = this.inner();
+        return client.stopPacketCaptureAsync(resourceGroupName, virtualNetworkGatewayConnectionName)
+    ;}
+
+    @Override
+    protected VirtualNetworkGatewayConnectionImpl wrapModel(VirtualNetworkGatewayConnectionInner inner) {
+        return  new VirtualNetworkGatewayConnectionImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualNetworkGatewayConnectionImpl wrapModel(String name) {
+        return new VirtualNetworkGatewayConnectionImpl(name, new VirtualNetworkGatewayConnectionInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsInner.java
new file mode 100644
index 000000000000..f15078a94a57
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayConnectionsInner.java
@@ -0,0 +1,2139 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+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.network.v2020_04_01.ErrorException;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+import com.microsoft.azure.management.network.v2020_04_01.VpnPacketCaptureStartParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VpnPacketCaptureStopParameters;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VirtualNetworkGatewayConnections.
+ */
+public class VirtualNetworkGatewayConnectionsInner implements InnerSupportsGet<VirtualNetworkGatewayConnectionInner>, InnerSupportsDelete<Void> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualNetworkGatewayConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualNetworkGatewayConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualNetworkGatewayConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualNetworkGatewayConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualNetworkGatewayConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualNetworkGatewayConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkGatewayConnectionInner 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.network.v2020_04_01.VirtualNetworkGatewayConnections beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkGatewayConnectionInner 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.network.v2020_04_01.VirtualNetworkGatewayConnections getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @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.network.v2020_04_01.VirtualNetworkGatewayConnections delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @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.network.v2020_04_01.VirtualNetworkGatewayConnections beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @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.network.v2020_04_01.VirtualNetworkGatewayConnections updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections beginUpdateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
+        Observable<Response<ResponseBody>> beginUpdateTags(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections setSharedKey" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey")
+        Observable<Response<ResponseBody>> setSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Body ConnectionSharedKeyInner 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.network.v2020_04_01.VirtualNetworkGatewayConnections beginSetSharedKey" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey")
+        Observable<Response<ResponseBody>> beginSetSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Body ConnectionSharedKeyInner 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.network.v2020_04_01.VirtualNetworkGatewayConnections getSharedKey" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey")
+        Observable<Response<ResponseBody>> getSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @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.network.v2020_04_01.VirtualNetworkGatewayConnections listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections")
+        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.network.v2020_04_01.VirtualNetworkGatewayConnections resetSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey/reset")
+        Observable<Response<ResponseBody>> resetSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ConnectionResetSharedKeyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections beginResetSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey/reset")
+        Observable<Response<ResponseBody>> beginResetSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ConnectionResetSharedKeyInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections startPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/startPacketCapture")
+        Observable<Response<ResponseBody>> startPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStartParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections beginStartPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/startPacketCapture")
+        Observable<Response<ResponseBody>> beginStartPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStartParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections stopPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/stopPacketCapture")
+        Observable<Response<ResponseBody>> stopPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStopParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections beginStopPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/stopPacketCapture")
+        Observable<Response<ResponseBody>> beginStopPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStopParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnections listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection 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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner createOrUpdate(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @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<VirtualNetworkGatewayConnectionInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection 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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner beginCreateOrUpdate(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @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<VirtualNetworkGatewayConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param parameters Parameters supplied to the create or update virtual network gateway connection operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VirtualNetworkGatewayConnectionInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayConnectionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayConnectionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType())
+                .register(201, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified virtual network gateway connection by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner getByResourceGroup(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified virtual network gateway connection by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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<VirtualNetworkGatewayConnectionInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified virtual network gateway connection by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified virtual network gateway connection by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayConnectionInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayConnectionInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 virtualNetworkGatewayConnectionName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 virtualNetworkGatewayConnectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 virtualNetworkGatewayConnectionName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 virtualNetworkGatewayConnectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network Gateway connection.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner updateTags(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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<VirtualNetworkGatewayConnectionInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType());
+    }
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner updateTags(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags).toBlocking().last().body();
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkGatewayConnectionInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner beginUpdateTags(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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<VirtualNetworkGatewayConnectionInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.beginUpdateTags(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayConnectionInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkGatewayConnectionInner object if successful.
+     */
+    public VirtualNetworkGatewayConnectionInner beginUpdateTags(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkGatewayConnectionInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags, final ServiceCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<VirtualNetworkGatewayConnectionInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, tags).map(new Func1<ServiceResponse<VirtualNetworkGatewayConnectionInner>, VirtualNetworkGatewayConnectionInner>() {
+            @Override
+            public VirtualNetworkGatewayConnectionInner call(ServiceResponse<VirtualNetworkGatewayConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway connection tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayConnectionInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.beginUpdateTags(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayConnectionInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayConnectionInner> beginUpdateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayConnectionInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @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 ConnectionSharedKeyInner object if successful.
+     */
+    public ConnectionSharedKeyInner setSharedKey(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        return setSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @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<ConnectionSharedKeyInner> setSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters, final ServiceCallback<ConnectionSharedKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(setSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ConnectionSharedKeyInner> setSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        return setSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).map(new Func1<ServiceResponse<ConnectionSharedKeyInner>, ConnectionSharedKeyInner>() {
+            @Override
+            public ConnectionSharedKeyInner call(ServiceResponse<ConnectionSharedKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ConnectionSharedKeyInner>> setSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.setSharedKey(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ConnectionSharedKeyInner>() { }.getType());
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @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 ConnectionSharedKeyInner object if successful.
+     */
+    public ConnectionSharedKeyInner beginSetSharedKey(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        return beginSetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @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<ConnectionSharedKeyInner> beginSetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters, final ServiceCallback<ConnectionSharedKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginSetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionSharedKeyInner object
+     */
+    public Observable<ConnectionSharedKeyInner> beginSetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        return beginSetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).map(new Func1<ServiceResponse<ConnectionSharedKeyInner>, ConnectionSharedKeyInner>() {
+            @Override
+            public ConnectionSharedKeyInner call(ServiceResponse<ConnectionSharedKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection name.
+     * @param parameters Parameters supplied to the Begin Set Virtual Network Gateway connection Shared key operation throughNetwork resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionSharedKeyInner object
+     */
+    public Observable<ServiceResponse<ConnectionSharedKeyInner>> beginSetSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, ConnectionSharedKeyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginSetSharedKey(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionSharedKeyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionSharedKeyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionSharedKeyInner> clientResponse = beginSetSharedKeyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionSharedKeyInner> beginSetSharedKeyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionSharedKeyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionSharedKeyInner>() { }.getType())
+                .register(201, new TypeToken<ConnectionSharedKeyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection shared key 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 ConnectionSharedKeyInner object if successful.
+     */
+    public ConnectionSharedKeyInner getSharedKey(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return getSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection shared key 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<ConnectionSharedKeyInner> getSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<ConnectionSharedKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection shared key name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionSharedKeyInner object
+     */
+    public Observable<ConnectionSharedKeyInner> getSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return getSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<ConnectionSharedKeyInner>, ConnectionSharedKeyInner>() {
+            @Override
+            public ConnectionSharedKeyInner call(ServiceResponse<ConnectionSharedKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection shared key name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionSharedKeyInner object
+     */
+    public Observable<ServiceResponse<ConnectionSharedKeyInner>> getSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getSharedKey(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionSharedKeyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionSharedKeyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionSharedKeyInner> clientResponse = getSharedKeyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionSharedKeyInner> getSharedKeyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionSharedKeyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionSharedKeyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;VirtualNetworkGatewayConnectionInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayConnectionInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayConnectionInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayConnectionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<VirtualNetworkGatewayConnectionInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayConnectionInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayConnectionInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>, Page<VirtualNetworkGatewayConnectionInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayConnectionInner> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @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 ConnectionResetSharedKeyInner object if successful.
+     */
+    public ConnectionResetSharedKeyInner resetSharedKey(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        return resetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength).toBlocking().last().body();
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @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<ConnectionResetSharedKeyInner> resetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength, final ServiceCallback<ConnectionResetSharedKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(resetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength), serviceCallback);
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ConnectionResetSharedKeyInner> resetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        return resetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength).map(new Func1<ServiceResponse<ConnectionResetSharedKeyInner>, ConnectionResetSharedKeyInner>() {
+            @Override
+            public ConnectionResetSharedKeyInner call(ServiceResponse<ConnectionResetSharedKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ConnectionResetSharedKeyInner>> resetSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        ConnectionResetSharedKeyInner parameters = new ConnectionResetSharedKeyInner();
+        parameters.withKeyLength(keyLength);
+        Observable<Response<ResponseBody>> observable = service.resetSharedKey(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<ConnectionResetSharedKeyInner>() { }.getType());
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @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 ConnectionResetSharedKeyInner object if successful.
+     */
+    public ConnectionResetSharedKeyInner beginResetSharedKey(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        return beginResetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength).toBlocking().single().body();
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @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<ConnectionResetSharedKeyInner> beginResetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength, final ServiceCallback<ConnectionResetSharedKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength), serviceCallback);
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionResetSharedKeyInner object
+     */
+    public Observable<ConnectionResetSharedKeyInner> beginResetSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        return beginResetSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, keyLength).map(new Func1<ServiceResponse<ConnectionResetSharedKeyInner>, ConnectionResetSharedKeyInner>() {
+            @Override
+            public ConnectionResetSharedKeyInner call(ServiceResponse<ConnectionResetSharedKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The virtual network gateway connection reset shared key Name.
+     * @param keyLength The virtual network connection reset shared key length, should between 1 and 128.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConnectionResetSharedKeyInner object
+     */
+    public Observable<ServiceResponse<ConnectionResetSharedKeyInner>> beginResetSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, int keyLength) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        ConnectionResetSharedKeyInner parameters = new ConnectionResetSharedKeyInner();
+        parameters.withKeyLength(keyLength);
+        return service.beginResetSharedKey(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConnectionResetSharedKeyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConnectionResetSharedKeyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConnectionResetSharedKeyInner> clientResponse = beginResetSharedKeyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConnectionResetSharedKeyInner> beginResetSharedKeyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionResetSharedKeyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConnectionResetSharedKeyInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String startPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> startPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String filterData = null;
+        VpnPacketCaptureStartParameters parameters = new VpnPacketCaptureStartParameters();
+        parameters.withFilterData(null);
+        Observable<Response<ResponseBody>> observable = service.startPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String startPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData).toBlocking().last().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @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<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> startPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStartParameters parameters = null;
+        if (filterData != null) {
+            parameters = new VpnPacketCaptureStartParameters();
+            parameters.withFilterData(filterData);
+        }
+        Observable<Response<ResponseBody>> observable = service.startPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStartPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @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<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStartPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String filterData = null;
+        VpnPacketCaptureStartParameters parameters = new VpnPacketCaptureStartParameters();
+        parameters.withFilterData(null);
+        return service.beginStartPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStartPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStartPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData).toBlocking().single().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @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<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, filterData).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStartPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String filterData) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStartParameters parameters = null;
+        if (filterData != null) {
+            parameters = new VpnPacketCaptureStartParameters();
+            parameters.withFilterData(filterData);
+        }
+        return service.beginStartPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStartPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginStartPacketCaptureDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String stopPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @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<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> stopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String sasUrl = null;
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(null);
+        Observable<Response<ResponseBody>> observable = service.stopPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String stopPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl).toBlocking().last().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @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<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> stopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(sasUrl);
+        Observable<Response<ResponseBody>> observable = service.stopPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStopPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @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<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String sasUrl = null;
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(null);
+        return service.beginStopPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStopPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStopPacketCapture(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl).toBlocking().single().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @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<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, sasUrl).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway connection in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway Connection.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(sasUrl);
+        return service.beginStopPacketCapture(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStopPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginStopPacketCaptureDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @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;VirtualNetworkGatewayConnectionInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayConnectionInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayConnectionInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayConnectionInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @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<VirtualNetworkGatewayConnectionInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkGatewayConnectionInner>> serviceFuture, final ListOperationCallback<VirtualNetworkGatewayConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @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;VirtualNetworkGatewayConnectionInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayConnectionInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>, Page<VirtualNetworkGatewayConnectionInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayConnectionInner> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+     * @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;VirtualNetworkGatewayConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> 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<VirtualNetworkGatewayConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayImpl.java
new file mode 100644
index 000000000000..3beed95dfa3d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayImpl.java
@@ -0,0 +1,220 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateway;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGatewayGeneration;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewaySku;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualNetworkGatewayImpl extends GroupableResourceCoreImpl<VirtualNetworkGateway, VirtualNetworkGatewayInner, VirtualNetworkGatewayImpl, NetworkManager> implements VirtualNetworkGateway, VirtualNetworkGateway.Definition, VirtualNetworkGateway.Update {
+    VirtualNetworkGatewayImpl(String name, VirtualNetworkGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualNetworkGateway> createResourceAsync() {
+        VirtualNetworkGatewaysInner client = this.manager().inner().virtualNetworkGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetworkGateway> updateResourceAsync() {
+        VirtualNetworkGatewaysInner client = this.manager().inner().virtualNetworkGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkGatewayInner> getInnerAsync() {
+        VirtualNetworkGatewaysInner client = this.manager().inner().virtualNetworkGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean activeActive() {
+        return this.inner().activeActive();
+    }
+
+    @Override
+    public BgpSettings bgpSettings() {
+        return this.inner().bgpSettings();
+    }
+
+    @Override
+    public AddressSpace customRoutes() {
+        return this.inner().customRoutes();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public Boolean enableDnsForwarding() {
+        return this.inner().enableDnsForwarding();
+    }
+
+    @Override
+    public Boolean enablePrivateIpAddress() {
+        return this.inner().enablePrivateIpAddress();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource gatewayDefaultSite() {
+        return this.inner().gatewayDefaultSite();
+    }
+
+    @Override
+    public VirtualNetworkGatewayType gatewayType() {
+        return this.inner().gatewayType();
+    }
+
+    @Override
+    public String inboundDnsForwardingEndpoint() {
+        return this.inner().inboundDnsForwardingEndpoint();
+    }
+
+    @Override
+    public List<VirtualNetworkGatewayIPConfiguration> ipConfigurations() {
+        return this.inner().ipConfigurations();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public VirtualNetworkGatewaySku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public VpnClientConfiguration vpnClientConfiguration() {
+        return this.inner().vpnClientConfiguration();
+    }
+
+    @Override
+    public VpnGatewayGeneration vpnGatewayGeneration() {
+        return this.inner().vpnGatewayGeneration();
+    }
+
+    @Override
+    public VpnType vpnType() {
+        return this.inner().vpnType();
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withActiveActive(Boolean activeActive) {
+        this.inner().withActiveActive(activeActive);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withBgpSettings(BgpSettings bgpSettings) {
+        this.inner().withBgpSettings(bgpSettings);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withCustomRoutes(AddressSpace customRoutes) {
+        this.inner().withCustomRoutes(customRoutes);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withEnableBgp(Boolean enableBgp) {
+        this.inner().withEnableBgp(enableBgp);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withEnableDnsForwarding(Boolean enableDnsForwarding) {
+        this.inner().withEnableDnsForwarding(enableDnsForwarding);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withEnablePrivateIpAddress(Boolean enablePrivateIpAddress) {
+        this.inner().withEnablePrivateIpAddress(enablePrivateIpAddress);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withGatewayDefaultSite(SubResource gatewayDefaultSite) {
+        this.inner().withGatewayDefaultSite(gatewayDefaultSite);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withGatewayType(VirtualNetworkGatewayType gatewayType) {
+        this.inner().withGatewayType(gatewayType);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations) {
+        this.inner().withIpConfigurations(ipConfigurations);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withSku(VirtualNetworkGatewaySku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration) {
+        this.inner().withVpnClientConfiguration(vpnClientConfiguration);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withVpnGatewayGeneration(VpnGatewayGeneration vpnGatewayGeneration) {
+        this.inner().withVpnGatewayGeneration(vpnGatewayGeneration);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl withVpnType(VpnType vpnType) {
+        this.inner().withVpnType(vpnType);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayInner.java
new file mode 100644
index 000000000000..51f98271202b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewayInner.java
@@ -0,0 +1,470 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGatewayGeneration;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewaySku;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * A common class for general resource information.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualNetworkGatewayInner extends Resource {
+    /**
+     * IP configurations for virtual network gateway.
+     */
+    @JsonProperty(value = "properties.ipConfigurations")
+    private List<VirtualNetworkGatewayIPConfiguration> ipConfigurations;
+
+    /**
+     * The type of this virtual network gateway. Possible values include:
+     * 'Vpn', 'ExpressRoute'.
+     */
+    @JsonProperty(value = "properties.gatewayType")
+    private VirtualNetworkGatewayType gatewayType;
+
+    /**
+     * The type of this virtual network gateway. Possible values include:
+     * 'PolicyBased', 'RouteBased'.
+     */
+    @JsonProperty(value = "properties.vpnType")
+    private VpnType vpnType;
+
+    /**
+     * The generation for this VirtualNetworkGateway. Must be None if
+     * gatewayType is not VPN. Possible values include: 'None', 'Generation1',
+     * 'Generation2'.
+     */
+    @JsonProperty(value = "properties.vpnGatewayGeneration")
+    private VpnGatewayGeneration vpnGatewayGeneration;
+
+    /**
+     * Whether BGP is enabled for this virtual network gateway or not.
+     */
+    @JsonProperty(value = "properties.enableBgp")
+    private Boolean enableBgp;
+
+    /**
+     * Whether private IP needs to be enabled on this gateway for connections
+     * or not.
+     */
+    @JsonProperty(value = "properties.enablePrivateIpAddress")
+    private Boolean enablePrivateIpAddress;
+
+    /**
+     * ActiveActive flag.
+     */
+    @JsonProperty(value = "properties.activeActive")
+    private Boolean activeActive;
+
+    /**
+     * The reference to the LocalNetworkGateway resource which represents local
+     * network site having default routes. Assign Null value in case of
+     * removing existing default site setting.
+     */
+    @JsonProperty(value = "properties.gatewayDefaultSite")
+    private SubResource gatewayDefaultSite;
+
+    /**
+     * The reference to the VirtualNetworkGatewaySku resource which represents
+     * the SKU selected for Virtual network gateway.
+     */
+    @JsonProperty(value = "properties.sku")
+    private VirtualNetworkGatewaySku sku;
+
+    /**
+     * The reference to the VpnClientConfiguration resource which represents
+     * the P2S VpnClient configurations.
+     */
+    @JsonProperty(value = "properties.vpnClientConfiguration")
+    private VpnClientConfiguration vpnClientConfiguration;
+
+    /**
+     * Virtual network gateway's BGP speaker settings.
+     */
+    @JsonProperty(value = "properties.bgpSettings")
+    private BgpSettings bgpSettings;
+
+    /**
+     * The reference to the address space resource which represents the custom
+     * routes address space specified by the customer for virtual network
+     * gateway and VpnClient.
+     */
+    @JsonProperty(value = "properties.customRoutes")
+    private AddressSpace customRoutes;
+
+    /**
+     * The resource GUID property of the virtual network gateway resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the virtual network gateway resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Whether dns forwarding is enabled or not.
+     */
+    @JsonProperty(value = "properties.enableDnsForwarding")
+    private Boolean enableDnsForwarding;
+
+    /**
+     * The IP address allocated by the gateway to which dns requests can be
+     * sent.
+     */
+    @JsonProperty(value = "properties.inboundDnsForwardingEndpoint", access = JsonProperty.Access.WRITE_ONLY)
+    private String inboundDnsForwardingEndpoint;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get iP configurations for virtual network gateway.
+     *
+     * @return the ipConfigurations value
+     */
+    public List<VirtualNetworkGatewayIPConfiguration> ipConfigurations() {
+        return this.ipConfigurations;
+    }
+
+    /**
+     * Set iP configurations for virtual network gateway.
+     *
+     * @param ipConfigurations the ipConfigurations value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations) {
+        this.ipConfigurations = ipConfigurations;
+        return this;
+    }
+
+    /**
+     * Get the type of this virtual network gateway. Possible values include: 'Vpn', 'ExpressRoute'.
+     *
+     * @return the gatewayType value
+     */
+    public VirtualNetworkGatewayType gatewayType() {
+        return this.gatewayType;
+    }
+
+    /**
+     * Set the type of this virtual network gateway. Possible values include: 'Vpn', 'ExpressRoute'.
+     *
+     * @param gatewayType the gatewayType value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withGatewayType(VirtualNetworkGatewayType gatewayType) {
+        this.gatewayType = gatewayType;
+        return this;
+    }
+
+    /**
+     * Get the type of this virtual network gateway. Possible values include: 'PolicyBased', 'RouteBased'.
+     *
+     * @return the vpnType value
+     */
+    public VpnType vpnType() {
+        return this.vpnType;
+    }
+
+    /**
+     * Set the type of this virtual network gateway. Possible values include: 'PolicyBased', 'RouteBased'.
+     *
+     * @param vpnType the vpnType value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withVpnType(VpnType vpnType) {
+        this.vpnType = vpnType;
+        return this;
+    }
+
+    /**
+     * Get the generation for this VirtualNetworkGateway. Must be None if gatewayType is not VPN. Possible values include: 'None', 'Generation1', 'Generation2'.
+     *
+     * @return the vpnGatewayGeneration value
+     */
+    public VpnGatewayGeneration vpnGatewayGeneration() {
+        return this.vpnGatewayGeneration;
+    }
+
+    /**
+     * Set the generation for this VirtualNetworkGateway. Must be None if gatewayType is not VPN. Possible values include: 'None', 'Generation1', 'Generation2'.
+     *
+     * @param vpnGatewayGeneration the vpnGatewayGeneration value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withVpnGatewayGeneration(VpnGatewayGeneration vpnGatewayGeneration) {
+        this.vpnGatewayGeneration = vpnGatewayGeneration;
+        return this;
+    }
+
+    /**
+     * Get whether BGP is enabled for this virtual network gateway or not.
+     *
+     * @return the enableBgp value
+     */
+    public Boolean enableBgp() {
+        return this.enableBgp;
+    }
+
+    /**
+     * Set whether BGP is enabled for this virtual network gateway or not.
+     *
+     * @param enableBgp the enableBgp value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withEnableBgp(Boolean enableBgp) {
+        this.enableBgp = enableBgp;
+        return this;
+    }
+
+    /**
+     * Get whether private IP needs to be enabled on this gateway for connections or not.
+     *
+     * @return the enablePrivateIpAddress value
+     */
+    public Boolean enablePrivateIpAddress() {
+        return this.enablePrivateIpAddress;
+    }
+
+    /**
+     * Set whether private IP needs to be enabled on this gateway for connections or not.
+     *
+     * @param enablePrivateIpAddress the enablePrivateIpAddress value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withEnablePrivateIpAddress(Boolean enablePrivateIpAddress) {
+        this.enablePrivateIpAddress = enablePrivateIpAddress;
+        return this;
+    }
+
+    /**
+     * Get activeActive flag.
+     *
+     * @return the activeActive value
+     */
+    public Boolean activeActive() {
+        return this.activeActive;
+    }
+
+    /**
+     * Set activeActive flag.
+     *
+     * @param activeActive the activeActive value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withActiveActive(Boolean activeActive) {
+        this.activeActive = activeActive;
+        return this;
+    }
+
+    /**
+     * Get the reference to the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting.
+     *
+     * @return the gatewayDefaultSite value
+     */
+    public SubResource gatewayDefaultSite() {
+        return this.gatewayDefaultSite;
+    }
+
+    /**
+     * Set the reference to the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting.
+     *
+     * @param gatewayDefaultSite the gatewayDefaultSite value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withGatewayDefaultSite(SubResource gatewayDefaultSite) {
+        this.gatewayDefaultSite = gatewayDefaultSite;
+        return this;
+    }
+
+    /**
+     * Get the reference to the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway.
+     *
+     * @return the sku value
+     */
+    public VirtualNetworkGatewaySku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the reference to the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway.
+     *
+     * @param sku the sku value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withSku(VirtualNetworkGatewaySku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the reference to the VpnClientConfiguration resource which represents the P2S VpnClient configurations.
+     *
+     * @return the vpnClientConfiguration value
+     */
+    public VpnClientConfiguration vpnClientConfiguration() {
+        return this.vpnClientConfiguration;
+    }
+
+    /**
+     * Set the reference to the VpnClientConfiguration resource which represents the P2S VpnClient configurations.
+     *
+     * @param vpnClientConfiguration the vpnClientConfiguration value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration) {
+        this.vpnClientConfiguration = vpnClientConfiguration;
+        return this;
+    }
+
+    /**
+     * Get virtual network gateway's BGP speaker settings.
+     *
+     * @return the bgpSettings value
+     */
+    public BgpSettings bgpSettings() {
+        return this.bgpSettings;
+    }
+
+    /**
+     * Set virtual network gateway's BGP speaker settings.
+     *
+     * @param bgpSettings the bgpSettings value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withBgpSettings(BgpSettings bgpSettings) {
+        this.bgpSettings = bgpSettings;
+        return this;
+    }
+
+    /**
+     * Get the reference to the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient.
+     *
+     * @return the customRoutes value
+     */
+    public AddressSpace customRoutes() {
+        return this.customRoutes;
+    }
+
+    /**
+     * Set the reference to the address space resource which represents the custom routes address space specified by the customer for virtual network gateway and VpnClient.
+     *
+     * @param customRoutes the customRoutes value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withCustomRoutes(AddressSpace customRoutes) {
+        this.customRoutes = customRoutes;
+        return this;
+    }
+
+    /**
+     * Get the resource GUID property of the virtual network gateway resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get whether dns forwarding is enabled or not.
+     *
+     * @return the enableDnsForwarding value
+     */
+    public Boolean enableDnsForwarding() {
+        return this.enableDnsForwarding;
+    }
+
+    /**
+     * Set whether dns forwarding is enabled or not.
+     *
+     * @param enableDnsForwarding the enableDnsForwarding value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withEnableDnsForwarding(Boolean enableDnsForwarding) {
+        this.enableDnsForwarding = enableDnsForwarding;
+        return this;
+    }
+
+    /**
+     * Get the IP address allocated by the gateway to which dns requests can be sent.
+     *
+     * @return the inboundDnsForwardingEndpoint value
+     */
+    public String inboundDnsForwardingEndpoint() {
+        return this.inboundDnsForwardingEndpoint;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkGatewayInner object itself.
+     */
+    public VirtualNetworkGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysImpl.java
new file mode 100644
index 000000000000..6c6695edcebf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysImpl.java
@@ -0,0 +1,281 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateway;
+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.network.v2020_04_01.BgpPeerStatusListResult;
+import com.microsoft.azure.management.network.v2020_04_01.GatewayRouteListResult;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientIPsecParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealthDetailListResult;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionListEntity;
+import com.microsoft.azure.management.network.v2020_04_01.VpnDeviceScriptParameters;
+
+class VirtualNetworkGatewaysImpl extends GroupableResourcesCoreImpl<VirtualNetworkGateway, VirtualNetworkGatewayImpl, VirtualNetworkGatewayInner, VirtualNetworkGatewaysInner, NetworkManager>  implements VirtualNetworkGateways {
+    protected VirtualNetworkGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().virtualNetworkGateways(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualNetworkGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkGatewaysInner 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<VirtualNetworkGateway> listByResourceGroup(String resourceGroupName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualNetworkGateway> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkGatewayInner>, Iterable<VirtualNetworkGatewayInner>>() {
+            @Override
+            public Iterable<VirtualNetworkGatewayInner> call(Page<VirtualNetworkGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkGatewayInner, VirtualNetworkGateway>() {
+            @Override
+            public VirtualNetworkGateway call(VirtualNetworkGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualNetworkGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<VirtualNetworkGateway> resetAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.resetAsync(resourceGroupName, virtualNetworkGatewayName)
+        .map(new Func1<VirtualNetworkGatewayInner, VirtualNetworkGateway>() {
+            @Override
+            public VirtualNetworkGateway call(VirtualNetworkGatewayInner inner) {
+                return new VirtualNetworkGatewayImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.resetVpnClientSharedKeyAsync(resourceGroupName, virtualNetworkGatewayName).toCompletable();
+    }
+
+    @Override
+    public Observable<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.generatevpnclientpackageAsync(resourceGroupName, virtualNetworkGatewayName, parameters)
+    ;}
+
+    @Override
+    public Observable<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.generateVpnProfileAsync(resourceGroupName, virtualNetworkGatewayName, parameters)
+    ;}
+
+    @Override
+    public Observable<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getVpnProfilePackageUrlAsync(resourceGroupName, virtualNetworkGatewayName)
+    ;}
+
+    @Override
+    public Observable<BgpPeerStatusListResult> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getBgpPeerStatusAsync(resourceGroupName, virtualNetworkGatewayName)
+        .map(new Func1<BgpPeerStatusListResultInner, BgpPeerStatusListResult>() {
+            @Override
+            public BgpPeerStatusListResult call(BgpPeerStatusListResultInner inner) {
+                return new BgpPeerStatusListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.supportedVpnDevicesAsync(resourceGroupName, virtualNetworkGatewayName)
+    ;}
+
+    @Override
+    public Observable<GatewayRouteListResult> getLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getLearnedRoutesAsync(resourceGroupName, virtualNetworkGatewayName)
+        .map(new Func1<GatewayRouteListResultInner, GatewayRouteListResult>() {
+            @Override
+            public GatewayRouteListResult call(GatewayRouteListResultInner inner) {
+                return new GatewayRouteListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<GatewayRouteListResult> getAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getAdvertisedRoutesAsync(resourceGroupName, virtualNetworkGatewayName, peer)
+        .map(new Func1<GatewayRouteListResultInner, GatewayRouteListResult>() {
+            @Override
+            public GatewayRouteListResult call(GatewayRouteListResultInner inner) {
+                return new GatewayRouteListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VpnClientIPsecParameters> setVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.setVpnclientIpsecParametersAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams)
+        .map(new Func1<VpnClientIPsecParametersInner, VpnClientIPsecParameters>() {
+            @Override
+            public VpnClientIPsecParameters call(VpnClientIPsecParametersInner inner) {
+                return new VpnClientIPsecParametersImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VpnClientIPsecParameters> getVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getVpnclientIpsecParametersAsync(resourceGroupName, virtualNetworkGatewayName)
+        .map(new Func1<VpnClientIPsecParametersInner, VpnClientIPsecParameters>() {
+            @Override
+            public VpnClientIPsecParameters call(VpnClientIPsecParametersInner inner) {
+                return new VpnClientIPsecParametersImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.startPacketCaptureAsync(resourceGroupName, virtualNetworkGatewayName)
+    ;}
+
+    @Override
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.stopPacketCaptureAsync(resourceGroupName, virtualNetworkGatewayName)
+    ;}
+
+    @Override
+    public Observable<VpnClientConnectionHealthDetailListResult> getVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.getVpnclientConnectionHealthAsync(resourceGroupName, virtualNetworkGatewayName)
+        .map(new Func1<VpnClientConnectionHealthDetailListResultInner, VpnClientConnectionHealthDetailListResult>() {
+            @Override
+            public VpnClientConnectionHealthDetailListResult call(VpnClientConnectionHealthDetailListResultInner inner) {
+                return new VpnClientConnectionHealthDetailListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.disconnectVirtualNetworkGatewayVpnConnectionsAsync(resourceGroupName, virtualNetworkGatewayName).toCompletable();
+    }
+
+    @Override
+    protected VirtualNetworkGatewayImpl wrapModel(VirtualNetworkGatewayInner inner) {
+        return  new VirtualNetworkGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualNetworkGatewayImpl wrapModel(String name) {
+        return new VirtualNetworkGatewayImpl(name, new VirtualNetworkGatewayInner(), this.manager());
+    }
+
+    private VirtualNetworkGatewayConnectionListEntityImpl wrapVirtualNetworkGatewayConnectionListEntityModel(VirtualNetworkGatewayConnectionListEntityInner inner) {
+        return  new VirtualNetworkGatewayConnectionListEntityImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VirtualNetworkGatewayConnectionListEntity> listConnectionsAsync(final String resourceGroupName, final String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.listConnectionsAsync(resourceGroupName, virtualNetworkGatewayName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkGatewayConnectionListEntityInner>, Iterable<VirtualNetworkGatewayConnectionListEntityInner>>() {
+            @Override
+            public Iterable<VirtualNetworkGatewayConnectionListEntityInner> call(Page<VirtualNetworkGatewayConnectionListEntityInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkGatewayConnectionListEntityInner, VirtualNetworkGatewayConnectionListEntity>() {
+            @Override
+            public VirtualNetworkGatewayConnectionListEntity call(VirtualNetworkGatewayConnectionListEntityInner inner) {
+                return wrapVirtualNetworkGatewayConnectionListEntityModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.vpnDeviceConfigurationScriptAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
+    ;}
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysInner.java
new file mode 100644
index 000000000000..d66e36ad455c
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkGatewaysInner.java
@@ -0,0 +1,4574 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+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.network.v2020_04_01.ErrorException;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnConnectionRequest;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VpnDeviceScriptParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VpnPacketCaptureStartParameters;
+import com.microsoft.azure.management.network.v2020_04_01.VpnPacketCaptureStopParameters;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VirtualNetworkGateways.
+ */
+public class VirtualNetworkGatewaysInner implements InnerSupportsGet<VirtualNetworkGatewayInner>, InnerSupportsDelete<Void> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualNetworkGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualNetworkGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualNetworkGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualNetworkGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualNetworkGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualNetworkGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkGatewayInner 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.network.v2020_04_01.VirtualNetworkGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkGatewayInner 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.network.v2020_04_01.VirtualNetworkGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways beginUpdateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
+        Observable<Response<ResponseBody>> beginUpdateTags(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways")
+        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.network.v2020_04_01.VirtualNetworkGateways listConnections" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/connections")
+        Observable<Response<ResponseBody>> listConnections(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways reset" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/reset")
+        Observable<Response<ResponseBody>> reset(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("gatewayVip") String gatewayVip, @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.network.v2020_04_01.VirtualNetworkGateways beginReset" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/reset")
+        Observable<Response<ResponseBody>> beginReset(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("gatewayVip") String gatewayVip, @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.network.v2020_04_01.VirtualNetworkGateways resetVpnClientSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/resetvpnclientsharedkey")
+        Observable<Response<ResponseBody>> resetVpnClientSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginResetVpnClientSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/resetvpnclientsharedkey")
+        Observable<Response<ResponseBody>> beginResetVpnClientSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways generatevpnclientpackage" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnclientpackage")
+        Observable<Response<ResponseBody>> generatevpnclientpackage(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters 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.network.v2020_04_01.VirtualNetworkGateways beginGeneratevpnclientpackage" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnclientpackage")
+        Observable<Response<ResponseBody>> beginGeneratevpnclientpackage(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters 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.network.v2020_04_01.VirtualNetworkGateways generateVpnProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile")
+        Observable<Response<ResponseBody>> generateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters 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.network.v2020_04_01.VirtualNetworkGateways beginGenerateVpnProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnprofile")
+        Observable<Response<ResponseBody>> beginGenerateVpnProfile(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters 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.network.v2020_04_01.VirtualNetworkGateways getVpnProfilePackageUrl" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl")
+        Observable<Response<ResponseBody>> getVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginGetVpnProfilePackageUrl" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl")
+        Observable<Response<ResponseBody>> beginGetVpnProfilePackageUrl(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways getBgpPeerStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getBgpPeerStatus")
+        Observable<Response<ResponseBody>> getBgpPeerStatus(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("peer") String peer, @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.network.v2020_04_01.VirtualNetworkGateways beginGetBgpPeerStatus" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getBgpPeerStatus")
+        Observable<Response<ResponseBody>> beginGetBgpPeerStatus(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("peer") String peer, @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.network.v2020_04_01.VirtualNetworkGateways supportedVpnDevices" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/supportedvpndevices")
+        Observable<Response<ResponseBody>> supportedVpnDevices(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways getLearnedRoutes" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getLearnedRoutes")
+        Observable<Response<ResponseBody>> getLearnedRoutes(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginGetLearnedRoutes" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getLearnedRoutes")
+        Observable<Response<ResponseBody>> beginGetLearnedRoutes(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways getAdvertisedRoutes" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getAdvertisedRoutes")
+        Observable<Response<ResponseBody>> getAdvertisedRoutes(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("peer") String peer, @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.network.v2020_04_01.VirtualNetworkGateways beginGetAdvertisedRoutes" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getAdvertisedRoutes")
+        Observable<Response<ResponseBody>> beginGetAdvertisedRoutes(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("peer") String peer, @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.network.v2020_04_01.VirtualNetworkGateways setVpnclientIpsecParameters" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/setvpnclientipsecparameters")
+        Observable<Response<ResponseBody>> setVpnclientIpsecParameters(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientIPsecParametersInner vpnclientIpsecParams, @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.network.v2020_04_01.VirtualNetworkGateways beginSetVpnclientIpsecParameters" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/setvpnclientipsecparameters")
+        Observable<Response<ResponseBody>> beginSetVpnclientIpsecParameters(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientIPsecParametersInner vpnclientIpsecParams, @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.network.v2020_04_01.VirtualNetworkGateways getVpnclientIpsecParameters" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnclientipsecparameters")
+        Observable<Response<ResponseBody>> getVpnclientIpsecParameters(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginGetVpnclientIpsecParameters" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnclientipsecparameters")
+        Observable<Response<ResponseBody>> beginGetVpnclientIpsecParameters(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways vpnDeviceConfigurationScript" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/vpndeviceconfigurationscript")
+        Observable<Response<ResponseBody>> vpnDeviceConfigurationScript(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayConnectionName") String virtualNetworkGatewayConnectionName, @Path("subscriptionId") String subscriptionId, @Body VpnDeviceScriptParameters 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.network.v2020_04_01.VirtualNetworkGateways startPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/startPacketCapture")
+        Observable<Response<ResponseBody>> startPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStartParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways beginStartPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/startPacketCapture")
+        Observable<Response<ResponseBody>> beginStartPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStartParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways stopPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/stopPacketCapture")
+        Observable<Response<ResponseBody>> stopPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStopParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways beginStopPacketCapture" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/stopPacketCapture")
+        Observable<Response<ResponseBody>> beginStopPacketCapture(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VpnPacketCaptureStopParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways getVpnclientConnectionHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getVpnClientConnectionHealth")
+        Observable<Response<ResponseBody>> getVpnclientConnectionHealth(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways beginGetVpnclientConnectionHealth" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getVpnClientConnectionHealth")
+        Observable<Response<ResponseBody>> beginGetVpnclientConnectionHealth(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @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.network.v2020_04_01.VirtualNetworkGateways disconnectVirtualNetworkGatewayVpnConnections" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/disconnectVirtualNetworkGatewayVpnConnections")
+        Observable<Response<ResponseBody>> disconnectVirtualNetworkGatewayVpnConnections(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnConnectionRequest request, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways beginDisconnectVirtualNetworkGatewayVpnConnections" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/disconnectVirtualNetworkGatewayVpnConnections")
+        Observable<Response<ResponseBody>> beginDisconnectVirtualNetworkGatewayVpnConnections(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body P2SVpnConnectionRequest request, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGateways 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.network.v2020_04_01.VirtualNetworkGateways listConnectionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listConnectionsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway 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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner createOrUpdate(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @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<VirtualNetworkGatewayInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway 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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner beginCreateOrUpdate(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @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<VirtualNetworkGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to create or update virtual network gateway operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VirtualNetworkGatewayInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayInner>() { }.getType())
+                .register(201, new TypeToken<VirtualNetworkGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified virtual network gateway by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner getByResourceGroup(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified virtual network gateway by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified virtual network gateway by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified virtual network gateway by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 virtualNetworkGatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 virtualNetworkGatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner updateTags(String resourceGroupName, String virtualNetworkGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayInner>() { }.getType());
+    }
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner updateTags(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags).toBlocking().last().body();
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayInner> updateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        Observable<Response<ResponseBody>> observable = service.updateTags(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner beginUpdateTags(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.beginUpdateTags(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner beginUpdateTags(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkGatewayInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> beginUpdateTagsAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, tags).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network gateway tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.beginUpdateTags(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayInner> beginUpdateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;VirtualNetworkGatewayInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualNetworkGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<VirtualNetworkGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayInner>>, Page<VirtualNetworkGatewayInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayInner> call(ServiceResponse<Page<VirtualNetworkGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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;VirtualNetworkGatewayConnectionListEntityInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayConnectionListEntityInner> listConnections(final String resourceGroupName, final String virtualNetworkGatewayName) {
+        ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> response = listConnectionsSinglePageAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayConnectionListEntityInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayConnectionListEntityInner> nextPage(String nextPageLink) {
+                return listConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsAsync(final String resourceGroupName, final String virtualNetworkGatewayName, final ListOperationCallback<VirtualNetworkGatewayConnectionListEntityInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listConnectionsSinglePageAsync(resourceGroupName, virtualNetworkGatewayName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(String nextPageLink) {
+                    return listConnectionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayConnectionListEntityInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsAsync(final String resourceGroupName, final String virtualNetworkGatewayName) {
+        return listConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>, Page<VirtualNetworkGatewayConnectionListEntityInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayConnectionListEntityInner> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkGatewayConnectionListEntityInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> listConnectionsWithServiceResponseAsync(final String resourceGroupName, final String virtualNetworkGatewayName) {
+        return listConnectionsSinglePageAsync(resourceGroupName, virtualNetworkGatewayName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listConnectionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayConnectionListEntityInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> listConnectionsSinglePageAsync(final String resourceGroupName, final String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listConnections(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> result = listConnectionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner reset(String resourceGroupName, String virtualNetworkGatewayName) {
+        return resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayInner> resetAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayInner> resetAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> resetWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String gatewayVip = null;
+        Observable<Response<ResponseBody>> observable = service.reset(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), gatewayVip, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VirtualNetworkGatewayInner>() { }.getType());
+    }
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner reset(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        return resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip).toBlocking().last().body();
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @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<VirtualNetworkGatewayInner> resetAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkGatewayInner> resetAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        return resetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> resetWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.reset(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), gatewayVip, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VirtualNetworkGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner beginReset(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VirtualNetworkGatewayInner> beginResetAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> beginResetAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> beginResetWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String gatewayVip = null;
+        return service.beginReset(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), gatewayVip, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = beginResetDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @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 VirtualNetworkGatewayInner object if successful.
+     */
+    public VirtualNetworkGatewayInner beginReset(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip).toBlocking().single().body();
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @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<VirtualNetworkGatewayInner> beginResetAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip, final ServiceCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<VirtualNetworkGatewayInner> beginResetAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, gatewayVip).map(new Func1<ServiceResponse<VirtualNetworkGatewayInner>, VirtualNetworkGatewayInner>() {
+            @Override
+            public VirtualNetworkGatewayInner call(ServiceResponse<VirtualNetworkGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param gatewayVip Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkGatewayInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkGatewayInner>> beginResetWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String gatewayVip) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginReset(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), gatewayVip, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkGatewayInner> clientResponse = beginResetDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkGatewayInner> beginResetDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkGatewayInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 resetVpnClientSharedKey(String resourceGroupName, String virtualNetworkGatewayName) {
+        resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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> resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> resetVpnClientSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.resetVpnClientSharedKey(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 beginResetVpnClientSharedKey(String resourceGroupName, String virtualNetworkGatewayName) {
+        beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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> beginResetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginResetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginResetVpnClientSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginResetVpnClientSharedKey(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), 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 = beginResetVpnClientSharedKeyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginResetVpnClientSharedKeyDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package 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 String object if successful.
+     */
+    public String generatevpnclientpackage(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return generatevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @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<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(generatevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return generatevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> generatevpnclientpackageWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package 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 String object if successful.
+     */
+    public String beginGeneratevpnclientpackage(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return beginGeneratevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @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<String> beginGeneratevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGeneratevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginGeneratevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return beginGeneratevpnclientpackageWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginGeneratevpnclientpackageWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGeneratevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginGeneratevpnclientpackageDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginGeneratevpnclientpackageDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package 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 String object if successful.
+     */
+    public String generateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @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<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return generateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> generateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.generateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package 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 String object if successful.
+     */
+    public String beginGenerateVpnProfile(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @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<String> beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters), serviceCallback);
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginGenerateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        return beginGenerateVpnProfileWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, parameters).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param parameters Parameters supplied to the generate virtual network gateway VPN client package operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginGenerateVpnProfileWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginGenerateVpnProfile(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginGenerateVpnProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginGenerateVpnProfileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 String object if successful.
+     */
+    public String getVpnProfilePackageUrl(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(getVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> getVpnProfilePackageUrlWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getVpnProfilePackageUrl(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 String object if successful.
+     */
+    public String beginGetVpnProfilePackageUrl(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> beginGetVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginGetVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnProfilePackageUrlWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginGetVpnProfilePackageUrlWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetVpnProfilePackageUrl(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginGetVpnProfilePackageUrlDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginGetVpnProfilePackageUrlDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 BgpPeerStatusListResultInner object if successful.
+     */
+    public BgpPeerStatusListResultInner getBgpPeerStatus(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<BgpPeerStatusListResultInner> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<BgpPeerStatusListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<BgpPeerStatusListResultInner> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<BgpPeerStatusListResultInner>, BgpPeerStatusListResultInner>() {
+            @Override
+            public BgpPeerStatusListResultInner call(ServiceResponse<BgpPeerStatusListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<BgpPeerStatusListResultInner>> getBgpPeerStatusWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String peer = null;
+        Observable<Response<ResponseBody>> observable = service.getBgpPeerStatus(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<BgpPeerStatusListResultInner>() { }.getType());
+    }
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @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 BgpPeerStatusListResultInner object if successful.
+     */
+    public BgpPeerStatusListResultInner getBgpPeerStatus(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).toBlocking().last().body();
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @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<BgpPeerStatusListResultInner> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer, final ServiceCallback<BgpPeerStatusListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer), serviceCallback);
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<BgpPeerStatusListResultInner> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return getBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).map(new Func1<ServiceResponse<BgpPeerStatusListResultInner>, BgpPeerStatusListResultInner>() {
+            @Override
+            public BgpPeerStatusListResultInner call(ServiceResponse<BgpPeerStatusListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<BgpPeerStatusListResultInner>> getBgpPeerStatusWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getBgpPeerStatus(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<BgpPeerStatusListResultInner>() { }.getType());
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 BgpPeerStatusListResultInner object if successful.
+     */
+    public BgpPeerStatusListResultInner beginGetBgpPeerStatus(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<BgpPeerStatusListResultInner> beginGetBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<BgpPeerStatusListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BgpPeerStatusListResultInner object
+     */
+    public Observable<BgpPeerStatusListResultInner> beginGetBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<BgpPeerStatusListResultInner>, BgpPeerStatusListResultInner>() {
+            @Override
+            public BgpPeerStatusListResultInner call(ServiceResponse<BgpPeerStatusListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BgpPeerStatusListResultInner object
+     */
+    public Observable<ServiceResponse<BgpPeerStatusListResultInner>> beginGetBgpPeerStatusWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String peer = null;
+        return service.beginGetBgpPeerStatus(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BgpPeerStatusListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BgpPeerStatusListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BgpPeerStatusListResultInner> clientResponse = beginGetBgpPeerStatusDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @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 BgpPeerStatusListResultInner object if successful.
+     */
+    public BgpPeerStatusListResultInner beginGetBgpPeerStatus(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).toBlocking().single().body();
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @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<BgpPeerStatusListResultInner> beginGetBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer, final ServiceCallback<BgpPeerStatusListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer), serviceCallback);
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BgpPeerStatusListResultInner object
+     */
+    public Observable<BgpPeerStatusListResultInner> beginGetBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return beginGetBgpPeerStatusWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).map(new Func1<ServiceResponse<BgpPeerStatusListResultInner>, BgpPeerStatusListResultInner>() {
+            @Override
+            public BgpPeerStatusListResultInner call(ServiceResponse<BgpPeerStatusListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The GetBgpPeerStatus operation retrieves the status of all BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer to retrieve the status of.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the BgpPeerStatusListResultInner object
+     */
+    public Observable<ServiceResponse<BgpPeerStatusListResultInner>> beginGetBgpPeerStatusWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetBgpPeerStatus(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<BgpPeerStatusListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<BgpPeerStatusListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<BgpPeerStatusListResultInner> clientResponse = beginGetBgpPeerStatusDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<BgpPeerStatusListResultInner> beginGetBgpPeerStatusDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<BgpPeerStatusListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<BgpPeerStatusListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a xml format representation for supported vpn devices.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 String object if successful.
+     */
+    public String supportedVpnDevices(String resourceGroupName, String virtualNetworkGatewayName) {
+        return supportedVpnDevicesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a xml format representation for supported vpn devices.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(supportedVpnDevicesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Gets a xml format representation for supported vpn devices.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return supportedVpnDevicesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a xml format representation for supported vpn devices.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> supportedVpnDevicesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.supportedVpnDevices(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = supportedVpnDevicesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> supportedVpnDevicesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 GatewayRouteListResultInner object if successful.
+     */
+    public GatewayRouteListResultInner getLearnedRoutes(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<GatewayRouteListResultInner> getLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<GatewayRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<GatewayRouteListResultInner> getLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<GatewayRouteListResultInner>, GatewayRouteListResultInner>() {
+            @Override
+            public GatewayRouteListResultInner call(ServiceResponse<GatewayRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<GatewayRouteListResultInner>> getLearnedRoutesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getLearnedRoutes(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<GatewayRouteListResultInner>() { }.getType());
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 GatewayRouteListResultInner object if successful.
+     */
+    public GatewayRouteListResultInner beginGetLearnedRoutes(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<GatewayRouteListResultInner> beginGetLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<GatewayRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the GatewayRouteListResultInner object
+     */
+    public Observable<GatewayRouteListResultInner> beginGetLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetLearnedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<GatewayRouteListResultInner>, GatewayRouteListResultInner>() {
+            @Override
+            public GatewayRouteListResultInner call(ServiceResponse<GatewayRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the GatewayRouteListResultInner object
+     */
+    public Observable<ServiceResponse<GatewayRouteListResultInner>> beginGetLearnedRoutesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetLearnedRoutes(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<GatewayRouteListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<GatewayRouteListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<GatewayRouteListResultInner> clientResponse = beginGetLearnedRoutesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<GatewayRouteListResultInner> beginGetLearnedRoutesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<GatewayRouteListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<GatewayRouteListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @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 GatewayRouteListResultInner object if successful.
+     */
+    public GatewayRouteListResultInner getAdvertisedRoutes(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return getAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).toBlocking().last().body();
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @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<GatewayRouteListResultInner> getAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer, final ServiceCallback<GatewayRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer), serviceCallback);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<GatewayRouteListResultInner> getAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return getAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).map(new Func1<ServiceResponse<GatewayRouteListResultInner>, GatewayRouteListResultInner>() {
+            @Override
+            public GatewayRouteListResultInner call(ServiceResponse<GatewayRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<GatewayRouteListResultInner>> getAdvertisedRoutesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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 (peer == null) {
+            throw new IllegalArgumentException("Parameter peer is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getAdvertisedRoutes(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<GatewayRouteListResultInner>() { }.getType());
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @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 GatewayRouteListResultInner object if successful.
+     */
+    public GatewayRouteListResultInner beginGetAdvertisedRoutes(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return beginGetAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).toBlocking().single().body();
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @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<GatewayRouteListResultInner> beginGetAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer, final ServiceCallback<GatewayRouteListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer), serviceCallback);
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the GatewayRouteListResultInner object
+     */
+    public Observable<GatewayRouteListResultInner> beginGetAdvertisedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        return beginGetAdvertisedRoutesWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, peer).map(new Func1<ServiceResponse<GatewayRouteListResultInner>, GatewayRouteListResultInner>() {
+            @Override
+            public GatewayRouteListResultInner call(ServiceResponse<GatewayRouteListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * This operation retrieves a list of routes the virtual network gateway is advertising to the specified peer.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param peer The IP address of the peer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the GatewayRouteListResultInner object
+     */
+    public Observable<ServiceResponse<GatewayRouteListResultInner>> beginGetAdvertisedRoutesWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String peer) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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 (peer == null) {
+            throw new IllegalArgumentException("Parameter peer is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetAdvertisedRoutes(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), peer, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<GatewayRouteListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<GatewayRouteListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<GatewayRouteListResultInner> clientResponse = beginGetAdvertisedRoutesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<GatewayRouteListResultInner> beginGetAdvertisedRoutesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<GatewayRouteListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<GatewayRouteListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @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 VpnClientIPsecParametersInner object if successful.
+     */
+    public VpnClientIPsecParametersInner setVpnclientIpsecParameters(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        return setVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams).toBlocking().last().body();
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @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<VpnClientIPsecParametersInner> setVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams, final ServiceCallback<VpnClientIPsecParametersInner> serviceCallback) {
+        return ServiceFuture.fromResponse(setVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams), serviceCallback);
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnClientIPsecParametersInner> setVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        return setVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams).map(new Func1<ServiceResponse<VpnClientIPsecParametersInner>, VpnClientIPsecParametersInner>() {
+            @Override
+            public VpnClientIPsecParametersInner call(ServiceResponse<VpnClientIPsecParametersInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnClientIPsecParametersInner>> setVpnclientIpsecParametersWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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 (vpnclientIpsecParams == null) {
+            throw new IllegalArgumentException("Parameter vpnclientIpsecParams is required and cannot be null.");
+        }
+        Validator.validate(vpnclientIpsecParams);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.setVpnclientIpsecParameters(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), vpnclientIpsecParams, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnClientIPsecParametersInner>() { }.getType());
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @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 VpnClientIPsecParametersInner object if successful.
+     */
+    public VpnClientIPsecParametersInner beginSetVpnclientIpsecParameters(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        return beginSetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams).toBlocking().single().body();
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @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<VpnClientIPsecParametersInner> beginSetVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams, final ServiceCallback<VpnClientIPsecParametersInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginSetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams), serviceCallback);
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientIPsecParametersInner object
+     */
+    public Observable<VpnClientIPsecParametersInner> beginSetVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        return beginSetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnclientIpsecParams).map(new Func1<ServiceResponse<VpnClientIPsecParametersInner>, VpnClientIPsecParametersInner>() {
+            @Override
+            public VpnClientIPsecParametersInner call(ServiceResponse<VpnClientIPsecParametersInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Set VpnclientIpsecParameters operation sets the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnclientIpsecParams Parameters supplied to the Begin Set vpnclient ipsec parameters of Virtual Network Gateway P2S client operation through Network resource provider.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientIPsecParametersInner object
+     */
+    public Observable<ServiceResponse<VpnClientIPsecParametersInner>> beginSetVpnclientIpsecParametersWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientIPsecParametersInner vpnclientIpsecParams) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName 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 (vpnclientIpsecParams == null) {
+            throw new IllegalArgumentException("Parameter vpnclientIpsecParams is required and cannot be null.");
+        }
+        Validator.validate(vpnclientIpsecParams);
+        final String apiVersion = "2020-04-01";
+        return service.beginSetVpnclientIpsecParameters(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), vpnclientIpsecParams, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnClientIPsecParametersInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnClientIPsecParametersInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnClientIPsecParametersInner> clientResponse = beginSetVpnclientIpsecParametersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnClientIPsecParametersInner> beginSetVpnclientIpsecParametersDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnClientIPsecParametersInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnClientIPsecParametersInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway 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 VpnClientIPsecParametersInner object if successful.
+     */
+    public VpnClientIPsecParametersInner getVpnclientIpsecParameters(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway 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<VpnClientIPsecParametersInner> getVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VpnClientIPsecParametersInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnClientIPsecParametersInner> getVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VpnClientIPsecParametersInner>, VpnClientIPsecParametersInner>() {
+            @Override
+            public VpnClientIPsecParametersInner call(ServiceResponse<VpnClientIPsecParametersInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnClientIPsecParametersInner>> getVpnclientIpsecParametersWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getVpnclientIpsecParameters(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnClientIPsecParametersInner>() { }.getType());
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway 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 VpnClientIPsecParametersInner object if successful.
+     */
+    public VpnClientIPsecParametersInner beginGetVpnclientIpsecParameters(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway 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<VpnClientIPsecParametersInner> beginGetVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VpnClientIPsecParametersInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientIPsecParametersInner object
+     */
+    public Observable<VpnClientIPsecParametersInner> beginGetVpnclientIpsecParametersAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnclientIpsecParametersWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VpnClientIPsecParametersInner>, VpnClientIPsecParametersInner>() {
+            @Override
+            public VpnClientIPsecParametersInner call(ServiceResponse<VpnClientIPsecParametersInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * The Get VpnclientIpsecParameters operation retrieves information about the vpnclient ipsec policy for P2S client of virtual network gateway in the specified resource group through Network resource provider.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The virtual network gateway name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientIPsecParametersInner object
+     */
+    public Observable<ServiceResponse<VpnClientIPsecParametersInner>> beginGetVpnclientIpsecParametersWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetVpnclientIpsecParameters(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnClientIPsecParametersInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnClientIPsecParametersInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnClientIPsecParametersInner> clientResponse = beginGetVpnclientIpsecParametersDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnClientIPsecParametersInner> beginGetVpnclientIpsecParametersDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnClientIPsecParametersInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnClientIPsecParametersInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a xml format representation for vpn device configuration script.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection for which the configuration script is generated.
+     * @param parameters Parameters supplied to the generate vpn device script 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 String object if successful.
+     */
+    public String vpnDeviceConfigurationScript(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
+        return vpnDeviceConfigurationScriptWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a xml format representation for vpn device configuration script.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection for which the configuration script is generated.
+     * @param parameters Parameters supplied to the generate vpn device script operation.
+     * @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<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(vpnDeviceConfigurationScriptWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Gets a xml format representation for vpn device configuration script.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection for which the configuration script is generated.
+     * @param parameters Parameters supplied to the generate vpn device script operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
+        return vpnDeviceConfigurationScriptWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a xml format representation for vpn device configuration script.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayConnectionName The name of the virtual network gateway connection for which the configuration script is generated.
+     * @param parameters Parameters supplied to the generate vpn device script operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> vpnDeviceConfigurationScriptWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayConnectionName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayConnectionName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.vpnDeviceConfigurationScript(resourceGroupName, virtualNetworkGatewayConnectionName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = vpnDeviceConfigurationScriptDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> vpnDeviceConfigurationScriptDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String startPacketCapture(String resourceGroupName, String virtualNetworkGatewayName) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> startPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String filterData = null;
+        VpnPacketCaptureStartParameters parameters = new VpnPacketCaptureStartParameters();
+        parameters.withFilterData(null);
+        Observable<Response<ResponseBody>> observable = service.startPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String startPacketCapture(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData).toBlocking().last().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @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<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> startPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        return startPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> startPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStartParameters parameters = null;
+        if (filterData != null) {
+            parameters = new VpnPacketCaptureStartParameters();
+            parameters.withFilterData(filterData);
+        }
+        Observable<Response<ResponseBody>> observable = service.startPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStartPacketCapture(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStartPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String filterData = null;
+        VpnPacketCaptureStartParameters parameters = new VpnPacketCaptureStartParameters();
+        parameters.withFilterData(null);
+        return service.beginStartPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStartPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStartPacketCapture(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData).toBlocking().single().body();
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @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<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData), serviceCallback);
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStartPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        return beginStartPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, filterData).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Starts packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param filterData Start Packet capture parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStartPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String filterData) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStartParameters parameters = null;
+        if (filterData != null) {
+            parameters = new VpnPacketCaptureStartParameters();
+            parameters.withFilterData(filterData);
+        }
+        return service.beginStartPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStartPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginStartPacketCaptureDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String stopPacketCapture(String resourceGroupName, String virtualNetworkGatewayName) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> stopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String sasUrl = null;
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(null);
+        Observable<Response<ResponseBody>> observable = service.stopPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String stopPacketCapture(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl).toBlocking().last().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @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<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<String> stopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        return stopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<String>> stopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(sasUrl);
+        Observable<Response<ResponseBody>> observable = service.stopPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<String>() { }.getType());
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStopPacketCapture(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String sasUrl = null;
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(null);
+        return service.beginStopPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStopPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the String object if successful.
+     */
+    public String beginStopPacketCapture(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl).toBlocking().single().body();
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @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<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl, final ServiceCallback<String> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<String> beginStopPacketCaptureAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        return beginStopPacketCaptureWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, sasUrl).map(new Func1<ServiceResponse<String>, String>() {
+            @Override
+            public String call(ServiceResponse<String> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Stops packet capture on virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param sasUrl SAS url for packet capture on virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the String object
+     */
+    public Observable<ServiceResponse<String>> beginStopPacketCaptureWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        VpnPacketCaptureStopParameters parameters = new VpnPacketCaptureStopParameters();
+        parameters.withSasUrl(sasUrl);
+        return service.beginStopPacketCapture(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+                @Override
+                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<String> clientResponse = beginStopPacketCaptureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<String> beginStopPacketCaptureDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<String, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<String>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VpnClientConnectionHealthDetailListResultInner object if successful.
+     */
+    public VpnClientConnectionHealthDetailListResultInner getVpnclientConnectionHealth(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VpnClientConnectionHealthDetailListResultInner> getVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VpnClientConnectionHealthDetailListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnClientConnectionHealthDetailListResultInner> getVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return getVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>, VpnClientConnectionHealthDetailListResultInner>() {
+            @Override
+            public VpnClientConnectionHealthDetailListResultInner call(ServiceResponse<VpnClientConnectionHealthDetailListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>> getVpnclientConnectionHealthWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.getVpnclientConnectionHealth(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnClientConnectionHealthDetailListResultInner>() { }.getType());
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 VpnClientConnectionHealthDetailListResultInner object if successful.
+     */
+    public VpnClientConnectionHealthDetailListResultInner beginGetVpnclientConnectionHealth(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<VpnClientConnectionHealthDetailListResultInner> beginGetVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<VpnClientConnectionHealthDetailListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientConnectionHealthDetailListResultInner object
+     */
+    public Observable<VpnClientConnectionHealthDetailListResultInner> beginGetVpnclientConnectionHealthAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginGetVpnclientConnectionHealthWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>, VpnClientConnectionHealthDetailListResultInner>() {
+            @Override
+            public VpnClientConnectionHealthDetailListResultInner call(ServiceResponse<VpnClientConnectionHealthDetailListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get VPN client connection health detail per P2S client connection of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnClientConnectionHealthDetailListResultInner object
+     */
+    public Observable<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>> beginGetVpnclientConnectionHealthWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginGetVpnclientConnectionHealth(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnClientConnectionHealthDetailListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnClientConnectionHealthDetailListResultInner> clientResponse = beginGetVpnclientConnectionHealthDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnClientConnectionHealthDetailListResultInner> beginGetVpnclientConnectionHealthDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnClientConnectionHealthDetailListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnClientConnectionHealthDetailListResultInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 disconnectVirtualNetworkGatewayVpnConnections(String resourceGroupName, String virtualNetworkGatewayName) {
+        disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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> disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        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 (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String vpnConnectionIdsConverted = null;
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(null);
+        Observable<Response<ResponseBody>> observable = service.disconnectVirtualNetworkGatewayVpnConnections(this.client.subscriptionId(), resourceGroupName, virtualNetworkGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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 disconnectVirtualNetworkGatewayVpnConnections(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds).toBlocking().last().body();
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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> disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds), serviceCallback);
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> disconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        return disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> disconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        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 (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionIds);
+        final String apiVersion = "2020-04-01";
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(vpnConnectionIds);
+        Observable<Response<ResponseBody>> observable = service.disconnectVirtualNetworkGatewayVpnConnections(this.client.subscriptionId(), resourceGroupName, virtualNetworkGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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 beginDisconnectVirtualNetworkGatewayVpnConnections(String resourceGroupName, String virtualNetworkGatewayName) {
+        beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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> beginDisconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDisconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        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 (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final List<String> vpnConnectionIds = null;
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(null);
+        return service.beginDisconnectVirtualNetworkGatewayVpnConnections(this.client.subscriptionId(), resourceGroupName, virtualNetworkGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDisconnectVirtualNetworkGatewayVpnConnectionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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 beginDisconnectVirtualNetworkGatewayVpnConnections(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds).toBlocking().single().body();
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @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> beginDisconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds), serviceCallback);
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDisconnectVirtualNetworkGatewayVpnConnectionsAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        return beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName, vpnConnectionIds).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Disconnect vpn connections of virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param vpnConnectionIds List of p2s vpn connection Ids.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDisconnectVirtualNetworkGatewayVpnConnectionsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName, List<String> vpnConnectionIds) {
+        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 (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionIds);
+        final String apiVersion = "2020-04-01";
+        P2SVpnConnectionRequest request = new P2SVpnConnectionRequest();
+        request.withVpnConnectionIds(vpnConnectionIds);
+        return service.beginDisconnectVirtualNetworkGatewayVpnConnections(this.client.subscriptionId(), resourceGroupName, virtualNetworkGatewayName, apiVersion, this.client.acceptLanguage(), request, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDisconnectVirtualNetworkGatewayVpnConnectionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDisconnectVirtualNetworkGatewayVpnConnectionsDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual network gateways by 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;VirtualNetworkGatewayInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual network gateways by 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<VirtualNetworkGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkGatewayInner>> serviceFuture, final ListOperationCallback<VirtualNetworkGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual network gateways by 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;VirtualNetworkGatewayInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayInner>>, Page<VirtualNetworkGatewayInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayInner> call(ServiceResponse<Page<VirtualNetworkGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network gateways by 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;VirtualNetworkGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network gateways by resource group.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> 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<VirtualNetworkGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @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;VirtualNetworkGatewayConnectionListEntityInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkGatewayConnectionListEntityInner> listConnectionsNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> response = listConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkGatewayConnectionListEntityInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkGatewayConnectionListEntityInner> nextPage(String nextPageLink) {
+                return listConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @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<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkGatewayConnectionListEntityInner>> serviceFuture, final ListOperationCallback<VirtualNetworkGatewayConnectionListEntityInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listConnectionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(String nextPageLink) {
+                    return listConnectionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @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;VirtualNetworkGatewayConnectionListEntityInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsNextAsync(final String nextPageLink) {
+        return listConnectionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>, Page<VirtualNetworkGatewayConnectionListEntityInner>>() {
+                @Override
+                public Page<VirtualNetworkGatewayConnectionListEntityInner> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+     * @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;VirtualNetworkGatewayConnectionListEntityInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> listConnectionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listConnectionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listConnectionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the connections in a virtual network gateway.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkGatewayConnectionListEntityInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> listConnectionsNextSinglePageAsync(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.listConnectionsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> result = listConnectionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkGatewayConnectionListEntityInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>> listConnectionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkGatewayConnectionListEntityInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkImpl.java
new file mode 100644
index 000000000000..d7aaf7d41edf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetwork;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.DhcpOptions;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkBgpCommunities;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.Subnet;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeering;
+
+class VirtualNetworkImpl extends GroupableResourceCoreImpl<VirtualNetwork, VirtualNetworkInner, VirtualNetworkImpl, NetworkManager> implements VirtualNetwork, VirtualNetwork.Definition, VirtualNetwork.Update {
+    VirtualNetworkImpl(String name, VirtualNetworkInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualNetwork> createResourceAsync() {
+        VirtualNetworksInner client = this.manager().inner().virtualNetworks();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetwork> updateResourceAsync() {
+        VirtualNetworksInner client = this.manager().inner().virtualNetworks();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkInner> getInnerAsync() {
+        VirtualNetworksInner client = this.manager().inner().virtualNetworks();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public AddressSpace addressSpace() {
+        return this.inner().addressSpace();
+    }
+
+    @Override
+    public VirtualNetworkBgpCommunities bgpCommunities() {
+        return this.inner().bgpCommunities();
+    }
+
+    @Override
+    public SubResource ddosProtectionPlan() {
+        return this.inner().ddosProtectionPlan();
+    }
+
+    @Override
+    public DhcpOptions dhcpOptions() {
+        return this.inner().dhcpOptions();
+    }
+
+    @Override
+    public Boolean enableDdosProtection() {
+        return this.inner().enableDdosProtection();
+    }
+
+    @Override
+    public Boolean enableVmProtection() {
+        return this.inner().enableVmProtection();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<SubResource> ipAllocations() {
+        return this.inner().ipAllocations();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public List<Subnet> subnets() {
+        List<Subnet> lst = new ArrayList<Subnet>();
+        if (this.inner().subnets() != null) {
+            for (SubnetInner inner : this.inner().subnets()) {
+                lst.add( new SubnetImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<VirtualNetworkPeering> virtualNetworkPeerings() {
+        List<VirtualNetworkPeering> lst = new ArrayList<VirtualNetworkPeering>();
+        if (this.inner().virtualNetworkPeerings() != null) {
+            for (VirtualNetworkPeeringInner inner : this.inner().virtualNetworkPeerings()) {
+                lst.add( new VirtualNetworkPeeringImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public VirtualNetworkImpl withAddressSpace(AddressSpace addressSpace) {
+        this.inner().withAddressSpace(addressSpace);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withBgpCommunities(VirtualNetworkBgpCommunities bgpCommunities) {
+        this.inner().withBgpCommunities(bgpCommunities);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withDdosProtectionPlan(SubResource ddosProtectionPlan) {
+        this.inner().withDdosProtectionPlan(ddosProtectionPlan);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withDhcpOptions(DhcpOptions dhcpOptions) {
+        this.inner().withDhcpOptions(dhcpOptions);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withEnableDdosProtection(Boolean enableDdosProtection) {
+        this.inner().withEnableDdosProtection(enableDdosProtection);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withEnableVmProtection(Boolean enableVmProtection) {
+        this.inner().withEnableVmProtection(enableVmProtection);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withIpAllocations(List<SubResource> ipAllocations) {
+        this.inner().withIpAllocations(ipAllocations);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withSubnets(List<SubnetInner> subnets) {
+        this.inner().withSubnets(subnets);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkImpl withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings) {
+        this.inner().withVirtualNetworkPeerings(virtualNetworkPeerings);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkInner.java
new file mode 100644
index 000000000000..3a9ce07dabd8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkInner.java
@@ -0,0 +1,340 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.DhcpOptions;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkBgpCommunities;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Virtual Network resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualNetworkInner extends Resource {
+    /**
+     * The AddressSpace that contains an array of IP address ranges that can be
+     * used by subnets.
+     */
+    @JsonProperty(value = "properties.addressSpace")
+    private AddressSpace addressSpace;
+
+    /**
+     * The dhcpOptions that contains an array of DNS servers available to VMs
+     * deployed in the virtual network.
+     */
+    @JsonProperty(value = "properties.dhcpOptions")
+    private DhcpOptions dhcpOptions;
+
+    /**
+     * A list of subnets in a Virtual Network.
+     */
+    @JsonProperty(value = "properties.subnets")
+    private List<SubnetInner> subnets;
+
+    /**
+     * A list of peerings in a Virtual Network.
+     */
+    @JsonProperty(value = "properties.virtualNetworkPeerings")
+    private List<VirtualNetworkPeeringInner> virtualNetworkPeerings;
+
+    /**
+     * The resourceGuid property of the Virtual Network resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the virtual network resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Indicates if DDoS protection is enabled for all the protected resources
+     * in the virtual network. It requires a DDoS protection plan associated
+     * with the resource.
+     */
+    @JsonProperty(value = "properties.enableDdosProtection")
+    private Boolean enableDdosProtection;
+
+    /**
+     * Indicates if VM protection is enabled for all the subnets in the virtual
+     * network.
+     */
+    @JsonProperty(value = "properties.enableVmProtection")
+    private Boolean enableVmProtection;
+
+    /**
+     * The DDoS protection plan associated with the virtual network.
+     */
+    @JsonProperty(value = "properties.ddosProtectionPlan")
+    private SubResource ddosProtectionPlan;
+
+    /**
+     * Bgp Communities sent over ExpressRoute with each route corresponding to
+     * a prefix in this VNET.
+     */
+    @JsonProperty(value = "properties.bgpCommunities")
+    private VirtualNetworkBgpCommunities bgpCommunities;
+
+    /**
+     * Array of IpAllocation which reference this VNET.
+     */
+    @JsonProperty(value = "properties.ipAllocations")
+    private List<SubResource> ipAllocations;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the AddressSpace that contains an array of IP address ranges that can be used by subnets.
+     *
+     * @return the addressSpace value
+     */
+    public AddressSpace addressSpace() {
+        return this.addressSpace;
+    }
+
+    /**
+     * Set the AddressSpace that contains an array of IP address ranges that can be used by subnets.
+     *
+     * @param addressSpace the addressSpace value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withAddressSpace(AddressSpace addressSpace) {
+        this.addressSpace = addressSpace;
+        return this;
+    }
+
+    /**
+     * Get the dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network.
+     *
+     * @return the dhcpOptions value
+     */
+    public DhcpOptions dhcpOptions() {
+        return this.dhcpOptions;
+    }
+
+    /**
+     * Set the dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network.
+     *
+     * @param dhcpOptions the dhcpOptions value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withDhcpOptions(DhcpOptions dhcpOptions) {
+        this.dhcpOptions = dhcpOptions;
+        return this;
+    }
+
+    /**
+     * Get a list of subnets in a Virtual Network.
+     *
+     * @return the subnets value
+     */
+    public List<SubnetInner> subnets() {
+        return this.subnets;
+    }
+
+    /**
+     * Set a list of subnets in a Virtual Network.
+     *
+     * @param subnets the subnets value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withSubnets(List<SubnetInner> subnets) {
+        this.subnets = subnets;
+        return this;
+    }
+
+    /**
+     * Get a list of peerings in a Virtual Network.
+     *
+     * @return the virtualNetworkPeerings value
+     */
+    public List<VirtualNetworkPeeringInner> virtualNetworkPeerings() {
+        return this.virtualNetworkPeerings;
+    }
+
+    /**
+     * Set a list of peerings in a Virtual Network.
+     *
+     * @param virtualNetworkPeerings the virtualNetworkPeerings value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings) {
+        this.virtualNetworkPeerings = virtualNetworkPeerings;
+        return this;
+    }
+
+    /**
+     * Get the resourceGuid property of the Virtual Network resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource.
+     *
+     * @return the enableDdosProtection value
+     */
+    public Boolean enableDdosProtection() {
+        return this.enableDdosProtection;
+    }
+
+    /**
+     * Set indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource.
+     *
+     * @param enableDdosProtection the enableDdosProtection value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withEnableDdosProtection(Boolean enableDdosProtection) {
+        this.enableDdosProtection = enableDdosProtection;
+        return this;
+    }
+
+    /**
+     * Get indicates if VM protection is enabled for all the subnets in the virtual network.
+     *
+     * @return the enableVmProtection value
+     */
+    public Boolean enableVmProtection() {
+        return this.enableVmProtection;
+    }
+
+    /**
+     * Set indicates if VM protection is enabled for all the subnets in the virtual network.
+     *
+     * @param enableVmProtection the enableVmProtection value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withEnableVmProtection(Boolean enableVmProtection) {
+        this.enableVmProtection = enableVmProtection;
+        return this;
+    }
+
+    /**
+     * Get the DDoS protection plan associated with the virtual network.
+     *
+     * @return the ddosProtectionPlan value
+     */
+    public SubResource ddosProtectionPlan() {
+        return this.ddosProtectionPlan;
+    }
+
+    /**
+     * Set the DDoS protection plan associated with the virtual network.
+     *
+     * @param ddosProtectionPlan the ddosProtectionPlan value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withDdosProtectionPlan(SubResource ddosProtectionPlan) {
+        this.ddosProtectionPlan = ddosProtectionPlan;
+        return this;
+    }
+
+    /**
+     * Get bgp Communities sent over ExpressRoute with each route corresponding to a prefix in this VNET.
+     *
+     * @return the bgpCommunities value
+     */
+    public VirtualNetworkBgpCommunities bgpCommunities() {
+        return this.bgpCommunities;
+    }
+
+    /**
+     * Set bgp Communities sent over ExpressRoute with each route corresponding to a prefix in this VNET.
+     *
+     * @param bgpCommunities the bgpCommunities value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withBgpCommunities(VirtualNetworkBgpCommunities bgpCommunities) {
+        this.bgpCommunities = bgpCommunities;
+        return this;
+    }
+
+    /**
+     * Get array of IpAllocation which reference this VNET.
+     *
+     * @return the ipAllocations value
+     */
+    public List<SubResource> ipAllocations() {
+        return this.ipAllocations;
+    }
+
+    /**
+     * Set array of IpAllocation which reference this VNET.
+     *
+     * @param ipAllocations the ipAllocations value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withIpAllocations(List<SubResource> ipAllocations) {
+        this.ipAllocations = ipAllocations;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkInner object itself.
+     */
+    public VirtualNetworkInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringImpl.java
new file mode 100644
index 000000000000..0e950b057946
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringImpl.java
@@ -0,0 +1,192 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeering;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualNetworkPeeringImpl extends CreatableUpdatableImpl<VirtualNetworkPeering, VirtualNetworkPeeringInner, VirtualNetworkPeeringImpl> implements VirtualNetworkPeering, VirtualNetworkPeering.Definition, VirtualNetworkPeering.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualNetworkName;
+    private String virtualNetworkPeeringName;
+
+    VirtualNetworkPeeringImpl(String name, NetworkManager manager) {
+        super(name, new VirtualNetworkPeeringInner());
+        this.manager = manager;
+        // Set resource name
+        this.virtualNetworkPeeringName = name;
+        //
+    }
+
+    VirtualNetworkPeeringImpl(VirtualNetworkPeeringInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.virtualNetworkPeeringName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualNetworkName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworks");
+        this.virtualNetworkPeeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworkPeerings");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VirtualNetworkPeering> createResourceAsync() {
+        VirtualNetworkPeeringsInner client = this.manager().inner().virtualNetworkPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualNetworkName, this.virtualNetworkPeeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetworkPeering> updateResourceAsync() {
+        VirtualNetworkPeeringsInner client = this.manager().inner().virtualNetworkPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualNetworkName, this.virtualNetworkPeeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkPeeringInner> getInnerAsync() {
+        VirtualNetworkPeeringsInner client = this.manager().inner().virtualNetworkPeerings();
+        return client.getAsync(this.resourceGroupName, this.virtualNetworkName, this.virtualNetworkPeeringName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean allowForwardedTraffic() {
+        return this.inner().allowForwardedTraffic();
+    }
+
+    @Override
+    public Boolean allowGatewayTransit() {
+        return this.inner().allowGatewayTransit();
+    }
+
+    @Override
+    public Boolean allowVirtualNetworkAccess() {
+        return this.inner().allowVirtualNetworkAccess();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public VirtualNetworkPeeringState peeringState() {
+        return this.inner().peeringState();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public AddressSpace remoteAddressSpace() {
+        return this.inner().remoteAddressSpace();
+    }
+
+    @Override
+    public SubResource remoteVirtualNetwork() {
+        return this.inner().remoteVirtualNetwork();
+    }
+
+    @Override
+    public Boolean useRemoteGateways() {
+        return this.inner().useRemoteGateways();
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName) {
+        this.resourceGroupName = resourceGroupName;
+        this.virtualNetworkName = virtualNetworkName;
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withAllowForwardedTraffic(Boolean allowForwardedTraffic) {
+        this.inner().withAllowForwardedTraffic(allowForwardedTraffic);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withAllowGatewayTransit(Boolean allowGatewayTransit) {
+        this.inner().withAllowGatewayTransit(allowGatewayTransit);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess) {
+        this.inner().withAllowVirtualNetworkAccess(allowVirtualNetworkAccess);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withPeeringState(VirtualNetworkPeeringState peeringState) {
+        this.inner().withPeeringState(peeringState);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withRemoteAddressSpace(AddressSpace remoteAddressSpace) {
+        this.inner().withRemoteAddressSpace(remoteAddressSpace);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withRemoteVirtualNetwork(SubResource remoteVirtualNetwork) {
+        this.inner().withRemoteVirtualNetwork(remoteVirtualNetwork);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl withUseRemoteGateways(Boolean useRemoteGateways) {
+        this.inner().withUseRemoteGateways(useRemoteGateways);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringInner.java
new file mode 100644
index 000000000000..8af2fedaa7d7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringInner.java
@@ -0,0 +1,274 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeeringState;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Peerings in a virtual network resource.
+ */
+@JsonFlatten
+public class VirtualNetworkPeeringInner extends SubResource {
+    /**
+     * Whether the VMs in the local virtual network space would be able to
+     * access the VMs in remote virtual network space.
+     */
+    @JsonProperty(value = "properties.allowVirtualNetworkAccess")
+    private Boolean allowVirtualNetworkAccess;
+
+    /**
+     * Whether the forwarded traffic from the VMs in the local virtual network
+     * will be allowed/disallowed in remote virtual network.
+     */
+    @JsonProperty(value = "properties.allowForwardedTraffic")
+    private Boolean allowForwardedTraffic;
+
+    /**
+     * If gateway links can be used in remote virtual networking to link to
+     * this virtual network.
+     */
+    @JsonProperty(value = "properties.allowGatewayTransit")
+    private Boolean allowGatewayTransit;
+
+    /**
+     * If remote gateways can be used on this virtual network. If the flag is
+     * set to true, and allowGatewayTransit on remote peering is also true,
+     * virtual network will use gateways of remote virtual network for transit.
+     * Only one peering can have this flag set to true. This flag cannot be set
+     * if virtual network already has a gateway.
+     */
+    @JsonProperty(value = "properties.useRemoteGateways")
+    private Boolean useRemoteGateways;
+
+    /**
+     * The reference to the remote virtual network. The remote virtual network
+     * can be in the same or different region (preview). See here to register
+     * for the preview and learn more
+     * (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering).
+     */
+    @JsonProperty(value = "properties.remoteVirtualNetwork")
+    private SubResource remoteVirtualNetwork;
+
+    /**
+     * The reference to the remote virtual network address space.
+     */
+    @JsonProperty(value = "properties.remoteAddressSpace")
+    private AddressSpace remoteAddressSpace;
+
+    /**
+     * The status of the virtual network peering. Possible values include:
+     * 'Initiated', 'Connected', 'Disconnected'.
+     */
+    @JsonProperty(value = "properties.peeringState")
+    private VirtualNetworkPeeringState peeringState;
+
+    /**
+     * The provisioning state of the virtual network peering resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+     *
+     * @return the allowVirtualNetworkAccess value
+     */
+    public Boolean allowVirtualNetworkAccess() {
+        return this.allowVirtualNetworkAccess;
+    }
+
+    /**
+     * Set whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+     *
+     * @param allowVirtualNetworkAccess the allowVirtualNetworkAccess value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess) {
+        this.allowVirtualNetworkAccess = allowVirtualNetworkAccess;
+        return this;
+    }
+
+    /**
+     * Get whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+     *
+     * @return the allowForwardedTraffic value
+     */
+    public Boolean allowForwardedTraffic() {
+        return this.allowForwardedTraffic;
+    }
+
+    /**
+     * Set whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+     *
+     * @param allowForwardedTraffic the allowForwardedTraffic value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withAllowForwardedTraffic(Boolean allowForwardedTraffic) {
+        this.allowForwardedTraffic = allowForwardedTraffic;
+        return this;
+    }
+
+    /**
+     * Get if gateway links can be used in remote virtual networking to link to this virtual network.
+     *
+     * @return the allowGatewayTransit value
+     */
+    public Boolean allowGatewayTransit() {
+        return this.allowGatewayTransit;
+    }
+
+    /**
+     * Set if gateway links can be used in remote virtual networking to link to this virtual network.
+     *
+     * @param allowGatewayTransit the allowGatewayTransit value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withAllowGatewayTransit(Boolean allowGatewayTransit) {
+        this.allowGatewayTransit = allowGatewayTransit;
+        return this;
+    }
+
+    /**
+     * Get if remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+     *
+     * @return the useRemoteGateways value
+     */
+    public Boolean useRemoteGateways() {
+        return this.useRemoteGateways;
+    }
+
+    /**
+     * Set if remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+     *
+     * @param useRemoteGateways the useRemoteGateways value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withUseRemoteGateways(Boolean useRemoteGateways) {
+        this.useRemoteGateways = useRemoteGateways;
+        return this;
+    }
+
+    /**
+     * Get the reference to the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering).
+     *
+     * @return the remoteVirtualNetwork value
+     */
+    public SubResource remoteVirtualNetwork() {
+        return this.remoteVirtualNetwork;
+    }
+
+    /**
+     * Set the reference to the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering).
+     *
+     * @param remoteVirtualNetwork the remoteVirtualNetwork value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withRemoteVirtualNetwork(SubResource remoteVirtualNetwork) {
+        this.remoteVirtualNetwork = remoteVirtualNetwork;
+        return this;
+    }
+
+    /**
+     * Get the reference to the remote virtual network address space.
+     *
+     * @return the remoteAddressSpace value
+     */
+    public AddressSpace remoteAddressSpace() {
+        return this.remoteAddressSpace;
+    }
+
+    /**
+     * Set the reference to the remote virtual network address space.
+     *
+     * @param remoteAddressSpace the remoteAddressSpace value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withRemoteAddressSpace(AddressSpace remoteAddressSpace) {
+        this.remoteAddressSpace = remoteAddressSpace;
+        return this;
+    }
+
+    /**
+     * Get the status of the virtual network peering. Possible values include: 'Initiated', 'Connected', 'Disconnected'.
+     *
+     * @return the peeringState value
+     */
+    public VirtualNetworkPeeringState peeringState() {
+        return this.peeringState;
+    }
+
+    /**
+     * Set the status of the virtual network peering. Possible values include: 'Initiated', 'Connected', 'Disconnected'.
+     *
+     * @param peeringState the peeringState value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withPeeringState(VirtualNetworkPeeringState peeringState) {
+        this.peeringState = peeringState;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network peering resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VirtualNetworkPeeringInner object itself.
+     */
+    public VirtualNetworkPeeringInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsImpl.java
new file mode 100644
index 000000000000..c56f3ccfa5bc
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeerings;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeering;
+
+class VirtualNetworkPeeringsImpl extends WrapperImpl<VirtualNetworkPeeringsInner> implements VirtualNetworkPeerings {
+    private final NetworkManager manager;
+
+    VirtualNetworkPeeringsImpl(NetworkManager manager) {
+        super(manager.inner().virtualNetworkPeerings());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public VirtualNetworkPeeringImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private VirtualNetworkPeeringImpl wrapModel(VirtualNetworkPeeringInner inner) {
+        return  new VirtualNetworkPeeringImpl(inner, manager());
+    }
+
+    private VirtualNetworkPeeringImpl wrapModel(String name) {
+        return new VirtualNetworkPeeringImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<VirtualNetworkPeering> listAsync(final String resourceGroupName, final String virtualNetworkName) {
+        VirtualNetworkPeeringsInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualNetworkName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkPeeringInner>, Iterable<VirtualNetworkPeeringInner>>() {
+            @Override
+            public Iterable<VirtualNetworkPeeringInner> call(Page<VirtualNetworkPeeringInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkPeeringInner, VirtualNetworkPeering>() {
+            @Override
+            public VirtualNetworkPeering call(VirtualNetworkPeeringInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualNetworkPeering> getAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        VirtualNetworkPeeringsInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
+        .flatMap(new Func1<VirtualNetworkPeeringInner, Observable<VirtualNetworkPeering>>() {
+            @Override
+            public Observable<VirtualNetworkPeering> call(VirtualNetworkPeeringInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualNetworkPeering)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        VirtualNetworkPeeringsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsInner.java
new file mode 100644
index 000000000000..7eac9d347eae
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkPeeringsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 VirtualNetworkPeerings.
+ */
+public class VirtualNetworkPeeringsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualNetworkPeeringsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualNetworkPeeringsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualNetworkPeeringsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualNetworkPeeringsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualNetworkPeerings to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualNetworkPeeringsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkPeerings delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("virtualNetworkPeeringName") String virtualNetworkPeeringName, @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.network.v2020_04_01.VirtualNetworkPeerings beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("virtualNetworkPeeringName") String virtualNetworkPeeringName, @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.network.v2020_04_01.VirtualNetworkPeerings get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("virtualNetworkPeeringName") String virtualNetworkPeeringName, @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.network.v2020_04_01.VirtualNetworkPeerings createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("virtualNetworkPeeringName") String virtualNetworkPeeringName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkPeeringInner virtualNetworkPeeringParameters, @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.network.v2020_04_01.VirtualNetworkPeerings beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("virtualNetworkPeeringName") String virtualNetworkPeeringName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkPeeringInner virtualNetworkPeeringParameters, @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.network.v2020_04_01.VirtualNetworkPeerings list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @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.network.v2020_04_01.VirtualNetworkPeerings listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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 virtualNetworkName, String virtualNetworkPeeringName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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 virtualNetworkName, String virtualNetworkPeeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (virtualNetworkPeeringName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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 virtualNetworkName, String virtualNetworkPeeringName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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 virtualNetworkName, String virtualNetworkPeeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (virtualNetworkPeeringName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, this.client.subscriptionId(), 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 specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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 VirtualNetworkPeeringInner object if successful.
+     */
+    public VirtualNetworkPeeringInner get(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @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<VirtualNetworkPeeringInner> getAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, final ServiceCallback<VirtualNetworkPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkPeeringInner object
+     */
+    public Observable<VirtualNetworkPeeringInner> getAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName).map(new Func1<ServiceResponse<VirtualNetworkPeeringInner>, VirtualNetworkPeeringInner>() {
+            @Override
+            public VirtualNetworkPeeringInner call(ServiceResponse<VirtualNetworkPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified virtual network peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the virtual network peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkPeeringInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkPeeringInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (virtualNetworkPeeringName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkPeeringInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkPeeringInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering 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 VirtualNetworkPeeringInner object if successful.
+     */
+    public VirtualNetworkPeeringInner createOrUpdate(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @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<VirtualNetworkPeeringInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters, final ServiceCallback<VirtualNetworkPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkPeeringInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters).map(new Func1<ServiceResponse<VirtualNetworkPeeringInner>, VirtualNetworkPeeringInner>() {
+            @Override
+            public VirtualNetworkPeeringInner call(ServiceResponse<VirtualNetworkPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkPeeringInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (virtualNetworkPeeringName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringName 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 (virtualNetworkPeeringParameters == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringParameters is required and cannot be null.");
+        }
+        Validator.validate(virtualNetworkPeeringParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, this.client.subscriptionId(), virtualNetworkPeeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkPeeringInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering 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 VirtualNetworkPeeringInner object if successful.
+     */
+    public VirtualNetworkPeeringInner beginCreateOrUpdate(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @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<VirtualNetworkPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters, final ServiceCallback<VirtualNetworkPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkPeeringInner object
+     */
+    public Observable<VirtualNetworkPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters).map(new Func1<ServiceResponse<VirtualNetworkPeeringInner>, VirtualNetworkPeeringInner>() {
+            @Override
+            public VirtualNetworkPeeringInner call(ServiceResponse<VirtualNetworkPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a peering in the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param virtualNetworkPeeringName The name of the peering.
+     * @param virtualNetworkPeeringParameters Parameters supplied to the create or update virtual network peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkPeeringInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkPeeringInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String virtualNetworkPeeringName, VirtualNetworkPeeringInner virtualNetworkPeeringParameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (virtualNetworkPeeringName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringName 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 (virtualNetworkPeeringParameters == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkPeeringParameters is required and cannot be null.");
+        }
+        Validator.validate(virtualNetworkPeeringParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, this.client.subscriptionId(), virtualNetworkPeeringParameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkPeeringInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkPeeringInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkPeeringInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkPeeringInner>() { }.getType())
+                .register(201, new TypeToken<VirtualNetworkPeeringInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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;VirtualNetworkPeeringInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkPeeringInner> list(final String resourceGroupName, final String virtualNetworkName) {
+        ServiceResponse<Page<VirtualNetworkPeeringInner>> response = listSinglePageAsync(resourceGroupName, virtualNetworkName).toBlocking().single();
+        return new PagedList<VirtualNetworkPeeringInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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<VirtualNetworkPeeringInner>> listAsync(final String resourceGroupName, final String virtualNetworkName, final ListOperationCallback<VirtualNetworkPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualNetworkName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkPeeringInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkPeeringInner>> listAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualNetworkName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkPeeringInner>>, Page<VirtualNetworkPeeringInner>>() {
+                @Override
+                public Page<VirtualNetworkPeeringInner> call(ServiceResponse<Page<VirtualNetworkPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listSinglePageAsync(resourceGroupName, virtualNetworkName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkPeeringInner>>, Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(ServiceResponse<Page<VirtualNetworkPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> listSinglePageAsync(final String resourceGroupName, final String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @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;VirtualNetworkPeeringInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkPeeringInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkPeeringInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkPeeringInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @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<VirtualNetworkPeeringInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkPeeringInner>> serviceFuture, final ListOperationCallback<VirtualNetworkPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @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;VirtualNetworkPeeringInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkPeeringInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkPeeringInner>>, Page<VirtualNetworkPeeringInner>>() {
+                @Override
+                public Page<VirtualNetworkPeeringInner> call(ServiceResponse<Page<VirtualNetworkPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+     * @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;VirtualNetworkPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkPeeringInner>>, Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(ServiceResponse<Page<VirtualNetworkPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual network peerings in a virtual network.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> 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<VirtualNetworkPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkPeeringInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkPeeringInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkPeeringInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapImpl.java
new file mode 100644
index 000000000000..f2e39c311261
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTap;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.FrontendIPConfiguration;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualMachineScaleSetNetworkInterfaceIPConfiguration;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.NetworkInterfaceTapConfiguration;
+
+class VirtualNetworkTapImpl extends GroupableResourceCoreImpl<VirtualNetworkTap, VirtualNetworkTapInner, VirtualNetworkTapImpl, NetworkManager> implements VirtualNetworkTap, VirtualNetworkTap.Definition, VirtualNetworkTap.Update {
+    VirtualNetworkTapImpl(String name, VirtualNetworkTapInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualNetworkTap> createResourceAsync() {
+        VirtualNetworkTapsInner client = this.manager().inner().virtualNetworkTaps();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetworkTap> updateResourceAsync() {
+        VirtualNetworkTapsInner client = this.manager().inner().virtualNetworkTaps();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkTapInner> getInnerAsync() {
+        VirtualNetworkTapsInner client = this.manager().inner().virtualNetworkTaps();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public FrontendIPConfiguration destinationLoadBalancerFrontEndIPConfiguration() {
+        FrontendIPConfigurationInner inner = this.inner().destinationLoadBalancerFrontEndIPConfiguration();
+        if (inner != null) {
+            return  new FrontendIPConfigurationImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public VirtualMachineScaleSetNetworkInterfaceIPConfiguration destinationNetworkInterfaceIPConfiguration() {
+        NetworkInterfaceIPConfigurationInner inner = this.inner().destinationNetworkInterfaceIPConfiguration();
+        if (inner != null) {
+            return  new VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(inner, manager());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Integer destinationPort() {
+        return this.inner().destinationPort();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<NetworkInterfaceTapConfiguration> networkInterfaceTapConfigurations() {
+        List<NetworkInterfaceTapConfiguration> lst = new ArrayList<NetworkInterfaceTapConfiguration>();
+        if (this.inner().networkInterfaceTapConfigurations() != null) {
+            for (NetworkInterfaceTapConfigurationInner inner : this.inner().networkInterfaceTapConfigurations()) {
+                lst.add( new NetworkInterfaceTapConfigurationImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String resourceGuid() {
+        return this.inner().resourceGuid();
+    }
+
+    @Override
+    public VirtualNetworkTapImpl withDestinationLoadBalancerFrontEndIPConfiguration(FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration) {
+        this.inner().withDestinationLoadBalancerFrontEndIPConfiguration(destinationLoadBalancerFrontEndIPConfiguration);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkTapImpl withDestinationNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration) {
+        this.inner().withDestinationNetworkInterfaceIPConfiguration(destinationNetworkInterfaceIPConfiguration);
+        return this;
+    }
+
+    @Override
+    public VirtualNetworkTapImpl withDestinationPort(Integer destinationPort) {
+        this.inner().withDestinationPort(destinationPort);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapInner.java
new file mode 100644
index 000000000000..4cd34e3ab601
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapInner.java
@@ -0,0 +1,192 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Virtual Network Tap resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualNetworkTapInner extends Resource {
+    /**
+     * Specifies the list of resource IDs for the network interface IP
+     * configuration that needs to be tapped.
+     */
+    @JsonProperty(value = "properties.networkInterfaceTapConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceTapConfigurationInner> networkInterfaceTapConfigurations;
+
+    /**
+     * The resource GUID property of the virtual network tap resource.
+     */
+    @JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceGuid;
+
+    /**
+     * The provisioning state of the virtual network tap resource. Possible
+     * values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The reference to the private IP Address of the collector nic that will
+     * receive the tap.
+     */
+    @JsonProperty(value = "properties.destinationNetworkInterfaceIPConfiguration")
+    private NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration;
+
+    /**
+     * The reference to the private IP address on the internal Load Balancer
+     * that will receive the tap.
+     */
+    @JsonProperty(value = "properties.destinationLoadBalancerFrontEndIPConfiguration")
+    private FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration;
+
+    /**
+     * The VXLAN destination port that will receive the tapped traffic.
+     */
+    @JsonProperty(value = "properties.destinationPort")
+    private Integer destinationPort;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get specifies the list of resource IDs for the network interface IP configuration that needs to be tapped.
+     *
+     * @return the networkInterfaceTapConfigurations value
+     */
+    public List<NetworkInterfaceTapConfigurationInner> networkInterfaceTapConfigurations() {
+        return this.networkInterfaceTapConfigurations;
+    }
+
+    /**
+     * Get the resource GUID property of the virtual network tap resource.
+     *
+     * @return the resourceGuid value
+     */
+    public String resourceGuid() {
+        return this.resourceGuid;
+    }
+
+    /**
+     * Get the provisioning state of the virtual network tap resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the reference to the private IP Address of the collector nic that will receive the tap.
+     *
+     * @return the destinationNetworkInterfaceIPConfiguration value
+     */
+    public NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration() {
+        return this.destinationNetworkInterfaceIPConfiguration;
+    }
+
+    /**
+     * Set the reference to the private IP Address of the collector nic that will receive the tap.
+     *
+     * @param destinationNetworkInterfaceIPConfiguration the destinationNetworkInterfaceIPConfiguration value to set
+     * @return the VirtualNetworkTapInner object itself.
+     */
+    public VirtualNetworkTapInner withDestinationNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner destinationNetworkInterfaceIPConfiguration) {
+        this.destinationNetworkInterfaceIPConfiguration = destinationNetworkInterfaceIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the reference to the private IP address on the internal Load Balancer that will receive the tap.
+     *
+     * @return the destinationLoadBalancerFrontEndIPConfiguration value
+     */
+    public FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration() {
+        return this.destinationLoadBalancerFrontEndIPConfiguration;
+    }
+
+    /**
+     * Set the reference to the private IP address on the internal Load Balancer that will receive the tap.
+     *
+     * @param destinationLoadBalancerFrontEndIPConfiguration the destinationLoadBalancerFrontEndIPConfiguration value to set
+     * @return the VirtualNetworkTapInner object itself.
+     */
+    public VirtualNetworkTapInner withDestinationLoadBalancerFrontEndIPConfiguration(FrontendIPConfigurationInner destinationLoadBalancerFrontEndIPConfiguration) {
+        this.destinationLoadBalancerFrontEndIPConfiguration = destinationLoadBalancerFrontEndIPConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the VXLAN destination port that will receive the tapped traffic.
+     *
+     * @return the destinationPort value
+     */
+    public Integer destinationPort() {
+        return this.destinationPort;
+    }
+
+    /**
+     * Set the VXLAN destination port that will receive the tapped traffic.
+     *
+     * @param destinationPort the destinationPort value to set
+     * @return the VirtualNetworkTapInner object itself.
+     */
+    public VirtualNetworkTapInner withDestinationPort(Integer destinationPort) {
+        this.destinationPort = destinationPort;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkTapInner object itself.
+     */
+    public VirtualNetworkTapInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsImpl.java
new file mode 100644
index 000000000000..fa55536c2580
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTaps;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTap;
+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;
+
+class VirtualNetworkTapsImpl extends GroupableResourcesCoreImpl<VirtualNetworkTap, VirtualNetworkTapImpl, VirtualNetworkTapInner, VirtualNetworkTapsInner, NetworkManager>  implements VirtualNetworkTaps {
+    protected VirtualNetworkTapsImpl(NetworkManager manager) {
+        super(manager.inner().virtualNetworkTaps(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualNetworkTapInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkTapsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworkTapsInner 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<VirtualNetworkTap> listByResourceGroup(String resourceGroupName) {
+        VirtualNetworkTapsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualNetworkTap> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualNetworkTapsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkTapInner>, Iterable<VirtualNetworkTapInner>>() {
+            @Override
+            public Iterable<VirtualNetworkTapInner> call(Page<VirtualNetworkTapInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkTapInner, VirtualNetworkTap>() {
+            @Override
+            public VirtualNetworkTap call(VirtualNetworkTapInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualNetworkTap> list() {
+        VirtualNetworkTapsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualNetworkTap> listAsync() {
+        VirtualNetworkTapsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualNetworkTapInner>, Iterable<VirtualNetworkTapInner>>() {
+            @Override
+            public Iterable<VirtualNetworkTapInner> call(Page<VirtualNetworkTapInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkTapInner, VirtualNetworkTap>() {
+            @Override
+            public VirtualNetworkTap call(VirtualNetworkTapInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualNetworkTapImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VirtualNetworkTapImpl wrapModel(VirtualNetworkTapInner inner) {
+        return  new VirtualNetworkTapImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualNetworkTapImpl wrapModel(String name) {
+        return new VirtualNetworkTapImpl(name, new VirtualNetworkTapInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsInner.java
new file mode 100644
index 000000000000..5f942e826c04
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkTapsInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VirtualNetworkTaps.
+ */
+public class VirtualNetworkTapsInner implements InnerSupportsGet<VirtualNetworkTapInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VirtualNetworkTapInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualNetworkTapsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualNetworkTapsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualNetworkTapsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualNetworkTapsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualNetworkTaps to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualNetworkTapsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTaps delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @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.network.v2020_04_01.VirtualNetworkTaps beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @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.network.v2020_04_01.VirtualNetworkTaps getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @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.network.v2020_04_01.VirtualNetworkTaps createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkTapInner 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.network.v2020_04_01.VirtualNetworkTaps beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkTapInner 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.network.v2020_04_01.VirtualNetworkTaps updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("tapName") String tapName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject tapParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkTaps list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualNetworkTaps")
+        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.network.v2020_04_01.VirtualNetworkTaps listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps")
+        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.network.v2020_04_01.VirtualNetworkTaps 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.network.v2020_04_01.VirtualNetworkTaps listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @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 tapName) {
+        deleteWithServiceResponseAsync(resourceGroupName, tapName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @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 tapName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, tapName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String tapName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, tapName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String tapName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, tapName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @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 tapName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, tapName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @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 tapName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, tapName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String tapName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, tapName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String tapName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, tapName, this.client.subscriptionId(), 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 information about the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of virtual network tap.
+     * @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 VirtualNetworkTapInner object if successful.
+     */
+    public VirtualNetworkTapInner getByResourceGroup(String resourceGroupName, String tapName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, tapName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets information about the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of virtual network tap.
+     * @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<VirtualNetworkTapInner> getByResourceGroupAsync(String resourceGroupName, String tapName, final ServiceCallback<VirtualNetworkTapInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, tapName), serviceCallback);
+    }
+
+    /**
+     * Gets information about the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<VirtualNetworkTapInner> getByResourceGroupAsync(String resourceGroupName, String tapName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, tapName).map(new Func1<ServiceResponse<VirtualNetworkTapInner>, VirtualNetworkTapInner>() {
+            @Override
+            public VirtualNetworkTapInner call(ServiceResponse<VirtualNetworkTapInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets information about the specified virtual network tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of virtual network tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkTapInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String tapName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, tapName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkTapInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkTapInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkTapInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkTapInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkTapInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkTapInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap 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 VirtualNetworkTapInner object if successful.
+     */
+    public VirtualNetworkTapInner createOrUpdate(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @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<VirtualNetworkTapInner> createOrUpdateAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters, final ServiceCallback<VirtualNetworkTapInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkTapInner> createOrUpdateAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters).map(new Func1<ServiceResponse<VirtualNetworkTapInner>, VirtualNetworkTapInner>() {
+            @Override
+            public VirtualNetworkTapInner call(ServiceResponse<VirtualNetworkTapInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkTapInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, tapName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkTapInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap 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 VirtualNetworkTapInner object if successful.
+     */
+    public VirtualNetworkTapInner beginCreateOrUpdate(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @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<VirtualNetworkTapInner> beginCreateOrUpdateAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters, final ServiceCallback<VirtualNetworkTapInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<VirtualNetworkTapInner> beginCreateOrUpdateAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, tapName, parameters).map(new Func1<ServiceResponse<VirtualNetworkTapInner>, VirtualNetworkTapInner>() {
+            @Override
+            public VirtualNetworkTapInner call(ServiceResponse<VirtualNetworkTapInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a Virtual Network Tap.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the virtual network tap.
+     * @param parameters Parameters supplied to the create or update virtual network tap operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkTapInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String tapName, VirtualNetworkTapInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, tapName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkTapInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkTapInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkTapInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkTapInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkTapInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkTapInner>() { }.getType())
+                .register(201, new TypeToken<VirtualNetworkTapInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @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 VirtualNetworkTapInner object if successful.
+     */
+    public VirtualNetworkTapInner updateTags(String resourceGroupName, String tapName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, tapName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @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<VirtualNetworkTapInner> updateTagsAsync(String resourceGroupName, String tapName, final ServiceCallback<VirtualNetworkTapInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, tapName), serviceCallback);
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<VirtualNetworkTapInner> updateTagsAsync(String resourceGroupName, String tapName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, tapName).map(new Func1<ServiceResponse<VirtualNetworkTapInner>, VirtualNetworkTapInner>() {
+            @Override
+            public VirtualNetworkTapInner call(ServiceResponse<VirtualNetworkTapInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkTapInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String tapName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject tapParameters = new TagsObject();
+        tapParameters.withTags(null);
+        return service.updateTags(resourceGroupName, tapName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), tapParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkTapInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkTapInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkTapInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkTapInner object if successful.
+     */
+    public VirtualNetworkTapInner updateTags(String resourceGroupName, String tapName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, tapName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkTapInner> updateTagsAsync(String resourceGroupName, String tapName, Map<String, String> tags, final ServiceCallback<VirtualNetworkTapInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, tapName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<VirtualNetworkTapInner> updateTagsAsync(String resourceGroupName, String tapName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, tapName, tags).map(new Func1<ServiceResponse<VirtualNetworkTapInner>, VirtualNetworkTapInner>() {
+            @Override
+            public VirtualNetworkTapInner call(ServiceResponse<VirtualNetworkTapInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an VirtualNetworkTap tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param tapName The name of the tap.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkTapInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkTapInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String tapName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (tapName == null) {
+            throw new IllegalArgumentException("Parameter tapName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject tapParameters = new TagsObject();
+        tapParameters.withTags(tags);
+        return service.updateTags(resourceGroupName, tapName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), tapParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkTapInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkTapInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkTapInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkTapInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkTapInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkTapInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a 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;VirtualNetworkTapInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkTapInner> list() {
+        ServiceResponse<Page<VirtualNetworkTapInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VirtualNetworkTapInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkTapInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a 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<VirtualNetworkTapInner>> listAsync(final ListOperationCallback<VirtualNetworkTapInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkTapInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Page<VirtualNetworkTapInner>>() {
+                @Override
+                public Page<VirtualNetworkTapInner> call(ServiceResponse<Page<VirtualNetworkTapInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(ServiceResponse<Page<VirtualNetworkTapInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkTapInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkTapInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkTapInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkTapInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkTapInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkTapInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;VirtualNetworkTapInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkTapInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualNetworkTapInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualNetworkTapInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkTapInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<VirtualNetworkTapInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualNetworkTapInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkTapInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Page<VirtualNetworkTapInner>>() {
+                @Override
+                public Page<VirtualNetworkTapInner> call(ServiceResponse<Page<VirtualNetworkTapInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(ServiceResponse<Page<VirtualNetworkTapInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkTapInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkTapInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkTapInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkTapInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkTapInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkTapInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkTapInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkTapInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkTapInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkTapInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkTapInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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<VirtualNetworkTapInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkTapInner>> serviceFuture, final ListOperationCallback<VirtualNetworkTapInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkTapInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Page<VirtualNetworkTapInner>>() {
+                @Override
+                public Page<VirtualNetworkTapInner> call(ServiceResponse<Page<VirtualNetworkTapInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(ServiceResponse<Page<VirtualNetworkTapInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkTapInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkTapInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> 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<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkTapInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkTapInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkTapInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkTapInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkTapInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkTapInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkTapInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkTapInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkTapInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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<VirtualNetworkTapInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkTapInner>> serviceFuture, final ListOperationCallback<VirtualNetworkTapInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkTapInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Page<VirtualNetworkTapInner>>() {
+                @Override
+                public Page<VirtualNetworkTapInner> call(ServiceResponse<Page<VirtualNetworkTapInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+     * @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;VirtualNetworkTapInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkTapInner>>, Observable<ServiceResponse<Page<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(ServiceResponse<Page<VirtualNetworkTapInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the VirtualNetworkTaps in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkTapInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkTapInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> 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<VirtualNetworkTapInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkTapInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkTapInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkTapInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkTapInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkTapInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkTapInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageImpl.java
new file mode 100644
index 000000000000..12f8464bf976
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkUsage;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkUsageName;
+
+class VirtualNetworkUsageImpl extends WrapperImpl<VirtualNetworkUsageInner> implements VirtualNetworkUsage {
+    private final NetworkManager manager;
+
+    VirtualNetworkUsageImpl(VirtualNetworkUsageInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public Double currentValue() {
+        return this.inner().currentValue();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Double limit() {
+        return this.inner().limit();
+    }
+
+    @Override
+    public VirtualNetworkUsageName name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String unit() {
+        return this.inner().unit();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageInner.java
new file mode 100644
index 000000000000..1eb33896b100
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworkUsageInner.java
@@ -0,0 +1,93 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkUsageName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Usage details for subnet.
+ */
+public class VirtualNetworkUsageInner {
+    /**
+     * Indicates number of IPs used from the Subnet.
+     */
+    @JsonProperty(value = "currentValue", access = JsonProperty.Access.WRITE_ONLY)
+    private Double currentValue;
+
+    /**
+     * Subnet identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Indicates the size of the subnet.
+     */
+    @JsonProperty(value = "limit", access = JsonProperty.Access.WRITE_ONLY)
+    private Double limit;
+
+    /**
+     * The name containing common and localized value for usage.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private VirtualNetworkUsageName name;
+
+    /**
+     * Usage units. Returns 'Count'.
+     */
+    @JsonProperty(value = "unit", access = JsonProperty.Access.WRITE_ONLY)
+    private String unit;
+
+    /**
+     * Get indicates number of IPs used from the Subnet.
+     *
+     * @return the currentValue value
+     */
+    public Double currentValue() {
+        return this.currentValue;
+    }
+
+    /**
+     * Get subnet identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get indicates the size of the subnet.
+     *
+     * @return the limit value
+     */
+    public Double limit() {
+        return this.limit;
+    }
+
+    /**
+     * Get the name containing common and localized value for usage.
+     *
+     * @return the name value
+     */
+    public VirtualNetworkUsageName name() {
+        return this.name;
+    }
+
+    /**
+     * Get usage units. Returns 'Count'.
+     *
+     * @return the unit value
+     */
+    public String unit() {
+        return this.unit;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksImpl.java
new file mode 100644
index 000000000000..f2d84b072944
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworks;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetwork;
+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.network.v2020_04_01.IPAddressAvailabilityResult;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkUsage;
+
+class VirtualNetworksImpl extends GroupableResourcesCoreImpl<VirtualNetwork, VirtualNetworkImpl, VirtualNetworkInner, VirtualNetworksInner, NetworkManager>  implements VirtualNetworks {
+    protected VirtualNetworksImpl(NetworkManager manager) {
+        super(manager.inner().virtualNetworks(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualNetworkInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworksInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualNetworksInner 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<VirtualNetwork> listByResourceGroup(String resourceGroupName) {
+        VirtualNetworksInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualNetwork> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualNetworksInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkInner>, Iterable<VirtualNetworkInner>>() {
+            @Override
+            public Iterable<VirtualNetworkInner> call(Page<VirtualNetworkInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkInner, VirtualNetwork>() {
+            @Override
+            public VirtualNetwork call(VirtualNetworkInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualNetwork> list() {
+        VirtualNetworksInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualNetwork> listAsync() {
+        VirtualNetworksInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualNetworkInner>, Iterable<VirtualNetworkInner>>() {
+            @Override
+            public Iterable<VirtualNetworkInner> call(Page<VirtualNetworkInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkInner, VirtualNetwork>() {
+            @Override
+            public VirtualNetwork call(VirtualNetworkInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualNetworkImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<IPAddressAvailabilityResult> checkIPAddressAvailabilityAsync(String resourceGroupName, String virtualNetworkName, String ipAddress) {
+        VirtualNetworksInner client = this.inner();
+        return client.checkIPAddressAvailabilityAsync(resourceGroupName, virtualNetworkName, ipAddress)
+        .map(new Func1<IPAddressAvailabilityResultInner, IPAddressAvailabilityResult>() {
+            @Override
+            public IPAddressAvailabilityResult call(IPAddressAvailabilityResultInner inner) {
+                return new IPAddressAvailabilityResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected VirtualNetworkImpl wrapModel(VirtualNetworkInner inner) {
+        return  new VirtualNetworkImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualNetworkImpl wrapModel(String name) {
+        return new VirtualNetworkImpl(name, new VirtualNetworkInner(), this.manager());
+    }
+
+    private VirtualNetworkUsageImpl wrapVirtualNetworkUsageModel(VirtualNetworkUsageInner inner) {
+        return  new VirtualNetworkUsageImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VirtualNetworkUsage> listUsageAsync(final String resourceGroupName, final String virtualNetworkName) {
+        VirtualNetworksInner client = this.inner();
+        return client.listUsageAsync(resourceGroupName, virtualNetworkName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkUsageInner>, Iterable<VirtualNetworkUsageInner>>() {
+            @Override
+            public Iterable<VirtualNetworkUsageInner> call(Page<VirtualNetworkUsageInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkUsageInner, VirtualNetworkUsage>() {
+            @Override
+            public VirtualNetworkUsage call(VirtualNetworkUsageInner inner) {
+                return wrapVirtualNetworkUsageModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksInner.java
new file mode 100644
index 000000000000..89a2b9688546
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualNetworksInner.java
@@ -0,0 +1,1543 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VirtualNetworks.
+ */
+public class VirtualNetworksInner implements InnerSupportsGet<VirtualNetworkInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VirtualNetworkInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualNetworksService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualNetworksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualNetworksInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualNetworksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualNetworks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualNetworksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworks delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @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.network.v2020_04_01.VirtualNetworks beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @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.network.v2020_04_01.VirtualNetworks getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.VirtualNetworks createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkInner 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.network.v2020_04_01.VirtualNetworks beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subscriptionId") String subscriptionId, @Body VirtualNetworkInner 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.network.v2020_04_01.VirtualNetworks updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualNetworks list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualNetworks")
+        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.network.v2020_04_01.VirtualNetworks listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks")
+        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.network.v2020_04_01.VirtualNetworks checkIPAddressAvailability" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/CheckIPAddressAvailability")
+        Observable<Response<ResponseBody>> checkIPAddressAvailability(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @Path("subscriptionId") String subscriptionId, @Query("ipAddress") String ipAddress, @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.network.v2020_04_01.VirtualNetworks listUsage" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/usages")
+        Observable<Response<ResponseBody>> listUsage(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkName") String virtualNetworkName, @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.network.v2020_04_01.VirtualNetworks 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.network.v2020_04_01.VirtualNetworks 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.network.v2020_04_01.VirtualNetworks listUsageNext" })
+        @GET
+        Observable<Response<ResponseBody>> listUsageNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 virtualNetworkName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 virtualNetworkName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualNetworkName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 virtualNetworkName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 virtualNetworkName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualNetworkName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualNetworkName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified virtual network.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), 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 specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner getByResourceGroup(String resourceGroupName, String virtualNetworkName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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<VirtualNetworkInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkName, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<VirtualNetworkInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param expand Expands referenced resources.
+     * @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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner getByResourceGroup(String resourceGroupName, String virtualNetworkName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param expand Expands referenced resources.
+     * @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<VirtualNetworkInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkName, String expand, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<VirtualNetworkInner> getByResourceGroupAsync(String resourceGroupName, String virtualNetworkName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualNetworkName, expand).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified virtual network by resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network 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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner createOrUpdate(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @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<VirtualNetworkInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualNetworkInner> createOrUpdateAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualNetworkInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network 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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner beginCreateOrUpdate(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @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<VirtualNetworkInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<VirtualNetworkInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualNetworkName, parameters).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a virtual network in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param parameters Parameters supplied to the create or update virtual network operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, VirtualNetworkInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkInner>() { }.getType())
+                .register(201, new TypeToken<VirtualNetworkInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner updateTags(String resourceGroupName, String virtualNetworkName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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<VirtualNetworkInner> updateTagsAsync(String resourceGroupName, String virtualNetworkName, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<VirtualNetworkInner> updateTagsAsync(String resourceGroupName, String virtualNetworkName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.updateTags(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param tags Resource tags.
+     * @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 VirtualNetworkInner object if successful.
+     */
+    public VirtualNetworkInner updateTags(String resourceGroupName, String virtualNetworkName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param tags Resource tags.
+     * @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<VirtualNetworkInner> updateTagsAsync(String resourceGroupName, String virtualNetworkName, Map<String, String> tags, final ServiceCallback<VirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<VirtualNetworkInner> updateTagsAsync(String resourceGroupName, String virtualNetworkName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualNetworkName, tags).map(new Func1<ServiceResponse<VirtualNetworkInner>, VirtualNetworkInner>() {
+            @Override
+            public VirtualNetworkInner call(ServiceResponse<VirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a virtual network tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, Map<String, String> tags) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.updateTags(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual networks in a 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;VirtualNetworkInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkInner> list() {
+        ServiceResponse<Page<VirtualNetworkInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VirtualNetworkInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual networks in a 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<VirtualNetworkInner>> listAsync(final ListOperationCallback<VirtualNetworkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Page<VirtualNetworkInner>>() {
+                @Override
+                public Page<VirtualNetworkInner> call(ServiceResponse<Page<VirtualNetworkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(ServiceResponse<Page<VirtualNetworkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;VirtualNetworkInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualNetworkInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualNetworkInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<VirtualNetworkInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualNetworkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Page<VirtualNetworkInner>>() {
+                @Override
+                public Page<VirtualNetworkInner> call(ServiceResponse<Page<VirtualNetworkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(ServiceResponse<Page<VirtualNetworkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Checks whether a private IP address is available for use.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param ipAddress The private IP address to be verified.
+     * @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 IPAddressAvailabilityResultInner object if successful.
+     */
+    public IPAddressAvailabilityResultInner checkIPAddressAvailability(String resourceGroupName, String virtualNetworkName, String ipAddress) {
+        return checkIPAddressAvailabilityWithServiceResponseAsync(resourceGroupName, virtualNetworkName, ipAddress).toBlocking().single().body();
+    }
+
+    /**
+     * Checks whether a private IP address is available for use.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param ipAddress The private IP address to be verified.
+     * @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<IPAddressAvailabilityResultInner> checkIPAddressAvailabilityAsync(String resourceGroupName, String virtualNetworkName, String ipAddress, final ServiceCallback<IPAddressAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkIPAddressAvailabilityWithServiceResponseAsync(resourceGroupName, virtualNetworkName, ipAddress), serviceCallback);
+    }
+
+    /**
+     * Checks whether a private IP address is available for use.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param ipAddress The private IP address to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IPAddressAvailabilityResultInner object
+     */
+    public Observable<IPAddressAvailabilityResultInner> checkIPAddressAvailabilityAsync(String resourceGroupName, String virtualNetworkName, String ipAddress) {
+        return checkIPAddressAvailabilityWithServiceResponseAsync(resourceGroupName, virtualNetworkName, ipAddress).map(new Func1<ServiceResponse<IPAddressAvailabilityResultInner>, IPAddressAvailabilityResultInner>() {
+            @Override
+            public IPAddressAvailabilityResultInner call(ServiceResponse<IPAddressAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Checks whether a private IP address is available for use.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @param ipAddress The private IP address to be verified.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IPAddressAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<IPAddressAvailabilityResultInner>> checkIPAddressAvailabilityWithServiceResponseAsync(String resourceGroupName, String virtualNetworkName, String ipAddress) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName 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 (ipAddress == null) {
+            throw new IllegalArgumentException("Parameter ipAddress is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.checkIPAddressAvailability(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), ipAddress, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IPAddressAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IPAddressAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IPAddressAvailabilityResultInner> clientResponse = checkIPAddressAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IPAddressAvailabilityResultInner> checkIPAddressAvailabilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IPAddressAvailabilityResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IPAddressAvailabilityResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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;VirtualNetworkUsageInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkUsageInner> listUsage(final String resourceGroupName, final String virtualNetworkName) {
+        ServiceResponse<Page<VirtualNetworkUsageInner>> response = listUsageSinglePageAsync(resourceGroupName, virtualNetworkName).toBlocking().single();
+        return new PagedList<VirtualNetworkUsageInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkUsageInner> nextPage(String nextPageLink) {
+                return listUsageNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @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<VirtualNetworkUsageInner>> listUsageAsync(final String resourceGroupName, final String virtualNetworkName, final ListOperationCallback<VirtualNetworkUsageInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listUsageSinglePageAsync(resourceGroupName, virtualNetworkName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(String nextPageLink) {
+                    return listUsageNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkUsageInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkUsageInner>> listUsageAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listUsageWithServiceResponseAsync(resourceGroupName, virtualNetworkName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkUsageInner>>, Page<VirtualNetworkUsageInner>>() {
+                @Override
+                public Page<VirtualNetworkUsageInner> call(ServiceResponse<Page<VirtualNetworkUsageInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualNetworkUsageInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> listUsageWithServiceResponseAsync(final String resourceGroupName, final String virtualNetworkName) {
+        return listUsageSinglePageAsync(resourceGroupName, virtualNetworkName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkUsageInner>>, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(ServiceResponse<Page<VirtualNetworkUsageInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listUsageNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists usage stats.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkUsageInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualNetworkUsageInner>> * @param virtualNetworkName The name of the virtual network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkUsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> listUsageSinglePageAsync(final String resourceGroupName, final String virtualNetworkName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listUsage(resourceGroupName, virtualNetworkName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkUsageInner>> result = listUsageDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkUsageInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkUsageInner>> listUsageDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkUsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkUsageInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @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;VirtualNetworkInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @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<VirtualNetworkInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkInner>> serviceFuture, final ListOperationCallback<VirtualNetworkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @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;VirtualNetworkInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Page<VirtualNetworkInner>>() {
+                @Override
+                public Page<VirtualNetworkInner> call(ServiceResponse<Page<VirtualNetworkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+     * @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;VirtualNetworkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(ServiceResponse<Page<VirtualNetworkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> 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<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all virtual networks in 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;VirtualNetworkInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all virtual networks in 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<VirtualNetworkInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkInner>> serviceFuture, final ListOperationCallback<VirtualNetworkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all virtual networks in 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;VirtualNetworkInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Page<VirtualNetworkInner>>() {
+                @Override
+                public Page<VirtualNetworkInner> call(ServiceResponse<Page<VirtualNetworkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in 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;VirtualNetworkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkInner>>, Observable<ServiceResponse<Page<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(ServiceResponse<Page<VirtualNetworkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all virtual networks in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkInner>>> 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<VirtualNetworkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @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;VirtualNetworkUsageInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkUsageInner> listUsageNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkUsageInner>> response = listUsageNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkUsageInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkUsageInner> nextPage(String nextPageLink) {
+                return listUsageNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @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<VirtualNetworkUsageInner>> listUsageNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkUsageInner>> serviceFuture, final ListOperationCallback<VirtualNetworkUsageInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listUsageNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(String nextPageLink) {
+                    return listUsageNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @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;VirtualNetworkUsageInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkUsageInner>> listUsageNextAsync(final String nextPageLink) {
+        return listUsageNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkUsageInner>>, Page<VirtualNetworkUsageInner>>() {
+                @Override
+                public Page<VirtualNetworkUsageInner> call(ServiceResponse<Page<VirtualNetworkUsageInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists usage stats.
+     *
+     * @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;VirtualNetworkUsageInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> listUsageNextWithServiceResponseAsync(final String nextPageLink) {
+        return listUsageNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkUsageInner>>, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(ServiceResponse<Page<VirtualNetworkUsageInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listUsageNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists usage stats.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkUsageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkUsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> listUsageNextSinglePageAsync(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.listUsageNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkUsageInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkUsageInner>> result = listUsageNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkUsageInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkUsageInner>> listUsageNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkUsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkUsageInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterImpl.java
new file mode 100644
index 000000000000..7ad45da5a7af
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouter;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualRouterImpl extends GroupableResourceCoreImpl<VirtualRouter, VirtualRouterInner, VirtualRouterImpl, NetworkManager> implements VirtualRouter, VirtualRouter.Definition, VirtualRouter.Update {
+    VirtualRouterImpl(String name, VirtualRouterInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualRouter> createResourceAsync() {
+        VirtualRoutersInner client = this.manager().inner().virtualRouters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualRouter> updateResourceAsync() {
+        VirtualRoutersInner client = this.manager().inner().virtualRouters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualRouterInner> getInnerAsync() {
+        VirtualRoutersInner client = this.manager().inner().virtualRouters();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public SubResource hostedGateway() {
+        return this.inner().hostedGateway();
+    }
+
+    @Override
+    public SubResource hostedSubnet() {
+        return this.inner().hostedSubnet();
+    }
+
+    @Override
+    public List<SubResource> peerings() {
+        return this.inner().peerings();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public Long virtualRouterAsn() {
+        return this.inner().virtualRouterAsn();
+    }
+
+    @Override
+    public List<String> virtualRouterIps() {
+        return this.inner().virtualRouterIps();
+    }
+
+    @Override
+    public VirtualRouterImpl withHostedGateway(SubResource hostedGateway) {
+        this.inner().withHostedGateway(hostedGateway);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterImpl withHostedSubnet(SubResource hostedSubnet) {
+        this.inner().withHostedSubnet(hostedSubnet);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterImpl withVirtualRouterAsn(Long virtualRouterAsn) {
+        this.inner().withVirtualRouterAsn(virtualRouterAsn);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterImpl withVirtualRouterIps(List<String> virtualRouterIps) {
+        this.inner().withVirtualRouterIps(virtualRouterIps);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterInner.java
new file mode 100644
index 000000000000..521bc6f582cd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterInner.java
@@ -0,0 +1,201 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VirtualRouter Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualRouterInner extends Resource {
+    /**
+     * VirtualRouter ASN.
+     */
+    @JsonProperty(value = "properties.virtualRouterAsn")
+    private Long virtualRouterAsn;
+
+    /**
+     * VirtualRouter IPs.
+     */
+    @JsonProperty(value = "properties.virtualRouterIps")
+    private List<String> virtualRouterIps;
+
+    /**
+     * The Subnet on which VirtualRouter is hosted.
+     */
+    @JsonProperty(value = "properties.hostedSubnet")
+    private SubResource hostedSubnet;
+
+    /**
+     * The Gateway on which VirtualRouter is hosted.
+     */
+    @JsonProperty(value = "properties.hostedGateway")
+    private SubResource hostedGateway;
+
+    /**
+     * List of references to VirtualRouterPeerings.
+     */
+    @JsonProperty(value = "properties.peerings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> peerings;
+
+    /**
+     * The provisioning state of the resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get virtualRouter ASN.
+     *
+     * @return the virtualRouterAsn value
+     */
+    public Long virtualRouterAsn() {
+        return this.virtualRouterAsn;
+    }
+
+    /**
+     * Set virtualRouter ASN.
+     *
+     * @param virtualRouterAsn the virtualRouterAsn value to set
+     * @return the VirtualRouterInner object itself.
+     */
+    public VirtualRouterInner withVirtualRouterAsn(Long virtualRouterAsn) {
+        this.virtualRouterAsn = virtualRouterAsn;
+        return this;
+    }
+
+    /**
+     * Get virtualRouter IPs.
+     *
+     * @return the virtualRouterIps value
+     */
+    public List<String> virtualRouterIps() {
+        return this.virtualRouterIps;
+    }
+
+    /**
+     * Set virtualRouter IPs.
+     *
+     * @param virtualRouterIps the virtualRouterIps value to set
+     * @return the VirtualRouterInner object itself.
+     */
+    public VirtualRouterInner withVirtualRouterIps(List<String> virtualRouterIps) {
+        this.virtualRouterIps = virtualRouterIps;
+        return this;
+    }
+
+    /**
+     * Get the Subnet on which VirtualRouter is hosted.
+     *
+     * @return the hostedSubnet value
+     */
+    public SubResource hostedSubnet() {
+        return this.hostedSubnet;
+    }
+
+    /**
+     * Set the Subnet on which VirtualRouter is hosted.
+     *
+     * @param hostedSubnet the hostedSubnet value to set
+     * @return the VirtualRouterInner object itself.
+     */
+    public VirtualRouterInner withHostedSubnet(SubResource hostedSubnet) {
+        this.hostedSubnet = hostedSubnet;
+        return this;
+    }
+
+    /**
+     * Get the Gateway on which VirtualRouter is hosted.
+     *
+     * @return the hostedGateway value
+     */
+    public SubResource hostedGateway() {
+        return this.hostedGateway;
+    }
+
+    /**
+     * Set the Gateway on which VirtualRouter is hosted.
+     *
+     * @param hostedGateway the hostedGateway value to set
+     * @return the VirtualRouterInner object itself.
+     */
+    public VirtualRouterInner withHostedGateway(SubResource hostedGateway) {
+        this.hostedGateway = hostedGateway;
+        return this;
+    }
+
+    /**
+     * Get list of references to VirtualRouterPeerings.
+     *
+     * @return the peerings value
+     */
+    public List<SubResource> peerings() {
+        return this.peerings;
+    }
+
+    /**
+     * Get the provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualRouterInner object itself.
+     */
+    public VirtualRouterInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringImpl.java
new file mode 100644
index 000000000000..a46b2f569429
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringImpl.java
@@ -0,0 +1,139 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouterPeering;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualRouterPeeringImpl extends CreatableUpdatableImpl<VirtualRouterPeering, VirtualRouterPeeringInner, VirtualRouterPeeringImpl> implements VirtualRouterPeering, VirtualRouterPeering.Definition, VirtualRouterPeering.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String virtualRouterName;
+    private String peeringName;
+
+    VirtualRouterPeeringImpl(String name, NetworkManager manager) {
+        super(name, new VirtualRouterPeeringInner());
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = name;
+        //
+    }
+
+    VirtualRouterPeeringImpl(VirtualRouterPeeringInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.peeringName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.virtualRouterName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualRouters");
+        this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VirtualRouterPeering> createResourceAsync() {
+        VirtualRouterPeeringsInner client = this.manager().inner().virtualRouterPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualRouterName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualRouterPeering> updateResourceAsync() {
+        VirtualRouterPeeringsInner client = this.manager().inner().virtualRouterPeerings();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.virtualRouterName, this.peeringName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualRouterPeeringInner> getInnerAsync() {
+        VirtualRouterPeeringsInner client = this.manager().inner().virtualRouterPeerings();
+        return client.getAsync(this.resourceGroupName, this.virtualRouterName, this.peeringName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long peerAsn() {
+        return this.inner().peerAsn();
+    }
+
+    @Override
+    public String peerIp() {
+        return this.inner().peerIp();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl withExistingVirtualRouter(String resourceGroupName, String virtualRouterName) {
+        this.resourceGroupName = resourceGroupName;
+        this.virtualRouterName = virtualRouterName;
+        return this;
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl withPeerAsn(Long peerAsn) {
+        this.inner().withPeerAsn(peerAsn);
+        return this;
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl withPeerIp(String peerIp) {
+        this.inner().withPeerIp(peerIp);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringInner.java
new file mode 100644
index 000000000000..f20e14877138
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringInner.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Virtual Router Peering resource.
+ */
+@JsonFlatten
+public class VirtualRouterPeeringInner extends SubResource {
+    /**
+     * Peer ASN.
+     */
+    @JsonProperty(value = "properties.peerAsn")
+    private Long peerAsn;
+
+    /**
+     * Peer IP.
+     */
+    @JsonProperty(value = "properties.peerIp")
+    private String peerIp;
+
+    /**
+     * The provisioning state of the resource. Possible values include:
+     * 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Name of the virtual router peering that is unique within a virtual
+     * router.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Peering type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get peer ASN.
+     *
+     * @return the peerAsn value
+     */
+    public Long peerAsn() {
+        return this.peerAsn;
+    }
+
+    /**
+     * Set peer ASN.
+     *
+     * @param peerAsn the peerAsn value to set
+     * @return the VirtualRouterPeeringInner object itself.
+     */
+    public VirtualRouterPeeringInner withPeerAsn(Long peerAsn) {
+        this.peerAsn = peerAsn;
+        return this;
+    }
+
+    /**
+     * Get peer IP.
+     *
+     * @return the peerIp value
+     */
+    public String peerIp() {
+        return this.peerIp;
+    }
+
+    /**
+     * Set peer IP.
+     *
+     * @param peerIp the peerIp value to set
+     * @return the VirtualRouterPeeringInner object itself.
+     */
+    public VirtualRouterPeeringInner withPeerIp(String peerIp) {
+        this.peerIp = peerIp;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get name of the virtual router peering that is unique within a virtual router.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the virtual router peering that is unique within a virtual router.
+     *
+     * @param name the name value to set
+     * @return the VirtualRouterPeeringInner object itself.
+     */
+    public VirtualRouterPeeringInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get peering type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsImpl.java
new file mode 100644
index 000000000000..49f3e8022cda
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouterPeerings;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouterPeering;
+
+class VirtualRouterPeeringsImpl extends WrapperImpl<VirtualRouterPeeringsInner> implements VirtualRouterPeerings {
+    private final NetworkManager manager;
+
+    VirtualRouterPeeringsImpl(NetworkManager manager) {
+        super(manager.inner().virtualRouterPeerings());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public VirtualRouterPeeringImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private VirtualRouterPeeringImpl wrapModel(VirtualRouterPeeringInner inner) {
+        return  new VirtualRouterPeeringImpl(inner, manager());
+    }
+
+    private VirtualRouterPeeringImpl wrapModel(String name) {
+        return new VirtualRouterPeeringImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<VirtualRouterPeering> listAsync(final String resourceGroupName, final String virtualRouterName) {
+        VirtualRouterPeeringsInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualRouterName)
+        .flatMapIterable(new Func1<Page<VirtualRouterPeeringInner>, Iterable<VirtualRouterPeeringInner>>() {
+            @Override
+            public Iterable<VirtualRouterPeeringInner> call(Page<VirtualRouterPeeringInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualRouterPeeringInner, VirtualRouterPeering>() {
+            @Override
+            public VirtualRouterPeering call(VirtualRouterPeeringInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualRouterPeering> getAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        VirtualRouterPeeringsInner client = this.inner();
+        return client.getAsync(resourceGroupName, virtualRouterName, peeringName)
+        .flatMap(new Func1<VirtualRouterPeeringInner, Observable<VirtualRouterPeering>>() {
+            @Override
+            public Observable<VirtualRouterPeering> call(VirtualRouterPeeringInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualRouterPeering)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        VirtualRouterPeeringsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, virtualRouterName, peeringName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsInner.java
new file mode 100644
index 000000000000..a1a7b6dc4041
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRouterPeeringsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.ErrorException;
+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 VirtualRouterPeerings.
+ */
+public class VirtualRouterPeeringsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualRouterPeeringsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualRouterPeeringsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualRouterPeeringsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualRouterPeeringsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualRouterPeerings to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualRouterPeeringsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualRouterPeerings delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.VirtualRouterPeerings beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.VirtualRouterPeerings get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("peeringName") String peeringName, @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.network.v2020_04_01.VirtualRouterPeerings createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body VirtualRouterPeeringInner 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.network.v2020_04_01.VirtualRouterPeerings beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("peeringName") String peeringName, @Path("subscriptionId") String subscriptionId, @Body VirtualRouterPeeringInner 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.network.v2020_04_01.VirtualRouterPeerings list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings")
+        Observable<Response<ResponseBody>> list(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @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.network.v2020_04_01.VirtualRouterPeerings listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualRouterName, String peeringName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @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 virtualRouterName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualRouterName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualRouterName, String peeringName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @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 virtualRouterName, String peeringName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified peering from a Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualRouterName, peeringName, this.client.subscriptionId(), 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterPeeringInner object if successful.
+     */
+    public VirtualRouterPeeringInner get(String resourceGroupName, String virtualRouterName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @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<VirtualRouterPeeringInner> getAsync(String resourceGroupName, String virtualRouterName, String peeringName, final ServiceCallback<VirtualRouterPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterPeeringInner object
+     */
+    public Observable<VirtualRouterPeeringInner> getAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        return getWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName).map(new Func1<ServiceResponse<VirtualRouterPeeringInner>, VirtualRouterPeeringInner>() {
+            @Override
+            public VirtualRouterPeeringInner call(ServiceResponse<VirtualRouterPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterPeeringInner object
+     */
+    public Observable<ServiceResponse<VirtualRouterPeeringInner>> getWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String peeringName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(resourceGroupName, virtualRouterName, peeringName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualRouterPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualRouterPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualRouterPeeringInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualRouterPeeringInner> getDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualRouterPeeringInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualRouterPeeringInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterPeeringInner object if successful.
+     */
+    public VirtualRouterPeeringInner createOrUpdate(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @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<VirtualRouterPeeringInner> createOrUpdateAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters, final ServiceCallback<VirtualRouterPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualRouterPeeringInner> createOrUpdateAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters).map(new Func1<ServiceResponse<VirtualRouterPeeringInner>, VirtualRouterPeeringInner>() {
+            @Override
+            public VirtualRouterPeeringInner call(ServiceResponse<VirtualRouterPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualRouterPeeringInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualRouterName, peeringName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualRouterPeeringInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterPeeringInner object if successful.
+     */
+    public VirtualRouterPeeringInner beginCreateOrUpdate(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @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<VirtualRouterPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters, final ServiceCallback<VirtualRouterPeeringInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterPeeringInner object
+     */
+    public Observable<VirtualRouterPeeringInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, peeringName, parameters).map(new Func1<ServiceResponse<VirtualRouterPeeringInner>, VirtualRouterPeeringInner>() {
+            @Override
+            public VirtualRouterPeeringInner call(ServiceResponse<VirtualRouterPeeringInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router Peering.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param peeringName The name of the Virtual Router Peering.
+     * @param parameters Parameters supplied to the create or update Virtual Router Peering operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterPeeringInner object
+     */
+    public Observable<ServiceResponse<VirtualRouterPeeringInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String peeringName, VirtualRouterPeeringInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (peeringName == null) {
+            throw new IllegalArgumentException("Parameter peeringName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualRouterName, peeringName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualRouterPeeringInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualRouterPeeringInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualRouterPeeringInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualRouterPeeringInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualRouterPeeringInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualRouterPeeringInner>() { }.getType())
+                .register(201, new TypeToken<VirtualRouterPeeringInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterPeeringInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterPeeringInner> list(final String resourceGroupName, final String virtualRouterName) {
+        ServiceResponse<Page<VirtualRouterPeeringInner>> response = listSinglePageAsync(resourceGroupName, virtualRouterName).toBlocking().single();
+        return new PagedList<VirtualRouterPeeringInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @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<VirtualRouterPeeringInner>> listAsync(final String resourceGroupName, final String virtualRouterName, final ListOperationCallback<VirtualRouterPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, virtualRouterName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterPeeringInner&gt; object
+     */
+    public Observable<Page<VirtualRouterPeeringInner>> listAsync(final String resourceGroupName, final String virtualRouterName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualRouterName)
+            .map(new Func1<ServiceResponse<Page<VirtualRouterPeeringInner>>, Page<VirtualRouterPeeringInner>>() {
+                @Override
+                public Page<VirtualRouterPeeringInner> call(ServiceResponse<Page<VirtualRouterPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String virtualRouterName) {
+        return listSinglePageAsync(resourceGroupName, virtualRouterName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterPeeringInner>>, Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(ServiceResponse<Page<VirtualRouterPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+    ServiceResponse<PageImpl<VirtualRouterPeeringInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualRouterPeeringInner>> * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> listSinglePageAsync(final String resourceGroupName, final String virtualRouterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(resourceGroupName, virtualRouterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterPeeringInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterPeeringInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterPeeringInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterPeeringInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterPeeringInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterPeeringInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualRouterPeeringInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualRouterPeeringInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterPeeringInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @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<VirtualRouterPeeringInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualRouterPeeringInner>> serviceFuture, final ListOperationCallback<VirtualRouterPeeringInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @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;VirtualRouterPeeringInner&gt; object
+     */
+    public Observable<Page<VirtualRouterPeeringInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualRouterPeeringInner>>, Page<VirtualRouterPeeringInner>>() {
+                @Override
+                public Page<VirtualRouterPeeringInner> call(ServiceResponse<Page<VirtualRouterPeeringInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+     * @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;VirtualRouterPeeringInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterPeeringInner>>, Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(ServiceResponse<Page<VirtualRouterPeeringInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Router Peerings in a Virtual Router resource.
+     *
+    ServiceResponse<PageImpl<VirtualRouterPeeringInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterPeeringInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> 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<VirtualRouterPeeringInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterPeeringInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterPeeringInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterPeeringInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterPeeringInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterPeeringInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterPeeringInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersImpl.java
new file mode 100644
index 000000000000..119226f9a1b5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouters;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualRouter;
+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;
+
+class VirtualRoutersImpl extends GroupableResourcesCoreImpl<VirtualRouter, VirtualRouterImpl, VirtualRouterInner, VirtualRoutersInner, NetworkManager>  implements VirtualRouters {
+    protected VirtualRoutersImpl(NetworkManager manager) {
+        super(manager.inner().virtualRouters(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualRouterInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualRoutersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualRoutersInner 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<VirtualRouter> listByResourceGroup(String resourceGroupName) {
+        VirtualRoutersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualRouter> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualRoutersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualRouterInner>, Iterable<VirtualRouterInner>>() {
+            @Override
+            public Iterable<VirtualRouterInner> call(Page<VirtualRouterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualRouterInner, VirtualRouter>() {
+            @Override
+            public VirtualRouter call(VirtualRouterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualRouter> list() {
+        VirtualRoutersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualRouter> listAsync() {
+        VirtualRoutersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualRouterInner>, Iterable<VirtualRouterInner>>() {
+            @Override
+            public Iterable<VirtualRouterInner> call(Page<VirtualRouterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualRouterInner, VirtualRouter>() {
+            @Override
+            public VirtualRouter call(VirtualRouterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualRouterImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VirtualRouterImpl wrapModel(VirtualRouterInner inner) {
+        return  new VirtualRouterImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualRouterImpl wrapModel(String name) {
+        return new VirtualRouterImpl(name, new VirtualRouterInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersInner.java
new file mode 100644
index 000000000000..84e7e66f0584
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualRoutersInner.java
@@ -0,0 +1,1030 @@
+/**
+ * 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.network.v2020_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.network.v2020_04_01.ErrorException;
+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 VirtualRouters.
+ */
+public class VirtualRoutersInner implements InnerSupportsGet<VirtualRouterInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VirtualRouterInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualRoutersService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualRoutersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualRoutersInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualRoutersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualRouters to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualRoutersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualRouters delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @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.network.v2020_04_01.VirtualRouters beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @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.network.v2020_04_01.VirtualRouters getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$expand") String expand, @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.network.v2020_04_01.VirtualRouters createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("subscriptionId") String subscriptionId, @Body VirtualRouterInner 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.network.v2020_04_01.VirtualRouters beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("virtualRouterName") String virtualRouterName, @Path("subscriptionId") String subscriptionId, @Body VirtualRouterInner 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.network.v2020_04_01.VirtualRouters listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters")
+        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.network.v2020_04_01.VirtualRouters list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualRouters")
+        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.network.v2020_04_01.VirtualRouters 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.network.v2020_04_01.VirtualRouters listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualRouterName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @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 virtualRouterName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualRouterName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualRouterName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualRouterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, virtualRouterName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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 virtualRouterName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @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 virtualRouterName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualRouterName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualRouterName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualRouterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, virtualRouterName, this.client.subscriptionId(), 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 ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterInner object if successful.
+     */
+    public VirtualRouterInner getByResourceGroup(String resourceGroupName, String virtualRouterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @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<VirtualRouterInner> getByResourceGroupAsync(String resourceGroupName, String virtualRouterName, final ServiceCallback<VirtualRouterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<VirtualRouterInner> getByResourceGroupAsync(String resourceGroupName, String virtualRouterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName).map(new Func1<ServiceResponse<VirtualRouterInner>, VirtualRouterInner>() {
+            @Override
+            public VirtualRouterInner call(ServiceResponse<VirtualRouterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<ServiceResponse<VirtualRouterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualRouterName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final String expand = null;
+        return service.getByResourceGroup(resourceGroupName, virtualRouterName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualRouterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualRouterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualRouterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterInner object if successful.
+     */
+    public VirtualRouterInner getByResourceGroup(String resourceGroupName, String virtualRouterName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param expand Expands referenced resources.
+     * @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<VirtualRouterInner> getByResourceGroupAsync(String resourceGroupName, String virtualRouterName, String expand, final ServiceCallback<VirtualRouterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName, expand), serviceCallback);
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<VirtualRouterInner> getByResourceGroupAsync(String resourceGroupName, String virtualRouterName, String expand) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualRouterName, expand).map(new Func1<ServiceResponse<VirtualRouterInner>, VirtualRouterInner>() {
+            @Override
+            public VirtualRouterInner call(ServiceResponse<VirtualRouterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param expand Expands referenced resources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<ServiceResponse<VirtualRouterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, String expand) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, virtualRouterName, this.client.subscriptionId(), apiVersion, expand, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualRouterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualRouterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualRouterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualRouterInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualRouterInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualRouterInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterInner object if successful.
+     */
+    public VirtualRouterInner createOrUpdate(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @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<VirtualRouterInner> createOrUpdateAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters, final ServiceCallback<VirtualRouterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualRouterInner> createOrUpdateAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters).map(new Func1<ServiceResponse<VirtualRouterInner>, VirtualRouterInner>() {
+            @Override
+            public VirtualRouterInner call(ServiceResponse<VirtualRouterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualRouterInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, virtualRouterName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualRouterInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the VirtualRouterInner object if successful.
+     */
+    public VirtualRouterInner beginCreateOrUpdate(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @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<VirtualRouterInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters, final ServiceCallback<VirtualRouterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<VirtualRouterInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualRouterName, parameters).map(new Func1<ServiceResponse<VirtualRouterInner>, VirtualRouterInner>() {
+            @Override
+            public VirtualRouterInner call(ServiceResponse<VirtualRouterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates the specified Virtual Router.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualRouterName The name of the Virtual Router.
+     * @param parameters Parameters supplied to the create or update Virtual Router.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualRouterInner object
+     */
+    public Observable<ServiceResponse<VirtualRouterInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualRouterName, VirtualRouterInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualRouterName == null) {
+            throw new IllegalArgumentException("Parameter virtualRouterName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(resourceGroupName, virtualRouterName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualRouterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualRouterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualRouterInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualRouterInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualRouterInner, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualRouterInner>() { }.getType())
+                .register(201, new TypeToken<VirtualRouterInner>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualRouterInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualRouterInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<VirtualRouterInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualRouterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterInner&gt; object
+     */
+    public Observable<Page<VirtualRouterInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Page<VirtualRouterInner>>() {
+                @Override
+                public Page<VirtualRouterInner> call(ServiceResponse<Page<VirtualRouterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(ServiceResponse<Page<VirtualRouterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualRouterInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterInner> list() {
+        ServiceResponse<Page<VirtualRouterInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VirtualRouterInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Virtual Routers in a 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<VirtualRouterInner>> listAsync(final ListOperationCallback<VirtualRouterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterInner&gt; object
+     */
+    public Observable<Page<VirtualRouterInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Page<VirtualRouterInner>>() {
+                @Override
+                public Page<VirtualRouterInner> call(ServiceResponse<Page<VirtualRouterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualRouterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(ServiceResponse<Page<VirtualRouterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterInner>> listDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualRouterInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualRouterInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all Virtual Routers in 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<VirtualRouterInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualRouterInner>> serviceFuture, final ListOperationCallback<VirtualRouterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all Virtual Routers in 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;VirtualRouterInner&gt; object
+     */
+    public Observable<Page<VirtualRouterInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Page<VirtualRouterInner>>() {
+                @Override
+                public Page<VirtualRouterInner> call(ServiceResponse<Page<VirtualRouterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Routers in 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;VirtualRouterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(ServiceResponse<Page<VirtualRouterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all Virtual Routers in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualRouterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> 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<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorException 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;VirtualRouterInner&gt; object if successful.
+     */
+    public PagedList<VirtualRouterInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualRouterInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualRouterInner>(response.body()) {
+            @Override
+            public Page<VirtualRouterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @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<VirtualRouterInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualRouterInner>> serviceFuture, final ListOperationCallback<VirtualRouterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @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;VirtualRouterInner&gt; object
+     */
+    public Observable<Page<VirtualRouterInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Page<VirtualRouterInner>>() {
+                @Override
+                public Page<VirtualRouterInner> call(ServiceResponse<Page<VirtualRouterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+     * @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;VirtualRouterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualRouterInner>>, Observable<ServiceResponse<Page<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(ServiceResponse<Page<VirtualRouterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Virtual Routers in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualRouterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualRouterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualRouterInner>>> 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<VirtualRouterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualRouterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualRouterInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualRouterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualRouterInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualRouterInner>, ErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualRouterInner>>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANImpl.java
new file mode 100644
index 000000000000..84e7eb3af080
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANImpl.java
@@ -0,0 +1,125 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWAN;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.OfficeTrafficCategory;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VirtualWANImpl extends GroupableResourceCoreImpl<VirtualWAN, VirtualWANInner, VirtualWANImpl, NetworkManager> implements VirtualWAN, VirtualWAN.Definition, VirtualWAN.Update {
+    VirtualWANImpl(String name, VirtualWANInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VirtualWAN> createResourceAsync() {
+        VirtualWansInner client = this.manager().inner().virtualWans();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualWAN> updateResourceAsync() {
+        VirtualWansInner client = this.manager().inner().virtualWans();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualWANInner> getInnerAsync() {
+        VirtualWansInner client = this.manager().inner().virtualWans();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Boolean allowBranchToBranchTraffic() {
+        return this.inner().allowBranchToBranchTraffic();
+    }
+
+    @Override
+    public Boolean allowVnetToVnetTraffic() {
+        return this.inner().allowVnetToVnetTraffic();
+    }
+
+    @Override
+    public Boolean disableVpnEncryption() {
+        return this.inner().disableVpnEncryption();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public OfficeTrafficCategory office365LocalBreakoutCategory() {
+        return this.inner().office365LocalBreakoutCategory();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<SubResource> virtualHubs() {
+        return this.inner().virtualHubs();
+    }
+
+    @Override
+    public String virtualWANType() {
+        return this.inner().virtualWANType();
+    }
+
+    @Override
+    public List<SubResource> vpnSites() {
+        return this.inner().vpnSites();
+    }
+
+    @Override
+    public VirtualWANImpl withAllowBranchToBranchTraffic(Boolean allowBranchToBranchTraffic) {
+        this.inner().withAllowBranchToBranchTraffic(allowBranchToBranchTraffic);
+        return this;
+    }
+
+    @Override
+    public VirtualWANImpl withAllowVnetToVnetTraffic(Boolean allowVnetToVnetTraffic) {
+        this.inner().withAllowVnetToVnetTraffic(allowVnetToVnetTraffic);
+        return this;
+    }
+
+    @Override
+    public VirtualWANImpl withDisableVpnEncryption(Boolean disableVpnEncryption) {
+        this.inner().withDisableVpnEncryption(disableVpnEncryption);
+        return this;
+    }
+
+    @Override
+    public VirtualWANImpl withOffice365LocalBreakoutCategory(OfficeTrafficCategory office365LocalBreakoutCategory) {
+        this.inner().withOffice365LocalBreakoutCategory(office365LocalBreakoutCategory);
+        return this;
+    }
+
+    @Override
+    public VirtualWANImpl withVirtualWANType(String virtualWANType) {
+        this.inner().withVirtualWANType(virtualWANType);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANInner.java
new file mode 100644
index 000000000000..34a3270d57fa
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWANInner.java
@@ -0,0 +1,244 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.OfficeTrafficCategory;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VirtualWAN Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VirtualWANInner extends Resource {
+    /**
+     * Vpn encryption to be disabled or not.
+     */
+    @JsonProperty(value = "properties.disableVpnEncryption")
+    private Boolean disableVpnEncryption;
+
+    /**
+     * List of VirtualHubs in the VirtualWAN.
+     */
+    @JsonProperty(value = "properties.virtualHubs", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> virtualHubs;
+
+    /**
+     * List of VpnSites in the VirtualWAN.
+     */
+    @JsonProperty(value = "properties.vpnSites", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> vpnSites;
+
+    /**
+     * True if branch to branch traffic is allowed.
+     */
+    @JsonProperty(value = "properties.allowBranchToBranchTraffic")
+    private Boolean allowBranchToBranchTraffic;
+
+    /**
+     * True if Vnet to Vnet traffic is allowed.
+     */
+    @JsonProperty(value = "properties.allowVnetToVnetTraffic")
+    private Boolean allowVnetToVnetTraffic;
+
+    /**
+     * The office local breakout category. Possible values include: 'Optimize',
+     * 'OptimizeAndAllow', 'All', 'None'.
+     */
+    @JsonProperty(value = "properties.office365LocalBreakoutCategory")
+    private OfficeTrafficCategory office365LocalBreakoutCategory;
+
+    /**
+     * The provisioning state of the virtual WAN resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The type of the VirtualWAN.
+     */
+    @JsonProperty(value = "properties.type")
+    private String virtualWANType;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get vpn encryption to be disabled or not.
+     *
+     * @return the disableVpnEncryption value
+     */
+    public Boolean disableVpnEncryption() {
+        return this.disableVpnEncryption;
+    }
+
+    /**
+     * Set vpn encryption to be disabled or not.
+     *
+     * @param disableVpnEncryption the disableVpnEncryption value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withDisableVpnEncryption(Boolean disableVpnEncryption) {
+        this.disableVpnEncryption = disableVpnEncryption;
+        return this;
+    }
+
+    /**
+     * Get list of VirtualHubs in the VirtualWAN.
+     *
+     * @return the virtualHubs value
+     */
+    public List<SubResource> virtualHubs() {
+        return this.virtualHubs;
+    }
+
+    /**
+     * Get list of VpnSites in the VirtualWAN.
+     *
+     * @return the vpnSites value
+     */
+    public List<SubResource> vpnSites() {
+        return this.vpnSites;
+    }
+
+    /**
+     * Get true if branch to branch traffic is allowed.
+     *
+     * @return the allowBranchToBranchTraffic value
+     */
+    public Boolean allowBranchToBranchTraffic() {
+        return this.allowBranchToBranchTraffic;
+    }
+
+    /**
+     * Set true if branch to branch traffic is allowed.
+     *
+     * @param allowBranchToBranchTraffic the allowBranchToBranchTraffic value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withAllowBranchToBranchTraffic(Boolean allowBranchToBranchTraffic) {
+        this.allowBranchToBranchTraffic = allowBranchToBranchTraffic;
+        return this;
+    }
+
+    /**
+     * Get true if Vnet to Vnet traffic is allowed.
+     *
+     * @return the allowVnetToVnetTraffic value
+     */
+    public Boolean allowVnetToVnetTraffic() {
+        return this.allowVnetToVnetTraffic;
+    }
+
+    /**
+     * Set true if Vnet to Vnet traffic is allowed.
+     *
+     * @param allowVnetToVnetTraffic the allowVnetToVnetTraffic value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withAllowVnetToVnetTraffic(Boolean allowVnetToVnetTraffic) {
+        this.allowVnetToVnetTraffic = allowVnetToVnetTraffic;
+        return this;
+    }
+
+    /**
+     * Get the office local breakout category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', 'None'.
+     *
+     * @return the office365LocalBreakoutCategory value
+     */
+    public OfficeTrafficCategory office365LocalBreakoutCategory() {
+        return this.office365LocalBreakoutCategory;
+    }
+
+    /**
+     * Set the office local breakout category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', 'None'.
+     *
+     * @param office365LocalBreakoutCategory the office365LocalBreakoutCategory value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withOffice365LocalBreakoutCategory(OfficeTrafficCategory office365LocalBreakoutCategory) {
+        this.office365LocalBreakoutCategory = office365LocalBreakoutCategory;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the virtual WAN resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the type of the VirtualWAN.
+     *
+     * @return the virtualWANType value
+     */
+    public String virtualWANType() {
+        return this.virtualWANType;
+    }
+
+    /**
+     * Set the type of the VirtualWAN.
+     *
+     * @param virtualWANType the virtualWANType value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withVirtualWANType(String virtualWANType) {
+        this.virtualWANType = virtualWANType;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VirtualWANInner object itself.
+     */
+    public VirtualWANInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWanSecurityProvidersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWanSecurityProvidersInner.java
new file mode 100644
index 000000000000..12916673cf16
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWanSecurityProvidersInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWanSecurityProvider;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Collection of SecurityProviders.
+ */
+public class VirtualWanSecurityProvidersInner {
+    /**
+     * List of VirtualWAN security providers.
+     */
+    @JsonProperty(value = "supportedProviders")
+    private List<VirtualWanSecurityProvider> supportedProviders;
+
+    /**
+     * Get list of VirtualWAN security providers.
+     *
+     * @return the supportedProviders value
+     */
+    public List<VirtualWanSecurityProvider> supportedProviders() {
+        return this.supportedProviders;
+    }
+
+    /**
+     * Set list of VirtualWAN security providers.
+     *
+     * @param supportedProviders the supportedProviders value to set
+     * @return the VirtualWanSecurityProvidersInner object itself.
+     */
+    public VirtualWanSecurityProvidersInner withSupportedProviders(List<VirtualWanSecurityProvider> supportedProviders) {
+        this.supportedProviders = supportedProviders;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansImpl.java
new file mode 100644
index 000000000000..b80f7b5cfc69
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWans;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualWAN;
+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;
+
+class VirtualWansImpl extends GroupableResourcesCoreImpl<VirtualWAN, VirtualWANImpl, VirtualWANInner, VirtualWansInner, NetworkManager>  implements VirtualWans {
+    protected VirtualWansImpl(NetworkManager manager) {
+        super(manager.inner().virtualWans(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualWANInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualWansInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualWansInner 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<VirtualWAN> listByResourceGroup(String resourceGroupName) {
+        VirtualWansInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualWAN> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualWansInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualWANInner>, Iterable<VirtualWANInner>>() {
+            @Override
+            public Iterable<VirtualWANInner> call(Page<VirtualWANInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualWANInner, VirtualWAN>() {
+            @Override
+            public VirtualWAN call(VirtualWANInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualWAN> list() {
+        VirtualWansInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualWAN> listAsync() {
+        VirtualWansInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualWANInner>, Iterable<VirtualWANInner>>() {
+            @Override
+            public Iterable<VirtualWANInner> call(Page<VirtualWANInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualWANInner, VirtualWAN>() {
+            @Override
+            public VirtualWAN call(VirtualWANInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualWANImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VirtualWANImpl wrapModel(VirtualWANInner inner) {
+        return  new VirtualWANImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualWANImpl wrapModel(String name) {
+        return new VirtualWANImpl(name, new VirtualWANInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansInner.java
new file mode 100644
index 000000000000..0f8e67730c82
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VirtualWansInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VirtualWans.
+ */
+public class VirtualWansInner implements InnerSupportsGet<VirtualWANInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VirtualWANInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VirtualWansService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VirtualWansInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VirtualWansInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VirtualWansService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VirtualWans to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VirtualWansService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualWans getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @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.network.v2020_04_01.VirtualWans createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @Query("api-version") String apiVersion, @Body VirtualWANInner wANParameters, @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.network.v2020_04_01.VirtualWans beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @Query("api-version") String apiVersion, @Body VirtualWANInner wANParameters, @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.network.v2020_04_01.VirtualWans updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject wANParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VirtualWans delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @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.network.v2020_04_01.VirtualWans beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("VirtualWANName") String virtualWANName, @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.network.v2020_04_01.VirtualWans listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans")
+        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.network.v2020_04_01.VirtualWans list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualWans")
+        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.network.v2020_04_01.VirtualWans 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.network.v2020_04_01.VirtualWans listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being retrieved.
+     * @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 VirtualWANInner object if successful.
+     */
+    public VirtualWANInner getByResourceGroup(String resourceGroupName, String virtualWANName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being retrieved.
+     * @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<VirtualWANInner> getByResourceGroupAsync(String resourceGroupName, String virtualWANName, final ServiceCallback<VirtualWANInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<VirtualWANInner> getByResourceGroupAsync(String resourceGroupName, String virtualWANName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<VirtualWANInner>, VirtualWANInner>() {
+            @Override
+            public VirtualWANInner call(ServiceResponse<VirtualWANInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<ServiceResponse<VirtualWANInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, virtualWANName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualWANInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualWANInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualWANInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualWANInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualWANInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualWANInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @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 VirtualWANInner object if successful.
+     */
+    public VirtualWANInner createOrUpdate(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @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<VirtualWANInner> createOrUpdateAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters, final ServiceCallback<VirtualWANInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VirtualWANInner> createOrUpdateAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters).map(new Func1<ServiceResponse<VirtualWANInner>, VirtualWANInner>() {
+            @Override
+            public VirtualWANInner call(ServiceResponse<VirtualWANInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VirtualWANInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (wANParameters == null) {
+            throw new IllegalArgumentException("Parameter wANParameters is required and cannot be null.");
+        }
+        Validator.validate(wANParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, wANParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VirtualWANInner>() { }.getType());
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @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 VirtualWANInner object if successful.
+     */
+    public VirtualWANInner beginCreateOrUpdate(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @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<VirtualWANInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters, final ServiceCallback<VirtualWANInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<VirtualWANInner> beginCreateOrUpdateAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, virtualWANName, wANParameters).map(new Func1<ServiceResponse<VirtualWANInner>, VirtualWANInner>() {
+            @Override
+            public VirtualWANInner call(ServiceResponse<VirtualWANInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VirtualWAN resource if it doesn't exist else updates the existing VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being created or updated.
+     * @param wANParameters Parameters supplied to create or update VirtualWAN.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<ServiceResponse<VirtualWANInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String virtualWANName, VirtualWANInner wANParameters) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (wANParameters == null) {
+            throw new IllegalArgumentException("Parameter wANParameters is required and cannot be null.");
+        }
+        Validator.validate(wANParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, wANParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualWANInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualWANInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualWANInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualWANInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualWANInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualWANInner>() { }.getType())
+                .register(201, new TypeToken<VirtualWANInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @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 VirtualWANInner object if successful.
+     */
+    public VirtualWANInner updateTags(String resourceGroupName, String virtualWANName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being 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<VirtualWANInner> updateTagsAsync(String resourceGroupName, String virtualWANName, final ServiceCallback<VirtualWANInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<VirtualWANInner> updateTagsAsync(String resourceGroupName, String virtualWANName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<VirtualWANInner>, VirtualWANInner>() {
+            @Override
+            public VirtualWANInner call(ServiceResponse<VirtualWANInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<ServiceResponse<VirtualWANInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject wANParameters = new TagsObject();
+        wANParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.client.acceptLanguage(), wANParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualWANInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualWANInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualWANInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @param tags Resource tags.
+     * @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 VirtualWANInner object if successful.
+     */
+    public VirtualWANInner updateTags(String resourceGroupName, String virtualWANName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @param tags Resource tags.
+     * @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<VirtualWANInner> updateTagsAsync(String resourceGroupName, String virtualWANName, Map<String, String> tags, final ServiceCallback<VirtualWANInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<VirtualWANInner> updateTagsAsync(String resourceGroupName, String virtualWANName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, virtualWANName, tags).map(new Func1<ServiceResponse<VirtualWANInner>, VirtualWANInner>() {
+            @Override
+            public VirtualWANInner call(ServiceResponse<VirtualWANInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a VirtualWAN tags.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualWANInner object
+     */
+    public Observable<ServiceResponse<VirtualWANInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String virtualWANName, Map<String, String> tags) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject wANParameters = new TagsObject();
+        wANParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.client.acceptLanguage(), wANParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualWANInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualWANInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualWANInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualWANInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualWANInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualWANInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @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 virtualWANName) {
+        deleteWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @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 virtualWANName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String virtualWANName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @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 virtualWANName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @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 virtualWANName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String virtualWANName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VirtualWAN.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @param virtualWANName The name of the VirtualWAN being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, virtualWANName, 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);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @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;VirtualWANInner&gt; object if successful.
+     */
+    public PagedList<VirtualWANInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VirtualWANInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VirtualWANInner>(response.body()) {
+            @Override
+            public Page<VirtualWANInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @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<VirtualWANInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VirtualWANInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualWANInner&gt; object
+     */
+    public Observable<Page<VirtualWANInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VirtualWANInner>>, Page<VirtualWANInner>>() {
+                @Override
+                public Page<VirtualWANInner> call(ServiceResponse<Page<VirtualWANInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VirtualWan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualWANInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualWANInner>>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(ServiceResponse<Page<VirtualWANInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualWANInner>> * @param resourceGroupName The resource group name of the VirtualWan.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualWANInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualWANInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualWANInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualWANInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualWANInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualWANInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a 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;VirtualWANInner&gt; object if successful.
+     */
+    public PagedList<VirtualWANInner> list() {
+        ServiceResponse<Page<VirtualWANInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VirtualWANInner>(response.body()) {
+            @Override
+            public Page<VirtualWANInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualWANs in a 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<VirtualWANInner>> listAsync(final ListOperationCallback<VirtualWANInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualWANInner&gt; object
+     */
+    public Observable<Page<VirtualWANInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VirtualWANInner>>, Page<VirtualWANInner>>() {
+                @Override
+                public Page<VirtualWANInner> call(ServiceResponse<Page<VirtualWANInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualWANInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VirtualWANInner>>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(ServiceResponse<Page<VirtualWANInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualWANInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualWANInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualWANInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualWANInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualWANInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualWANInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualWANs in 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;VirtualWANInner&gt; object if successful.
+     */
+    public PagedList<VirtualWANInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualWANInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualWANInner>(response.body()) {
+            @Override
+            public Page<VirtualWANInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualWANs in 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<VirtualWANInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualWANInner>> serviceFuture, final ListOperationCallback<VirtualWANInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualWANs in 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;VirtualWANInner&gt; object
+     */
+    public Observable<Page<VirtualWANInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualWANInner>>, Page<VirtualWANInner>>() {
+                @Override
+                public Page<VirtualWANInner> call(ServiceResponse<Page<VirtualWANInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in 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;VirtualWANInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualWANInner>>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(ServiceResponse<Page<VirtualWANInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a resource group.
+     *
+    ServiceResponse<PageImpl<VirtualWANInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualWANInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> 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<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualWANInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualWANInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualWANInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualWANInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualWANInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @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;VirtualWANInner&gt; object if successful.
+     */
+    public PagedList<VirtualWANInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualWANInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualWANInner>(response.body()) {
+            @Override
+            public Page<VirtualWANInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @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<VirtualWANInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualWANInner>> serviceFuture, final ListOperationCallback<VirtualWANInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @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;VirtualWANInner&gt; object
+     */
+    public Observable<Page<VirtualWANInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualWANInner>>, Page<VirtualWANInner>>() {
+                @Override
+                public Page<VirtualWANInner> call(ServiceResponse<Page<VirtualWANInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+     * @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;VirtualWANInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualWANInner>>, Observable<ServiceResponse<Page<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(ServiceResponse<Page<VirtualWANInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VirtualWANs in a subscription.
+     *
+    ServiceResponse<PageImpl<VirtualWANInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualWANInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualWANInner>>> 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<VirtualWANInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualWANInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualWANInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualWANInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualWANInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualWANInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualWANInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultImpl.java
new file mode 100644
index 000000000000..071485ef7567
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealthDetailListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealthDetail;
+
+class VpnClientConnectionHealthDetailListResultImpl extends WrapperImpl<VpnClientConnectionHealthDetailListResultInner> implements VpnClientConnectionHealthDetailListResult {
+    private final NetworkManager manager;
+    VpnClientConnectionHealthDetailListResultImpl(VpnClientConnectionHealthDetailListResultInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<VpnClientConnectionHealthDetail> value() {
+        return this.inner().value();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultInner.java
new file mode 100644
index 000000000000..6476d71a685d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientConnectionHealthDetailListResultInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientConnectionHealthDetail;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * List of virtual network gateway vpn client connection health.
+ */
+public class VpnClientConnectionHealthDetailListResultInner {
+    /**
+     * List of vpn client connection health.
+     */
+    @JsonProperty(value = "value")
+    private List<VpnClientConnectionHealthDetail> value;
+
+    /**
+     * Get list of vpn client connection health.
+     *
+     * @return the value value
+     */
+    public List<VpnClientConnectionHealthDetail> value() {
+        return this.value;
+    }
+
+    /**
+     * Set list of vpn client connection health.
+     *
+     * @param value the value value to set
+     * @return the VpnClientConnectionHealthDetailListResultInner object itself.
+     */
+    public VpnClientConnectionHealthDetailListResultInner withValue(List<VpnClientConnectionHealthDetail> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersImpl.java
new file mode 100644
index 000000000000..10fe51b16122
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnClientIPsecParameters;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.DhGroup;
+import com.microsoft.azure.management.network.v2020_04_01.IkeEncryption;
+import com.microsoft.azure.management.network.v2020_04_01.IkeIntegrity;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecEncryption;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecIntegrity;
+import com.microsoft.azure.management.network.v2020_04_01.PfsGroup;
+
+class VpnClientIPsecParametersImpl extends WrapperImpl<VpnClientIPsecParametersInner> implements VpnClientIPsecParameters {
+    private final NetworkManager manager;
+    VpnClientIPsecParametersImpl(VpnClientIPsecParametersInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public DhGroup dhGroup() {
+        return this.inner().dhGroup();
+    }
+
+    @Override
+    public IkeEncryption ikeEncryption() {
+        return this.inner().ikeEncryption();
+    }
+
+    @Override
+    public IkeIntegrity ikeIntegrity() {
+        return this.inner().ikeIntegrity();
+    }
+
+    @Override
+    public IpsecEncryption ipsecEncryption() {
+        return this.inner().ipsecEncryption();
+    }
+
+    @Override
+    public IpsecIntegrity ipsecIntegrity() {
+        return this.inner().ipsecIntegrity();
+    }
+
+    @Override
+    public PfsGroup pfsGroup() {
+        return this.inner().pfsGroup();
+    }
+
+    @Override
+    public int saDataSizeKilobytes() {
+        return this.inner().saDataSizeKilobytes();
+    }
+
+    @Override
+    public int saLifeTimeSeconds() {
+        return this.inner().saLifeTimeSeconds();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersInner.java
new file mode 100644
index 000000000000..084740d97495
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnClientIPsecParametersInner.java
@@ -0,0 +1,242 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.IpsecEncryption;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecIntegrity;
+import com.microsoft.azure.management.network.v2020_04_01.IkeEncryption;
+import com.microsoft.azure.management.network.v2020_04_01.IkeIntegrity;
+import com.microsoft.azure.management.network.v2020_04_01.DhGroup;
+import com.microsoft.azure.management.network.v2020_04_01.PfsGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * An IPSec parameters for a virtual network gateway P2S connection.
+ */
+public class VpnClientIPsecParametersInner {
+    /**
+     * The IPSec Security Association (also called Quick Mode or Phase 2 SA)
+     * lifetime in seconds for P2S client.
+     */
+    @JsonProperty(value = "saLifeTimeSeconds", required = true)
+    private int saLifeTimeSeconds;
+
+    /**
+     * The IPSec Security Association (also called Quick Mode or Phase 2 SA)
+     * payload size in KB for P2S client..
+     */
+    @JsonProperty(value = "saDataSizeKilobytes", required = true)
+    private int saDataSizeKilobytes;
+
+    /**
+     * The IPSec encryption algorithm (IKE phase 1). Possible values include:
+     * 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128',
+     * 'GCMAES192', 'GCMAES256'.
+     */
+    @JsonProperty(value = "ipsecEncryption", required = true)
+    private IpsecEncryption ipsecEncryption;
+
+    /**
+     * The IPSec integrity algorithm (IKE phase 1). Possible values include:
+     * 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     */
+    @JsonProperty(value = "ipsecIntegrity", required = true)
+    private IpsecIntegrity ipsecIntegrity;
+
+    /**
+     * The IKE encryption algorithm (IKE phase 2). Possible values include:
+     * 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     */
+    @JsonProperty(value = "ikeEncryption", required = true)
+    private IkeEncryption ikeEncryption;
+
+    /**
+     * The IKE integrity algorithm (IKE phase 2). Possible values include:
+     * 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     */
+    @JsonProperty(value = "ikeIntegrity", required = true)
+    private IkeIntegrity ikeIntegrity;
+
+    /**
+     * The DH Group used in IKE Phase 1 for initial SA. Possible values
+     * include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048',
+     * 'ECP256', 'ECP384', 'DHGroup24'.
+     */
+    @JsonProperty(value = "dhGroup", required = true)
+    private DhGroup dhGroup;
+
+    /**
+     * The Pfs Group used in IKE Phase 2 for new child SA. Possible values
+     * include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24',
+     * 'PFS14', 'PFSMM'.
+     */
+    @JsonProperty(value = "pfsGroup", required = true)
+    private PfsGroup pfsGroup;
+
+    /**
+     * Get the IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for P2S client.
+     *
+     * @return the saLifeTimeSeconds value
+     */
+    public int saLifeTimeSeconds() {
+        return this.saLifeTimeSeconds;
+    }
+
+    /**
+     * Set the IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for P2S client.
+     *
+     * @param saLifeTimeSeconds the saLifeTimeSeconds value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withSaLifeTimeSeconds(int saLifeTimeSeconds) {
+        this.saLifeTimeSeconds = saLifeTimeSeconds;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for P2S client..
+     *
+     * @return the saDataSizeKilobytes value
+     */
+    public int saDataSizeKilobytes() {
+        return this.saDataSizeKilobytes;
+    }
+
+    /**
+     * Set the IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for P2S client..
+     *
+     * @param saDataSizeKilobytes the saDataSizeKilobytes value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withSaDataSizeKilobytes(int saDataSizeKilobytes) {
+        this.saDataSizeKilobytes = saDataSizeKilobytes;
+        return this;
+    }
+
+    /**
+     * Get the IPSec encryption algorithm (IKE phase 1). Possible values include: 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @return the ipsecEncryption value
+     */
+    public IpsecEncryption ipsecEncryption() {
+        return this.ipsecEncryption;
+    }
+
+    /**
+     * Set the IPSec encryption algorithm (IKE phase 1). Possible values include: 'None', 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @param ipsecEncryption the ipsecEncryption value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withIpsecEncryption(IpsecEncryption ipsecEncryption) {
+        this.ipsecEncryption = ipsecEncryption;
+        return this;
+    }
+
+    /**
+     * Get the IPSec integrity algorithm (IKE phase 1). Possible values include: 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @return the ipsecIntegrity value
+     */
+    public IpsecIntegrity ipsecIntegrity() {
+        return this.ipsecIntegrity;
+    }
+
+    /**
+     * Set the IPSec integrity algorithm (IKE phase 1). Possible values include: 'MD5', 'SHA1', 'SHA256', 'GCMAES128', 'GCMAES192', 'GCMAES256'.
+     *
+     * @param ipsecIntegrity the ipsecIntegrity value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withIpsecIntegrity(IpsecIntegrity ipsecIntegrity) {
+        this.ipsecIntegrity = ipsecIntegrity;
+        return this;
+    }
+
+    /**
+     * Get the IKE encryption algorithm (IKE phase 2). Possible values include: 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     *
+     * @return the ikeEncryption value
+     */
+    public IkeEncryption ikeEncryption() {
+        return this.ikeEncryption;
+    }
+
+    /**
+     * Set the IKE encryption algorithm (IKE phase 2). Possible values include: 'DES', 'DES3', 'AES128', 'AES192', 'AES256', 'GCMAES256', 'GCMAES128'.
+     *
+     * @param ikeEncryption the ikeEncryption value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withIkeEncryption(IkeEncryption ikeEncryption) {
+        this.ikeEncryption = ikeEncryption;
+        return this;
+    }
+
+    /**
+     * Get the IKE integrity algorithm (IKE phase 2). Possible values include: 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     *
+     * @return the ikeIntegrity value
+     */
+    public IkeIntegrity ikeIntegrity() {
+        return this.ikeIntegrity;
+    }
+
+    /**
+     * Set the IKE integrity algorithm (IKE phase 2). Possible values include: 'MD5', 'SHA1', 'SHA256', 'SHA384', 'GCMAES256', 'GCMAES128'.
+     *
+     * @param ikeIntegrity the ikeIntegrity value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withIkeIntegrity(IkeIntegrity ikeIntegrity) {
+        this.ikeIntegrity = ikeIntegrity;
+        return this;
+    }
+
+    /**
+     * Get the DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'.
+     *
+     * @return the dhGroup value
+     */
+    public DhGroup dhGroup() {
+        return this.dhGroup;
+    }
+
+    /**
+     * Set the DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24'.
+     *
+     * @param dhGroup the dhGroup value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withDhGroup(DhGroup dhGroup) {
+        this.dhGroup = dhGroup;
+        return this;
+    }
+
+    /**
+     * Get the Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM'.
+     *
+     * @return the pfsGroup value
+     */
+    public PfsGroup pfsGroup() {
+        return this.pfsGroup;
+    }
+
+    /**
+     * Set the Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM'.
+     *
+     * @param pfsGroup the pfsGroup value to set
+     * @return the VpnClientIPsecParametersInner object itself.
+     */
+    public VpnClientIPsecParametersInner withPfsGroup(PfsGroup pfsGroup) {
+        this.pfsGroup = pfsGroup;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionImpl.java
new file mode 100644
index 000000000000..9f7f45c330e1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionImpl.java
@@ -0,0 +1,301 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnection;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionVpnGatewayVpnSiteLinkConnection;
+
+class VpnConnectionImpl extends CreatableUpdatableImpl<VpnConnection, VpnConnectionInner, VpnConnectionImpl> implements VpnConnection, VpnConnection.Definition, VpnConnection.Update {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String gatewayName;
+    private String connectionName;
+
+    VpnConnectionImpl(String name, NetworkManager manager) {
+        super(name, new VpnConnectionInner());
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = name;
+        //
+    }
+
+    VpnConnectionImpl(VpnConnectionInner inner, NetworkManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.connectionName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.gatewayName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnGateways");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnConnections");
+        //
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VpnConnection> createResourceAsync() {
+        VpnConnectionsInner client = this.manager().inner().vpnConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.gatewayName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VpnConnection> updateResourceAsync() {
+        VpnConnectionsInner client = this.manager().inner().vpnConnections();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.gatewayName, this.connectionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VpnConnectionInner> getInnerAsync() {
+        VpnConnectionsInner client = this.manager().inner().vpnConnections();
+        return client.getAsync(this.resourceGroupName, this.gatewayName, this.connectionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public Integer connectionBandwidth() {
+        return this.inner().connectionBandwidth();
+    }
+
+    @Override
+    public VpnConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public Integer dpdTimeoutSeconds() {
+        return this.inner().dpdTimeoutSeconds();
+    }
+
+    @Override
+    public Long egressBytesTransferred() {
+        return this.inner().egressBytesTransferred();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public Boolean enableInternetSecurity() {
+        return this.inner().enableInternetSecurity();
+    }
+
+    @Override
+    public Boolean enableRateLimiting() {
+        return this.inner().enableRateLimiting();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Long ingressBytesTransferred() {
+        return this.inner().ingressBytesTransferred();
+    }
+
+    @Override
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.inner().ipsecPolicies();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SubResource remoteVpnSite() {
+        return this.inner().remoteVpnSite();
+    }
+
+    @Override
+    public RoutingConfiguration routingConfiguration() {
+        return this.inner().routingConfiguration();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public Boolean useLocalAzureIpAddress() {
+        return this.inner().useLocalAzureIpAddress();
+    }
+
+    @Override
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.inner().usePolicyBasedTrafficSelectors();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType() {
+        return this.inner().vpnConnectionProtocolType();
+    }
+
+    @Override
+    public List<VpnConnectionVpnGatewayVpnSiteLinkConnection> vpnLinkConnections() {
+        List<VpnConnectionVpnGatewayVpnSiteLinkConnection> lst = new ArrayList<VpnConnectionVpnGatewayVpnSiteLinkConnection>();
+        if (this.inner().vpnLinkConnections() != null) {
+            for (VpnSiteLinkConnectionInner inner : this.inner().vpnLinkConnections()) {
+                lst.add( new VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public VpnConnectionImpl withExistingVpnGateway(String resourceGroupName, String gatewayName) {
+        this.resourceGroupName = resourceGroupName;
+        this.gatewayName = gatewayName;
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withConnectionBandwidth(Integer connectionBandwidth) {
+        this.inner().withConnectionBandwidth(connectionBandwidth);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withConnectionStatus(VpnConnectionStatus connectionStatus) {
+        this.inner().withConnectionStatus(connectionStatus);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withDpdTimeoutSeconds(Integer dpdTimeoutSeconds) {
+        this.inner().withDpdTimeoutSeconds(dpdTimeoutSeconds);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withEnableBgp(Boolean enableBgp) {
+        this.inner().withEnableBgp(enableBgp);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withEnableInternetSecurity(Boolean enableInternetSecurity) {
+        this.inner().withEnableInternetSecurity(enableInternetSecurity);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withEnableRateLimiting(Boolean enableRateLimiting) {
+        this.inner().withEnableRateLimiting(enableRateLimiting);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withId(String id) {
+        this.inner().withId(id);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.inner().withIpsecPolicies(ipsecPolicies);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withName(String name) {
+        this.inner().withName(name);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withRemoteVpnSite(SubResource remoteVpnSite) {
+        this.inner().withRemoteVpnSite(remoteVpnSite);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.inner().withRoutingConfiguration(routingConfiguration);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withRoutingWeight(Integer routingWeight) {
+        this.inner().withRoutingWeight(routingWeight);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withSharedKey(String sharedKey) {
+        this.inner().withSharedKey(sharedKey);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress) {
+        this.inner().withUseLocalAzureIpAddress(useLocalAzureIpAddress);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.inner().withUsePolicyBasedTrafficSelectors(usePolicyBasedTrafficSelectors);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withVpnConnectionProtocolType(VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType) {
+        this.inner().withVpnConnectionProtocolType(vpnConnectionProtocolType);
+        return this;
+    }
+
+    @Override
+    public VpnConnectionImpl withVpnLinkConnections(List<VpnSiteLinkConnectionInner> vpnLinkConnections) {
+        this.inner().withVpnLinkConnections(vpnLinkConnections);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionInner.java
new file mode 100644
index 000000000000..533c3d7f5eb4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionInner.java
@@ -0,0 +1,507 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.RoutingConfiguration;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * VpnConnection Resource.
+ */
+@JsonFlatten
+public class VpnConnectionInner extends SubResource {
+    /**
+     * Id of the connected vpn site.
+     */
+    @JsonProperty(value = "properties.remoteVpnSite")
+    private SubResource remoteVpnSite;
+
+    /**
+     * Routing weight for vpn connection.
+     */
+    @JsonProperty(value = "properties.routingWeight")
+    private Integer routingWeight;
+
+    /**
+     * The dead peer detection timeout for a vpn connection in seconds.
+     */
+    @JsonProperty(value = "properties.dpdTimeoutSeconds")
+    private Integer dpdTimeoutSeconds;
+
+    /**
+     * The connection status. Possible values include: 'Unknown', 'Connecting',
+     * 'Connected', 'NotConnected'.
+     */
+    @JsonProperty(value = "properties.connectionStatus")
+    private VpnConnectionStatus connectionStatus;
+
+    /**
+     * Connection protocol used for this connection. Possible values include:
+     * 'IKEv2', 'IKEv1'.
+     */
+    @JsonProperty(value = "properties.vpnConnectionProtocolType")
+    private VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType;
+
+    /**
+     * Ingress bytes transferred.
+     */
+    @JsonProperty(value = "properties.ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * Egress bytes transferred.
+     */
+    @JsonProperty(value = "properties.egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * Expected bandwidth in MBPS.
+     */
+    @JsonProperty(value = "properties.connectionBandwidth")
+    private Integer connectionBandwidth;
+
+    /**
+     * SharedKey for the vpn connection.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableBgp")
+    private Boolean enableBgp;
+
+    /**
+     * Enable policy-based traffic selectors.
+     */
+    @JsonProperty(value = "properties.usePolicyBasedTrafficSelectors")
+    private Boolean usePolicyBasedTrafficSelectors;
+
+    /**
+     * The IPSec Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.ipsecPolicies")
+    private List<IpsecPolicy> ipsecPolicies;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableRateLimiting")
+    private Boolean enableRateLimiting;
+
+    /**
+     * Enable internet security.
+     */
+    @JsonProperty(value = "properties.enableInternetSecurity")
+    private Boolean enableInternetSecurity;
+
+    /**
+     * Use local azure ip to initiate connection.
+     */
+    @JsonProperty(value = "properties.useLocalAzureIpAddress")
+    private Boolean useLocalAzureIpAddress;
+
+    /**
+     * The provisioning state of the VPN connection resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * List of all vpn site link connections to the gateway.
+     */
+    @JsonProperty(value = "properties.vpnLinkConnections")
+    private List<VpnSiteLinkConnectionInner> vpnLinkConnections;
+
+    /**
+     * The Routing Configuration indicating the associated and propagated route
+     * tables on this connection.
+     */
+    @JsonProperty(value = "properties.routingConfiguration")
+    private RoutingConfiguration routingConfiguration;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get id of the connected vpn site.
+     *
+     * @return the remoteVpnSite value
+     */
+    public SubResource remoteVpnSite() {
+        return this.remoteVpnSite;
+    }
+
+    /**
+     * Set id of the connected vpn site.
+     *
+     * @param remoteVpnSite the remoteVpnSite value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withRemoteVpnSite(SubResource remoteVpnSite) {
+        this.remoteVpnSite = remoteVpnSite;
+        return this;
+    }
+
+    /**
+     * Get routing weight for vpn connection.
+     *
+     * @return the routingWeight value
+     */
+    public Integer routingWeight() {
+        return this.routingWeight;
+    }
+
+    /**
+     * Set routing weight for vpn connection.
+     *
+     * @param routingWeight the routingWeight value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withRoutingWeight(Integer routingWeight) {
+        this.routingWeight = routingWeight;
+        return this;
+    }
+
+    /**
+     * Get the dead peer detection timeout for a vpn connection in seconds.
+     *
+     * @return the dpdTimeoutSeconds value
+     */
+    public Integer dpdTimeoutSeconds() {
+        return this.dpdTimeoutSeconds;
+    }
+
+    /**
+     * Set the dead peer detection timeout for a vpn connection in seconds.
+     *
+     * @param dpdTimeoutSeconds the dpdTimeoutSeconds value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withDpdTimeoutSeconds(Integer dpdTimeoutSeconds) {
+        this.dpdTimeoutSeconds = dpdTimeoutSeconds;
+        return this;
+    }
+
+    /**
+     * Get the connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public VpnConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Set the connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @param connectionStatus the connectionStatus value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withConnectionStatus(VpnConnectionStatus connectionStatus) {
+        this.connectionStatus = connectionStatus;
+        return this;
+    }
+
+    /**
+     * Get connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @return the vpnConnectionProtocolType value
+     */
+    public VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType() {
+        return this.vpnConnectionProtocolType;
+    }
+
+    /**
+     * Set connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @param vpnConnectionProtocolType the vpnConnectionProtocolType value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withVpnConnectionProtocolType(VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType) {
+        this.vpnConnectionProtocolType = vpnConnectionProtocolType;
+        return this;
+    }
+
+    /**
+     * Get ingress bytes transferred.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get egress bytes transferred.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get expected bandwidth in MBPS.
+     *
+     * @return the connectionBandwidth value
+     */
+    public Integer connectionBandwidth() {
+        return this.connectionBandwidth;
+    }
+
+    /**
+     * Set expected bandwidth in MBPS.
+     *
+     * @param connectionBandwidth the connectionBandwidth value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withConnectionBandwidth(Integer connectionBandwidth) {
+        this.connectionBandwidth = connectionBandwidth;
+        return this;
+    }
+
+    /**
+     * Get sharedKey for the vpn connection.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set sharedKey for the vpn connection.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableBgp value
+     */
+    public Boolean enableBgp() {
+        return this.enableBgp;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableBgp the enableBgp value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withEnableBgp(Boolean enableBgp) {
+        this.enableBgp = enableBgp;
+        return this;
+    }
+
+    /**
+     * Get enable policy-based traffic selectors.
+     *
+     * @return the usePolicyBasedTrafficSelectors value
+     */
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.usePolicyBasedTrafficSelectors;
+    }
+
+    /**
+     * Set enable policy-based traffic selectors.
+     *
+     * @param usePolicyBasedTrafficSelectors the usePolicyBasedTrafficSelectors value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.usePolicyBasedTrafficSelectors = usePolicyBasedTrafficSelectors;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Policies to be considered by this connection.
+     *
+     * @return the ipsecPolicies value
+     */
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.ipsecPolicies;
+    }
+
+    /**
+     * Set the IPSec Policies to be considered by this connection.
+     *
+     * @param ipsecPolicies the ipsecPolicies value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.ipsecPolicies = ipsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableRateLimiting value
+     */
+    public Boolean enableRateLimiting() {
+        return this.enableRateLimiting;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableRateLimiting the enableRateLimiting value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withEnableRateLimiting(Boolean enableRateLimiting) {
+        this.enableRateLimiting = enableRateLimiting;
+        return this;
+    }
+
+    /**
+     * Get enable internet security.
+     *
+     * @return the enableInternetSecurity value
+     */
+    public Boolean enableInternetSecurity() {
+        return this.enableInternetSecurity;
+    }
+
+    /**
+     * Set enable internet security.
+     *
+     * @param enableInternetSecurity the enableInternetSecurity value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withEnableInternetSecurity(Boolean enableInternetSecurity) {
+        this.enableInternetSecurity = enableInternetSecurity;
+        return this;
+    }
+
+    /**
+     * Get use local azure ip to initiate connection.
+     *
+     * @return the useLocalAzureIpAddress value
+     */
+    public Boolean useLocalAzureIpAddress() {
+        return this.useLocalAzureIpAddress;
+    }
+
+    /**
+     * Set use local azure ip to initiate connection.
+     *
+     * @param useLocalAzureIpAddress the useLocalAzureIpAddress value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress) {
+        this.useLocalAzureIpAddress = useLocalAzureIpAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get list of all vpn site link connections to the gateway.
+     *
+     * @return the vpnLinkConnections value
+     */
+    public List<VpnSiteLinkConnectionInner> vpnLinkConnections() {
+        return this.vpnLinkConnections;
+    }
+
+    /**
+     * Set list of all vpn site link connections to the gateway.
+     *
+     * @param vpnLinkConnections the vpnLinkConnections value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withVpnLinkConnections(List<VpnSiteLinkConnectionInner> vpnLinkConnections) {
+        this.vpnLinkConnections = vpnLinkConnections;
+        return this;
+    }
+
+    /**
+     * Get the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @return the routingConfiguration value
+     */
+    public RoutingConfiguration routingConfiguration() {
+        return this.routingConfiguration;
+    }
+
+    /**
+     * Set the Routing Configuration indicating the associated and propagated route tables on this connection.
+     *
+     * @param routingConfiguration the routingConfiguration value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withRoutingConfiguration(RoutingConfiguration routingConfiguration) {
+        this.routingConfiguration = routingConfiguration;
+        return this;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VpnConnectionInner object itself.
+     */
+    public VpnConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl.java
new file mode 100644
index 000000000000..4617286acd34
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl.java
@@ -0,0 +1,141 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionVpnGatewayVpnSiteLinkConnection;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.SubResource;
+
+class VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl extends IndexableRefreshableWrapperImpl<VpnConnectionVpnGatewayVpnSiteLinkConnection, VpnSiteLinkConnectionInner> implements VpnConnectionVpnGatewayVpnSiteLinkConnection {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String gatewayName;
+    private String connectionName;
+    private String linkConnectionName;
+
+    VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl(VpnSiteLinkConnectionInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.gatewayName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnGateways");
+        this.connectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnConnections");
+        this.linkConnectionName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnLinkConnections");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<VpnSiteLinkConnectionInner> getInnerAsync() {
+        VpnSiteLinkConnectionsInner client = this.manager().inner().vpnSiteLinkConnections();
+        return client.getAsync(this.resourceGroupName, this.gatewayName, this.connectionName, this.linkConnectionName);
+    }
+
+
+
+    @Override
+    public Integer connectionBandwidth() {
+        return this.inner().connectionBandwidth();
+    }
+
+    @Override
+    public VpnConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public Long egressBytesTransferred() {
+        return this.inner().egressBytesTransferred();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public Boolean enableRateLimiting() {
+        return this.inner().enableRateLimiting();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Long ingressBytesTransferred() {
+        return this.inner().ingressBytesTransferred();
+    }
+
+    @Override
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.inner().ipsecPolicies();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public Boolean useLocalAzureIpAddress() {
+        return this.inner().useLocalAzureIpAddress();
+    }
+
+    @Override
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.inner().usePolicyBasedTrafficSelectors();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType() {
+        return this.inner().vpnConnectionProtocolType();
+    }
+
+    @Override
+    public SubResource vpnSiteLink() {
+        return this.inner().vpnSiteLink();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl.java
new file mode 100644
index 000000000000..a3da0696b15b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionVpnGatewayVpnSiteLinkConnectionModel;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionStatus;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import com.microsoft.azure.SubResource;
+
+class VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl extends WrapperImpl<VpnSiteLinkConnectionInner> implements VpnConnectionVpnGatewayVpnSiteLinkConnectionModel {
+    private final NetworkManager manager;
+
+    VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl(VpnSiteLinkConnectionInner inner,  NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+
+
+    @Override
+    public Integer connectionBandwidth() {
+        return this.inner().connectionBandwidth();
+    }
+
+    @Override
+    public VpnConnectionStatus connectionStatus() {
+        return this.inner().connectionStatus();
+    }
+
+    @Override
+    public Long egressBytesTransferred() {
+        return this.inner().egressBytesTransferred();
+    }
+
+    @Override
+    public Boolean enableBgp() {
+        return this.inner().enableBgp();
+    }
+
+    @Override
+    public Boolean enableRateLimiting() {
+        return this.inner().enableRateLimiting();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Long ingressBytesTransferred() {
+        return this.inner().ingressBytesTransferred();
+    }
+
+    @Override
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.inner().ipsecPolicies();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public Integer routingWeight() {
+        return this.inner().routingWeight();
+    }
+
+    @Override
+    public String sharedKey() {
+        return this.inner().sharedKey();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public Boolean useLocalAzureIpAddress() {
+        return this.inner().useLocalAzureIpAddress();
+    }
+
+    @Override
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.inner().usePolicyBasedTrafficSelectors();
+    }
+
+    @Override
+    public VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType() {
+        return this.inner().vpnConnectionProtocolType();
+    }
+
+    @Override
+    public SubResource vpnSiteLink() {
+        return this.inner().vpnSiteLink();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsImpl.java
new file mode 100644
index 000000000000..879bb4037003
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsImpl.java
@@ -0,0 +1,85 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnections;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnection;
+
+class VpnConnectionsImpl extends WrapperImpl<VpnConnectionsInner> implements VpnConnections {
+    private final NetworkManager manager;
+
+    VpnConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().vpnConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public VpnConnectionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private VpnConnectionImpl wrapModel(VpnConnectionInner inner) {
+        return  new VpnConnectionImpl(inner, manager());
+    }
+
+    private VpnConnectionImpl wrapModel(String name) {
+        return new VpnConnectionImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<VpnConnection> listByVpnGatewayAsync(final String resourceGroupName, final String gatewayName) {
+        VpnConnectionsInner client = this.inner();
+        return client.listByVpnGatewayAsync(resourceGroupName, gatewayName)
+        .flatMapIterable(new Func1<Page<VpnConnectionInner>, Iterable<VpnConnectionInner>>() {
+            @Override
+            public Iterable<VpnConnectionInner> call(Page<VpnConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnConnectionInner, VpnConnection>() {
+            @Override
+            public VpnConnection call(VpnConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<VpnConnection> getAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        VpnConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, gatewayName, connectionName)
+        .flatMap(new Func1<VpnConnectionInner, Observable<VpnConnection>>() {
+            @Override
+            public Observable<VpnConnection> call(VpnConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VpnConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        VpnConnectionsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, gatewayName, connectionName).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsInner.java
new file mode 100644
index 000000000000..f78ffa46cc4f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnConnectionsInner.java
@@ -0,0 +1,764 @@
+/**
+ * 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.network.v2020_04_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.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 VpnConnections.
+ */
+public class VpnConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.VpnConnections createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @Query("api-version") String apiVersion, @Body VpnConnectionInner vpnConnectionParameters, @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.network.v2020_04_01.VpnConnections beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @Query("api-version") String apiVersion, @Body VpnConnectionInner vpnConnectionParameters, @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.network.v2020_04_01.VpnConnections delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.VpnConnections beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.VpnConnections listByVpnGateway" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections")
+        Observable<Response<ResponseBody>> listByVpnGateway(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnConnections listByVpnGatewayNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByVpnGatewayNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @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 VpnConnectionInner object if successful.
+     */
+    public VpnConnectionInner get(String resourceGroupName, String gatewayName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @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<VpnConnectionInner> getAsync(String resourceGroupName, String gatewayName, String connectionName, final ServiceCallback<VpnConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnConnectionInner object
+     */
+    public Observable<VpnConnectionInner> getAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).map(new Func1<ServiceResponse<VpnConnectionInner>, VpnConnectionInner>() {
+            @Override
+            public VpnConnectionInner call(ServiceResponse<VpnConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnConnectionInner object
+     */
+    public Observable<ServiceResponse<VpnConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @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 VpnConnectionInner object if successful.
+     */
+    public VpnConnectionInner createOrUpdate(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @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<VpnConnectionInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters, final ServiceCallback<VpnConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnConnectionInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters).map(new Func1<ServiceResponse<VpnConnectionInner>, VpnConnectionInner>() {
+            @Override
+            public VpnConnectionInner call(ServiceResponse<VpnConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnConnectionInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (vpnConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, apiVersion, vpnConnectionParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VpnConnectionInner>() { }.getType());
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @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 VpnConnectionInner object if successful.
+     */
+    public VpnConnectionInner beginCreateOrUpdate(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @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<VpnConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters, final ServiceCallback<VpnConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnConnectionInner object
+     */
+    public Observable<VpnConnectionInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, vpnConnectionParameters).map(new Func1<ServiceResponse<VpnConnectionInner>, VpnConnectionInner>() {
+            @Override
+            public VpnConnectionInner call(ServiceResponse<VpnConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @param vpnConnectionParameters Parameters supplied to create or Update a VPN Connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnConnectionInner object
+     */
+    public Observable<ServiceResponse<VpnConnectionInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName, VpnConnectionInner vpnConnectionParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (vpnConnectionParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnConnectionParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnConnectionParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, apiVersion, vpnConnectionParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnConnectionInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnConnectionInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnConnectionInner>() { }.getType())
+                .register(201, new TypeToken<VpnConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @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 gatewayName, String connectionName) {
+        deleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @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 gatewayName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @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 gatewayName, String connectionName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @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 gatewayName, String connectionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, 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);
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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;VpnConnectionInner&gt; object if successful.
+     */
+    public PagedList<VpnConnectionInner> listByVpnGateway(final String resourceGroupName, final String gatewayName) {
+        ServiceResponse<Page<VpnConnectionInner>> response = listByVpnGatewaySinglePageAsync(resourceGroupName, gatewayName).toBlocking().single();
+        return new PagedList<VpnConnectionInner>(response.body()) {
+            @Override
+            public Page<VpnConnectionInner> nextPage(String nextPageLink) {
+                return listByVpnGatewayNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<VpnConnectionInner>> listByVpnGatewayAsync(final String resourceGroupName, final String gatewayName, final ListOperationCallback<VpnConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnGatewaySinglePageAsync(resourceGroupName, gatewayName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(String nextPageLink) {
+                    return listByVpnGatewayNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnConnectionInner&gt; object
+     */
+    public Observable<Page<VpnConnectionInner>> listByVpnGatewayAsync(final String resourceGroupName, final String gatewayName) {
+        return listByVpnGatewayWithServiceResponseAsync(resourceGroupName, gatewayName)
+            .map(new Func1<ServiceResponse<Page<VpnConnectionInner>>, Page<VpnConnectionInner>>() {
+                @Override
+                public Page<VpnConnectionInner> call(ServiceResponse<Page<VpnConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnConnectionInner>>> listByVpnGatewayWithServiceResponseAsync(final String resourceGroupName, final String gatewayName) {
+        return listByVpnGatewaySinglePageAsync(resourceGroupName, gatewayName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnConnectionInner>>, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(ServiceResponse<Page<VpnConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnGatewayNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+    ServiceResponse<PageImpl<VpnConnectionInner>> * @param resourceGroupName The resource group name of the VpnGateway.
+    ServiceResponse<PageImpl<VpnConnectionInner>> * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnConnectionInner>>> listByVpnGatewaySinglePageAsync(final String resourceGroupName, final String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByVpnGateway(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnConnectionInner>> result = listByVpnGatewayDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnConnectionInner>> listByVpnGatewayDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @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;VpnConnectionInner&gt; object if successful.
+     */
+    public PagedList<VpnConnectionInner> listByVpnGatewayNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnConnectionInner>> response = listByVpnGatewayNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnConnectionInner>(response.body()) {
+            @Override
+            public Page<VpnConnectionInner> nextPage(String nextPageLink) {
+                return listByVpnGatewayNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @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<VpnConnectionInner>> listByVpnGatewayNextAsync(final String nextPageLink, final ServiceFuture<List<VpnConnectionInner>> serviceFuture, final ListOperationCallback<VpnConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnGatewayNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(String nextPageLink) {
+                    return listByVpnGatewayNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @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;VpnConnectionInner&gt; object
+     */
+    public Observable<Page<VpnConnectionInner>> listByVpnGatewayNextAsync(final String nextPageLink) {
+        return listByVpnGatewayNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnConnectionInner>>, Page<VpnConnectionInner>>() {
+                @Override
+                public Page<VpnConnectionInner> call(ServiceResponse<Page<VpnConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+     * @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;VpnConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnConnectionInner>>> listByVpnGatewayNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByVpnGatewayNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnConnectionInner>>, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(ServiceResponse<Page<VpnConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnGatewayNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn connections for a particular virtual wan vpn gateway.
+     *
+    ServiceResponse<PageImpl<VpnConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnConnectionInner>>> listByVpnGatewayNextSinglePageAsync(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.listByVpnGatewayNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnConnectionInner>> result = listByVpnGatewayNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnConnectionInner>> listByVpnGatewayNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayImpl.java
new file mode 100644
index 000000000000..31af964dc2d4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayImpl.java
@@ -0,0 +1,112 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGateway;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnection;
+
+class VpnGatewayImpl extends GroupableResourceCoreImpl<VpnGateway, VpnGatewayInner, VpnGatewayImpl, NetworkManager> implements VpnGateway, VpnGateway.Definition, VpnGateway.Update {
+    VpnGatewayImpl(String name, VpnGatewayInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VpnGateway> createResourceAsync() {
+        VpnGatewaysInner client = this.manager().inner().vpnGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VpnGateway> updateResourceAsync() {
+        VpnGatewaysInner client = this.manager().inner().vpnGateways();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VpnGatewayInner> getInnerAsync() {
+        VpnGatewaysInner client = this.manager().inner().vpnGateways();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public BgpSettings bgpSettings() {
+        return this.inner().bgpSettings();
+    }
+
+    @Override
+    public List<VpnConnection> connections() {
+        List<VpnConnection> lst = new ArrayList<VpnConnection>();
+        if (this.inner().connections() != null) {
+            for (VpnConnectionInner inner : this.inner().connections()) {
+                lst.add( new VpnConnectionImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public SubResource virtualHub() {
+        return this.inner().virtualHub();
+    }
+
+    @Override
+    public Integer vpnGatewayScaleUnit() {
+        return this.inner().vpnGatewayScaleUnit();
+    }
+
+    @Override
+    public VpnGatewayImpl withBgpSettings(BgpSettings bgpSettings) {
+        this.inner().withBgpSettings(bgpSettings);
+        return this;
+    }
+
+    @Override
+    public VpnGatewayImpl withConnections(List<VpnConnectionInner> connections) {
+        this.inner().withConnections(connections);
+        return this;
+    }
+
+    @Override
+    public VpnGatewayImpl withVirtualHub(SubResource virtualHub) {
+        this.inner().withVirtualHub(virtualHub);
+        return this;
+    }
+
+    @Override
+    public VpnGatewayImpl withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit) {
+        this.inner().withVpnGatewayScaleUnit(vpnGatewayScaleUnit);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayInner.java
new file mode 100644
index 000000000000..7224230ffcdd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewayInner.java
@@ -0,0 +1,187 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VpnGateway Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VpnGatewayInner extends Resource {
+    /**
+     * The VirtualHub to which the gateway belongs.
+     */
+    @JsonProperty(value = "properties.virtualHub")
+    private SubResource virtualHub;
+
+    /**
+     * List of all vpn connections to the gateway.
+     */
+    @JsonProperty(value = "properties.connections")
+    private List<VpnConnectionInner> connections;
+
+    /**
+     * Local network gateway's BGP speaker settings.
+     */
+    @JsonProperty(value = "properties.bgpSettings")
+    private BgpSettings bgpSettings;
+
+    /**
+     * The provisioning state of the VPN gateway resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The scale unit for this vpn gateway.
+     */
+    @JsonProperty(value = "properties.vpnGatewayScaleUnit")
+    private Integer vpnGatewayScaleUnit;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the VirtualHub to which the gateway belongs.
+     *
+     * @return the virtualHub value
+     */
+    public SubResource virtualHub() {
+        return this.virtualHub;
+    }
+
+    /**
+     * Set the VirtualHub to which the gateway belongs.
+     *
+     * @param virtualHub the virtualHub value to set
+     * @return the VpnGatewayInner object itself.
+     */
+    public VpnGatewayInner withVirtualHub(SubResource virtualHub) {
+        this.virtualHub = virtualHub;
+        return this;
+    }
+
+    /**
+     * Get list of all vpn connections to the gateway.
+     *
+     * @return the connections value
+     */
+    public List<VpnConnectionInner> connections() {
+        return this.connections;
+    }
+
+    /**
+     * Set list of all vpn connections to the gateway.
+     *
+     * @param connections the connections value to set
+     * @return the VpnGatewayInner object itself.
+     */
+    public VpnGatewayInner withConnections(List<VpnConnectionInner> connections) {
+        this.connections = connections;
+        return this;
+    }
+
+    /**
+     * Get local network gateway's BGP speaker settings.
+     *
+     * @return the bgpSettings value
+     */
+    public BgpSettings bgpSettings() {
+        return this.bgpSettings;
+    }
+
+    /**
+     * Set local network gateway's BGP speaker settings.
+     *
+     * @param bgpSettings the bgpSettings value to set
+     * @return the VpnGatewayInner object itself.
+     */
+    public VpnGatewayInner withBgpSettings(BgpSettings bgpSettings) {
+        this.bgpSettings = bgpSettings;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN gateway resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the scale unit for this vpn gateway.
+     *
+     * @return the vpnGatewayScaleUnit value
+     */
+    public Integer vpnGatewayScaleUnit() {
+        return this.vpnGatewayScaleUnit;
+    }
+
+    /**
+     * Set the scale unit for this vpn gateway.
+     *
+     * @param vpnGatewayScaleUnit the vpnGatewayScaleUnit value to set
+     * @return the VpnGatewayInner object itself.
+     */
+    public VpnGatewayInner withVpnGatewayScaleUnit(Integer vpnGatewayScaleUnit) {
+        this.vpnGatewayScaleUnit = vpnGatewayScaleUnit;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VpnGatewayInner object itself.
+     */
+    public VpnGatewayInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysImpl.java
new file mode 100644
index 000000000000..bfba23e50372
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGateways;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGateway;
+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;
+
+class VpnGatewaysImpl extends GroupableResourcesCoreImpl<VpnGateway, VpnGatewayImpl, VpnGatewayInner, VpnGatewaysInner, NetworkManager>  implements VpnGateways {
+    protected VpnGatewaysImpl(NetworkManager manager) {
+        super(manager.inner().vpnGateways(), manager);
+    }
+
+    @Override
+    protected Observable<VpnGatewayInner> getInnerAsync(String resourceGroupName, String name) {
+        VpnGatewaysInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VpnGatewaysInner 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<VpnGateway> listByResourceGroup(String resourceGroupName) {
+        VpnGatewaysInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VpnGateway> listByResourceGroupAsync(String resourceGroupName) {
+        VpnGatewaysInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VpnGatewayInner>, Iterable<VpnGatewayInner>>() {
+            @Override
+            public Iterable<VpnGatewayInner> call(Page<VpnGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnGatewayInner, VpnGateway>() {
+            @Override
+            public VpnGateway call(VpnGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VpnGateway> list() {
+        VpnGatewaysInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VpnGateway> listAsync() {
+        VpnGatewaysInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VpnGatewayInner>, Iterable<VpnGatewayInner>>() {
+            @Override
+            public Iterable<VpnGatewayInner> call(Page<VpnGatewayInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnGatewayInner, VpnGateway>() {
+            @Override
+            public VpnGateway call(VpnGatewayInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VpnGatewayImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<VpnGateway> resetAsync(String resourceGroupName, String gatewayName) {
+        VpnGatewaysInner client = this.inner();
+        return client.resetAsync(resourceGroupName, gatewayName)
+        .map(new Func1<VpnGatewayInner, VpnGateway>() {
+            @Override
+            public VpnGateway call(VpnGatewayInner inner) {
+                return new VpnGatewayImpl(inner.name(), inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected VpnGatewayImpl wrapModel(VpnGatewayInner inner) {
+        return  new VpnGatewayImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VpnGatewayImpl wrapModel(String name) {
+        return new VpnGatewayImpl(name, new VpnGatewayInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysInner.java
new file mode 100644
index 000000000000..c6cc5cc2d0cb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnGatewaysInner.java
@@ -0,0 +1,1289 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VpnGateways.
+ */
+public class VpnGatewaysInner implements InnerSupportsGet<VpnGatewayInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VpnGatewayInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VpnGatewaysService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnGatewaysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnGatewaysInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnGatewaysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnGateways to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnGatewaysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnGateways getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnGateways createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Body VpnGatewayInner vpnGatewayParameters, @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.network.v2020_04_01.VpnGateways beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Body VpnGatewayInner vpnGatewayParameters, @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.network.v2020_04_01.VpnGateways updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject vpnGatewayParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnGateways delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnGateways beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnGateways reset" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/reset")
+        Observable<Response<ResponseBody>> reset(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnGateways beginReset" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/reset")
+        Observable<Response<ResponseBody>> beginReset(@Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @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.network.v2020_04_01.VpnGateways listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways")
+        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.network.v2020_04_01.VpnGateways list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/vpnGateways")
+        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.network.v2020_04_01.VpnGateways 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.network.v2020_04_01.VpnGateways listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner getByResourceGroup(String resourceGroupName, String gatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<VpnGatewayInner> getByResourceGroupAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<VpnGatewayInner> getByResourceGroupAsync(String resourceGroupName, String gatewayName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnGatewayInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnGatewayInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner createOrUpdate(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @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<VpnGatewayInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnGatewayInner> createOrUpdateAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (vpnGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, vpnGatewayParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VpnGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner beginCreateOrUpdate(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @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<VpnGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<VpnGatewayInner> beginCreateOrUpdateAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, gatewayName, vpnGatewayParameters).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a virtual wan vpn gateway if it doesn't exist else updates the existing gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param vpnGatewayParameters Parameters supplied to create or Update a virtual wan vpn gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String gatewayName, VpnGatewayInner vpnGatewayParameters) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (vpnGatewayParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnGatewayParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnGatewayParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, vpnGatewayParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnGatewayInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnGatewayInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnGatewayInner>() { }.getType())
+                .register(201, new TypeToken<VpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner updateTags(String resourceGroupName, String gatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<VpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<VpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject vpnGatewayParameters = new TagsObject();
+        vpnGatewayParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), vpnGatewayParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner updateTags(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @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<VpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, Map<String, String> tags, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<VpnGatewayInner> updateTagsAsync(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, gatewayName, tags).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates virtual wan vpn gateway tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String gatewayName, Map<String, String> tags) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject vpnGatewayParameters = new TagsObject();
+        vpnGatewayParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), vpnGatewayParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnGatewayInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnGatewayInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnGatewayInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName) {
+        deleteWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String gatewayName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, gatewayName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 gatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String gatewayName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a virtual wan vpn gateway.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, gatewayName, 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);
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner reset(String resourceGroupName, String gatewayName) {
+        return resetWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<VpnGatewayInner> resetAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(resetWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnGatewayInner> resetAsync(String resourceGroupName, String gatewayName) {
+        return resetWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> resetWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.reset(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnGatewayInner>() { }.getType());
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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 VpnGatewayInner object if successful.
+     */
+    public VpnGatewayInner beginReset(String resourceGroupName, String gatewayName) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, gatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @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<VpnGatewayInner> beginResetAsync(String resourceGroupName, String gatewayName, final ServiceCallback<VpnGatewayInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetWithServiceResponseAsync(resourceGroupName, gatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<VpnGatewayInner> beginResetAsync(String resourceGroupName, String gatewayName) {
+        return beginResetWithServiceResponseAsync(resourceGroupName, gatewayName).map(new Func1<ServiceResponse<VpnGatewayInner>, VpnGatewayInner>() {
+            @Override
+            public VpnGatewayInner call(ServiceResponse<VpnGatewayInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the primary of the vpn gateway in the specified resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnGatewayInner object
+     */
+    public Observable<ServiceResponse<VpnGatewayInner>> beginResetWithServiceResponseAsync(String resourceGroupName, String gatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginReset(resourceGroupName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnGatewayInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnGatewayInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnGatewayInner> clientResponse = beginResetDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnGatewayInner> beginResetDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnGatewayInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnGatewayInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @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;VpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<VpnGatewayInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VpnGatewayInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VpnGatewayInner>(response.body()) {
+            @Override
+            public Page<VpnGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @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<VpnGatewayInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnGatewayInner&gt; object
+     */
+    public Observable<Page<VpnGatewayInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Page<VpnGatewayInner>>() {
+                @Override
+                public Page<VpnGatewayInner> call(ServiceResponse<Page<VpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(ServiceResponse<Page<VpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnGatewayInner>> * @param resourceGroupName The resource group name of the VpnGateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnGatewayInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnGatewayInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnGateways in a 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;VpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<VpnGatewayInner> list() {
+        ServiceResponse<Page<VpnGatewayInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VpnGatewayInner>(response.body()) {
+            @Override
+            public Page<VpnGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnGateways in a 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<VpnGatewayInner>> listAsync(final ListOperationCallback<VpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnGatewayInner&gt; object
+     */
+    public Observable<Page<VpnGatewayInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Page<VpnGatewayInner>>() {
+                @Override
+                public Page<VpnGatewayInner> call(ServiceResponse<Page<VpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(ServiceResponse<Page<VpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnGatewayInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnGatewayInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnGateways in 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;VpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<VpnGatewayInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnGatewayInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnGatewayInner>(response.body()) {
+            @Override
+            public Page<VpnGatewayInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnGateways in 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<VpnGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VpnGatewayInner>> serviceFuture, final ListOperationCallback<VpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnGateways in 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;VpnGatewayInner&gt; object
+     */
+    public Observable<Page<VpnGatewayInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Page<VpnGatewayInner>>() {
+                @Override
+                public Page<VpnGatewayInner> call(ServiceResponse<Page<VpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in 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;VpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(ServiceResponse<Page<VpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> 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<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnGatewayInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnGatewayInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @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;VpnGatewayInner&gt; object if successful.
+     */
+    public PagedList<VpnGatewayInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnGatewayInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnGatewayInner>(response.body()) {
+            @Override
+            public Page<VpnGatewayInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @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<VpnGatewayInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VpnGatewayInner>> serviceFuture, final ListOperationCallback<VpnGatewayInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @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;VpnGatewayInner&gt; object
+     */
+    public Observable<Page<VpnGatewayInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Page<VpnGatewayInner>>() {
+                @Override
+                public Page<VpnGatewayInner> call(ServiceResponse<Page<VpnGatewayInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+     * @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;VpnGatewayInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnGatewayInner>>, Observable<ServiceResponse<Page<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(ServiceResponse<Page<VpnGatewayInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnGateways in a subscription.
+     *
+    ServiceResponse<PageImpl<VpnGatewayInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnGatewayInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnGatewayInner>>> 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<VpnGatewayInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnGatewayInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnGatewayInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnGatewayInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnGatewayInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnGatewayInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnGatewayInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsImpl.java
new file mode 100644
index 000000000000..6a434631dfc1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkConnections;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionVpnGatewayVpnSiteLinkConnectionModel;
+
+class VpnLinkConnectionsImpl extends WrapperImpl<VpnLinkConnectionsInner> implements VpnLinkConnections {
+    private final NetworkManager manager;
+
+    VpnLinkConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().vpnLinkConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl wrapModel(VpnSiteLinkConnectionInner inner) {
+        return  new VpnConnectionVpnGatewayVpnSiteLinkConnectionModelImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VpnConnectionVpnGatewayVpnSiteLinkConnectionModel> listByVpnConnectionAsync(final String resourceGroupName, final String gatewayName, final String connectionName) {
+        VpnLinkConnectionsInner client = this.inner();
+        return client.listByVpnConnectionAsync(resourceGroupName, gatewayName, connectionName)
+        .flatMapIterable(new Func1<Page<VpnSiteLinkConnectionInner>, Iterable<VpnSiteLinkConnectionInner>>() {
+            @Override
+            public Iterable<VpnSiteLinkConnectionInner> call(Page<VpnSiteLinkConnectionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnSiteLinkConnectionInner, VpnConnectionVpnGatewayVpnSiteLinkConnectionModel>() {
+            @Override
+            public VpnConnectionVpnGatewayVpnSiteLinkConnectionModel call(VpnSiteLinkConnectionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsInner.java
new file mode 100644
index 000000000000..72e75006ffc5
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnLinkConnectionsInner.java
@@ -0,0 +1,309 @@
+/**
+ * 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.network.v2020_04_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.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 VpnLinkConnections.
+ */
+public class VpnLinkConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnLinkConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnLinkConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnLinkConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnLinkConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnLinkConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnLinkConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnLinkConnections listByVpnConnection" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections")
+        Observable<Response<ResponseBody>> listByVpnConnection(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @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.network.v2020_04_01.VpnLinkConnections listByVpnConnectionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByVpnConnectionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @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;VpnSiteLinkConnectionInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteLinkConnectionInner> listByVpnConnection(final String resourceGroupName, final String gatewayName, final String connectionName) {
+        ServiceResponse<Page<VpnSiteLinkConnectionInner>> response = listByVpnConnectionSinglePageAsync(resourceGroupName, gatewayName, connectionName).toBlocking().single();
+        return new PagedList<VpnSiteLinkConnectionInner>(response.body()) {
+            @Override
+            public Page<VpnSiteLinkConnectionInner> nextPage(String nextPageLink) {
+                return listByVpnConnectionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @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<VpnSiteLinkConnectionInner>> listByVpnConnectionAsync(final String resourceGroupName, final String gatewayName, final String connectionName, final ListOperationCallback<VpnSiteLinkConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnConnectionSinglePageAsync(resourceGroupName, gatewayName, connectionName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(String nextPageLink) {
+                    return listByVpnConnectionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteLinkConnectionInner&gt; object
+     */
+    public Observable<Page<VpnSiteLinkConnectionInner>> listByVpnConnectionAsync(final String resourceGroupName, final String gatewayName, final String connectionName) {
+        return listByVpnConnectionWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName)
+            .map(new Func1<ServiceResponse<Page<VpnSiteLinkConnectionInner>>, Page<VpnSiteLinkConnectionInner>>() {
+                @Override
+                public Page<VpnSiteLinkConnectionInner> call(ServiceResponse<Page<VpnSiteLinkConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteLinkConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> listByVpnConnectionWithServiceResponseAsync(final String resourceGroupName, final String gatewayName, final String connectionName) {
+        return listByVpnConnectionSinglePageAsync(resourceGroupName, gatewayName, connectionName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteLinkConnectionInner>>, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(ServiceResponse<Page<VpnSiteLinkConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnConnectionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+    ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> * @param resourceGroupName The resource group name of the VpnGateway.
+    ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> * @param gatewayName The name of the gateway.
+    ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> * @param connectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteLinkConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> listByVpnConnectionSinglePageAsync(final String resourceGroupName, final String gatewayName, final String connectionName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByVpnConnection(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> result = listByVpnConnectionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteLinkConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> listByVpnConnectionDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteLinkConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteLinkConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @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;VpnSiteLinkConnectionInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteLinkConnectionInner> listByVpnConnectionNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnSiteLinkConnectionInner>> response = listByVpnConnectionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnSiteLinkConnectionInner>(response.body()) {
+            @Override
+            public Page<VpnSiteLinkConnectionInner> nextPage(String nextPageLink) {
+                return listByVpnConnectionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @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<VpnSiteLinkConnectionInner>> listByVpnConnectionNextAsync(final String nextPageLink, final ServiceFuture<List<VpnSiteLinkConnectionInner>> serviceFuture, final ListOperationCallback<VpnSiteLinkConnectionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnConnectionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(String nextPageLink) {
+                    return listByVpnConnectionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @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;VpnSiteLinkConnectionInner&gt; object
+     */
+    public Observable<Page<VpnSiteLinkConnectionInner>> listByVpnConnectionNextAsync(final String nextPageLink) {
+        return listByVpnConnectionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnSiteLinkConnectionInner>>, Page<VpnSiteLinkConnectionInner>>() {
+                @Override
+                public Page<VpnSiteLinkConnectionInner> call(ServiceResponse<Page<VpnSiteLinkConnectionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+     * @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;VpnSiteLinkConnectionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> listByVpnConnectionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByVpnConnectionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteLinkConnectionInner>>, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(ServiceResponse<Page<VpnSiteLinkConnectionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnConnectionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.
+     *
+    ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteLinkConnectionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> listByVpnConnectionNextSinglePageAsync(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.listByVpnConnectionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkConnectionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> result = listByVpnConnectionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteLinkConnectionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteLinkConnectionInner>> listByVpnConnectionNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteLinkConnectionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteLinkConnectionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseImpl.java
new file mode 100644
index 000000000000..f82d36bc0fdb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseImpl.java
@@ -0,0 +1,31 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnProfileResponse;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class VpnProfileResponseImpl extends WrapperImpl<VpnProfileResponseInner> implements VpnProfileResponse {
+    private final NetworkManager manager;
+    VpnProfileResponseImpl(VpnProfileResponseInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String profileUrl() {
+        return this.inner().profileUrl();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseInner.java
new file mode 100644
index 000000000000..8c05c7ce629b
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnProfileResponseInner.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.network.v2020_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Vpn Profile Response for package generation.
+ */
+public class VpnProfileResponseInner {
+    /**
+     * URL to the VPN profile.
+     */
+    @JsonProperty(value = "profileUrl")
+    private String profileUrl;
+
+    /**
+     * Get uRL to the VPN profile.
+     *
+     * @return the profileUrl value
+     */
+    public String profileUrl() {
+        return this.profileUrl;
+    }
+
+    /**
+     * Set uRL to the VPN profile.
+     *
+     * @param profileUrl the profileUrl value to set
+     * @return the VpnProfileResponseInner object itself.
+     */
+    public VpnProfileResponseInner withProfileUrl(String profileUrl) {
+        this.profileUrl = profileUrl;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationImpl.java
new file mode 100644
index 000000000000..e7db41b36da1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationImpl.java
@@ -0,0 +1,216 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfiguration;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGatewayTunnelingProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VpnAuthenticationType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigVpnClientRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigVpnClientRevokedCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigRadiusServerRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigRadiusClientRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.RadiusServer;
+import com.microsoft.azure.management.network.v2020_04_01.AadAuthenticationParameters;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.P2SVpnGateway;
+
+class VpnServerConfigurationImpl extends GroupableResourceCoreImpl<VpnServerConfiguration, VpnServerConfigurationInner, VpnServerConfigurationImpl, NetworkManager> implements VpnServerConfiguration, VpnServerConfiguration.Definition, VpnServerConfiguration.Update {
+    VpnServerConfigurationImpl(String name, VpnServerConfigurationInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VpnServerConfiguration> createResourceAsync() {
+        VpnServerConfigurationsInner client = this.manager().inner().vpnServerConfigurations();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VpnServerConfiguration> updateResourceAsync() {
+        VpnServerConfigurationsInner client = this.manager().inner().vpnServerConfigurations();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VpnServerConfigurationInner> getInnerAsync() {
+        VpnServerConfigurationsInner client = this.manager().inner().vpnServerConfigurations();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public AadAuthenticationParameters aadAuthenticationParameters() {
+        return this.inner().aadAuthenticationParameters();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<P2SVpnGateway> p2SVpnGateways() {
+        List<P2SVpnGateway> lst = new ArrayList<P2SVpnGateway>();
+        if (this.inner().p2SVpnGateways() != null) {
+            for (P2SVpnGatewayInner inner : this.inner().p2SVpnGateways()) {
+                lst.add( new P2SVpnGatewayImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates() {
+        return this.inner().radiusClientRootCertificates();
+    }
+
+    @Override
+    public String radiusServerAddress() {
+        return this.inner().radiusServerAddress();
+    }
+
+    @Override
+    public List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates() {
+        return this.inner().radiusServerRootCertificates();
+    }
+
+    @Override
+    public List<RadiusServer> radiusServers() {
+        return this.inner().radiusServers();
+    }
+
+    @Override
+    public String radiusServerSecret() {
+        return this.inner().radiusServerSecret();
+    }
+
+    @Override
+    public List<VpnAuthenticationType> vpnAuthenticationTypes() {
+        return this.inner().vpnAuthenticationTypes();
+    }
+
+    @Override
+    public List<IpsecPolicy> vpnClientIpsecPolicies() {
+        return this.inner().vpnClientIpsecPolicies();
+    }
+
+    @Override
+    public List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates() {
+        return this.inner().vpnClientRevokedCertificates();
+    }
+
+    @Override
+    public List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates() {
+        return this.inner().vpnClientRootCertificates();
+    }
+
+    @Override
+    public List<VpnGatewayTunnelingProtocol> vpnProtocols() {
+        return this.inner().vpnProtocols();
+    }
+
+    @Override
+    public String vpnServerConfigurationName() {
+        return this.inner().vpnServerConfigurationName();
+    }
+
+    @Override
+    public String vpnServerConfigurationPropertiesEtag() {
+        return this.inner().vpnServerConfigurationPropertiesEtag();
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withAadAuthenticationParameters(AadAuthenticationParameters aadAuthenticationParameters) {
+        this.inner().withAadAuthenticationParameters(aadAuthenticationParameters);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withRadiusClientRootCertificates(List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates) {
+        this.inner().withRadiusClientRootCertificates(radiusClientRootCertificates);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withRadiusServerAddress(String radiusServerAddress) {
+        this.inner().withRadiusServerAddress(radiusServerAddress);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withRadiusServerRootCertificates(List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates) {
+        this.inner().withRadiusServerRootCertificates(radiusServerRootCertificates);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withRadiusServers(List<RadiusServer> radiusServers) {
+        this.inner().withRadiusServers(radiusServers);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withRadiusServerSecret(String radiusServerSecret) {
+        this.inner().withRadiusServerSecret(radiusServerSecret);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnAuthenticationTypes(List<VpnAuthenticationType> vpnAuthenticationTypes) {
+        this.inner().withVpnAuthenticationTypes(vpnAuthenticationTypes);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnClientIpsecPolicies(List<IpsecPolicy> vpnClientIpsecPolicies) {
+        this.inner().withVpnClientIpsecPolicies(vpnClientIpsecPolicies);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnClientRevokedCertificates(List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates) {
+        this.inner().withVpnClientRevokedCertificates(vpnClientRevokedCertificates);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnClientRootCertificates(List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates) {
+        this.inner().withVpnClientRootCertificates(vpnClientRootCertificates);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnProtocols(List<VpnGatewayTunnelingProtocol> vpnProtocols) {
+        this.inner().withVpnProtocols(vpnProtocols);
+        return this;
+    }
+
+    @Override
+    public VpnServerConfigurationImpl withVpnServerConfigurationName(String vpnServerConfigurationName) {
+        this.inner().withVpnServerConfigurationName(vpnServerConfigurationName);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationInner.java
new file mode 100644
index 000000000000..a335d7200470
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationInner.java
@@ -0,0 +1,434 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.VpnGatewayTunnelingProtocol;
+import com.microsoft.azure.management.network.v2020_04_01.VpnAuthenticationType;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigVpnClientRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigVpnClientRevokedCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigRadiusServerRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigRadiusClientRootCertificate;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.RadiusServer;
+import com.microsoft.azure.management.network.v2020_04_01.AadAuthenticationParameters;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VpnServerConfiguration Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VpnServerConfigurationInner extends Resource {
+    /**
+     * The name of the VpnServerConfiguration that is unique within a resource
+     * group.
+     */
+    @JsonProperty(value = "properties.name")
+    private String vpnServerConfigurationName;
+
+    /**
+     * VPN protocols for the VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.vpnProtocols")
+    private List<VpnGatewayTunnelingProtocol> vpnProtocols;
+
+    /**
+     * VPN authentication types for the VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.vpnAuthenticationTypes")
+    private List<VpnAuthenticationType> vpnAuthenticationTypes;
+
+    /**
+     * VPN client root certificate of VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.vpnClientRootCertificates")
+    private List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates;
+
+    /**
+     * VPN client revoked certificate of VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.vpnClientRevokedCertificates")
+    private List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates;
+
+    /**
+     * Radius Server root certificate of VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.radiusServerRootCertificates")
+    private List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates;
+
+    /**
+     * Radius client root certificate of VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.radiusClientRootCertificates")
+    private List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates;
+
+    /**
+     * VpnClientIpsecPolicies for VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.vpnClientIpsecPolicies")
+    private List<IpsecPolicy> vpnClientIpsecPolicies;
+
+    /**
+     * The radius server address property of the VpnServerConfiguration
+     * resource for point to site client connection.
+     */
+    @JsonProperty(value = "properties.radiusServerAddress")
+    private String radiusServerAddress;
+
+    /**
+     * The radius secret property of the VpnServerConfiguration resource for
+     * point to site client connection.
+     */
+    @JsonProperty(value = "properties.radiusServerSecret")
+    private String radiusServerSecret;
+
+    /**
+     * Multiple Radius Server configuration for VpnServerConfiguration.
+     */
+    @JsonProperty(value = "properties.radiusServers")
+    private List<RadiusServer> radiusServers;
+
+    /**
+     * The set of aad vpn authentication parameters.
+     */
+    @JsonProperty(value = "properties.aadAuthenticationParameters")
+    private AadAuthenticationParameters aadAuthenticationParameters;
+
+    /**
+     * The provisioning state of the VpnServerConfiguration resource. Possible
+     * values are: 'Updating', 'Deleting', and 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * List of references to P2SVpnGateways.
+     */
+    @JsonProperty(value = "properties.p2SVpnGateways", access = JsonProperty.Access.WRITE_ONLY)
+    private List<P2SVpnGatewayInner> p2SVpnGateways;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "properties.etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String vpnServerConfigurationPropertiesEtag;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the name of the VpnServerConfiguration that is unique within a resource group.
+     *
+     * @return the vpnServerConfigurationName value
+     */
+    public String vpnServerConfigurationName() {
+        return this.vpnServerConfigurationName;
+    }
+
+    /**
+     * Set the name of the VpnServerConfiguration that is unique within a resource group.
+     *
+     * @param vpnServerConfigurationName the vpnServerConfigurationName value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnServerConfigurationName(String vpnServerConfigurationName) {
+        this.vpnServerConfigurationName = vpnServerConfigurationName;
+        return this;
+    }
+
+    /**
+     * Get vPN protocols for the VpnServerConfiguration.
+     *
+     * @return the vpnProtocols value
+     */
+    public List<VpnGatewayTunnelingProtocol> vpnProtocols() {
+        return this.vpnProtocols;
+    }
+
+    /**
+     * Set vPN protocols for the VpnServerConfiguration.
+     *
+     * @param vpnProtocols the vpnProtocols value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnProtocols(List<VpnGatewayTunnelingProtocol> vpnProtocols) {
+        this.vpnProtocols = vpnProtocols;
+        return this;
+    }
+
+    /**
+     * Get vPN authentication types for the VpnServerConfiguration.
+     *
+     * @return the vpnAuthenticationTypes value
+     */
+    public List<VpnAuthenticationType> vpnAuthenticationTypes() {
+        return this.vpnAuthenticationTypes;
+    }
+
+    /**
+     * Set vPN authentication types for the VpnServerConfiguration.
+     *
+     * @param vpnAuthenticationTypes the vpnAuthenticationTypes value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnAuthenticationTypes(List<VpnAuthenticationType> vpnAuthenticationTypes) {
+        this.vpnAuthenticationTypes = vpnAuthenticationTypes;
+        return this;
+    }
+
+    /**
+     * Get vPN client root certificate of VpnServerConfiguration.
+     *
+     * @return the vpnClientRootCertificates value
+     */
+    public List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates() {
+        return this.vpnClientRootCertificates;
+    }
+
+    /**
+     * Set vPN client root certificate of VpnServerConfiguration.
+     *
+     * @param vpnClientRootCertificates the vpnClientRootCertificates value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnClientRootCertificates(List<VpnServerConfigVpnClientRootCertificate> vpnClientRootCertificates) {
+        this.vpnClientRootCertificates = vpnClientRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get vPN client revoked certificate of VpnServerConfiguration.
+     *
+     * @return the vpnClientRevokedCertificates value
+     */
+    public List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates() {
+        return this.vpnClientRevokedCertificates;
+    }
+
+    /**
+     * Set vPN client revoked certificate of VpnServerConfiguration.
+     *
+     * @param vpnClientRevokedCertificates the vpnClientRevokedCertificates value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnClientRevokedCertificates(List<VpnServerConfigVpnClientRevokedCertificate> vpnClientRevokedCertificates) {
+        this.vpnClientRevokedCertificates = vpnClientRevokedCertificates;
+        return this;
+    }
+
+    /**
+     * Get radius Server root certificate of VpnServerConfiguration.
+     *
+     * @return the radiusServerRootCertificates value
+     */
+    public List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates() {
+        return this.radiusServerRootCertificates;
+    }
+
+    /**
+     * Set radius Server root certificate of VpnServerConfiguration.
+     *
+     * @param radiusServerRootCertificates the radiusServerRootCertificates value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withRadiusServerRootCertificates(List<VpnServerConfigRadiusServerRootCertificate> radiusServerRootCertificates) {
+        this.radiusServerRootCertificates = radiusServerRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get radius client root certificate of VpnServerConfiguration.
+     *
+     * @return the radiusClientRootCertificates value
+     */
+    public List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates() {
+        return this.radiusClientRootCertificates;
+    }
+
+    /**
+     * Set radius client root certificate of VpnServerConfiguration.
+     *
+     * @param radiusClientRootCertificates the radiusClientRootCertificates value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withRadiusClientRootCertificates(List<VpnServerConfigRadiusClientRootCertificate> radiusClientRootCertificates) {
+        this.radiusClientRootCertificates = radiusClientRootCertificates;
+        return this;
+    }
+
+    /**
+     * Get vpnClientIpsecPolicies for VpnServerConfiguration.
+     *
+     * @return the vpnClientIpsecPolicies value
+     */
+    public List<IpsecPolicy> vpnClientIpsecPolicies() {
+        return this.vpnClientIpsecPolicies;
+    }
+
+    /**
+     * Set vpnClientIpsecPolicies for VpnServerConfiguration.
+     *
+     * @param vpnClientIpsecPolicies the vpnClientIpsecPolicies value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withVpnClientIpsecPolicies(List<IpsecPolicy> vpnClientIpsecPolicies) {
+        this.vpnClientIpsecPolicies = vpnClientIpsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get the radius server address property of the VpnServerConfiguration resource for point to site client connection.
+     *
+     * @return the radiusServerAddress value
+     */
+    public String radiusServerAddress() {
+        return this.radiusServerAddress;
+    }
+
+    /**
+     * Set the radius server address property of the VpnServerConfiguration resource for point to site client connection.
+     *
+     * @param radiusServerAddress the radiusServerAddress value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withRadiusServerAddress(String radiusServerAddress) {
+        this.radiusServerAddress = radiusServerAddress;
+        return this;
+    }
+
+    /**
+     * Get the radius secret property of the VpnServerConfiguration resource for point to site client connection.
+     *
+     * @return the radiusServerSecret value
+     */
+    public String radiusServerSecret() {
+        return this.radiusServerSecret;
+    }
+
+    /**
+     * Set the radius secret property of the VpnServerConfiguration resource for point to site client connection.
+     *
+     * @param radiusServerSecret the radiusServerSecret value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withRadiusServerSecret(String radiusServerSecret) {
+        this.radiusServerSecret = radiusServerSecret;
+        return this;
+    }
+
+    /**
+     * Get multiple Radius Server configuration for VpnServerConfiguration.
+     *
+     * @return the radiusServers value
+     */
+    public List<RadiusServer> radiusServers() {
+        return this.radiusServers;
+    }
+
+    /**
+     * Set multiple Radius Server configuration for VpnServerConfiguration.
+     *
+     * @param radiusServers the radiusServers value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withRadiusServers(List<RadiusServer> radiusServers) {
+        this.radiusServers = radiusServers;
+        return this;
+    }
+
+    /**
+     * Get the set of aad vpn authentication parameters.
+     *
+     * @return the aadAuthenticationParameters value
+     */
+    public AadAuthenticationParameters aadAuthenticationParameters() {
+        return this.aadAuthenticationParameters;
+    }
+
+    /**
+     * Set the set of aad vpn authentication parameters.
+     *
+     * @param aadAuthenticationParameters the aadAuthenticationParameters value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withAadAuthenticationParameters(AadAuthenticationParameters aadAuthenticationParameters) {
+        this.aadAuthenticationParameters = aadAuthenticationParameters;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VpnServerConfiguration resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get list of references to P2SVpnGateways.
+     *
+     * @return the p2SVpnGateways value
+     */
+    public List<P2SVpnGatewayInner> p2SVpnGateways() {
+        return this.p2SVpnGateways;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the vpnServerConfigurationPropertiesEtag value
+     */
+    public String vpnServerConfigurationPropertiesEtag() {
+        return this.vpnServerConfigurationPropertiesEtag;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VpnServerConfigurationInner object itself.
+     */
+    public VpnServerConfigurationInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansImpl.java
new file mode 100644
index 000000000000..03a565baa59d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurationsAssociatedWithVirtualWans;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurationsResponse;
+
+class VpnServerConfigurationsAssociatedWithVirtualWansImpl extends WrapperImpl<VpnServerConfigurationsAssociatedWithVirtualWansInner> implements VpnServerConfigurationsAssociatedWithVirtualWans {
+    private final NetworkManager manager;
+
+    VpnServerConfigurationsAssociatedWithVirtualWansImpl(NetworkManager manager) {
+        super(manager.inner().vpnServerConfigurationsAssociatedWithVirtualWans());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VpnServerConfigurationsResponse> listAsync(String resourceGroupName, String virtualWANName) {
+        VpnServerConfigurationsAssociatedWithVirtualWansInner client = this.inner();
+        return client.listAsync(resourceGroupName, virtualWANName)
+        .map(new Func1<VpnServerConfigurationsResponseInner, VpnServerConfigurationsResponse>() {
+            @Override
+            public VpnServerConfigurationsResponse call(VpnServerConfigurationsResponseInner inner) {
+                return new VpnServerConfigurationsResponseImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansInner.java
new file mode 100644
index 000000000000..1614a8a43a34
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsAssociatedWithVirtualWansInner.java
@@ -0,0 +1,218 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import okhttp3.ResponseBody;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VpnServerConfigurationsAssociatedWithVirtualWans.
+ */
+public class VpnServerConfigurationsAssociatedWithVirtualWansInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnServerConfigurationsAssociatedWithVirtualWansService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnServerConfigurationsAssociatedWithVirtualWansInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnServerConfigurationsAssociatedWithVirtualWansInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnServerConfigurationsAssociatedWithVirtualWansService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnServerConfigurationsAssociatedWithVirtualWans to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnServerConfigurationsAssociatedWithVirtualWansService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurationsAssociatedWithVirtualWans list" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnServerConfigurations")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @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.network.v2020_04_01.VpnServerConfigurationsAssociatedWithVirtualWans beginList" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnServerConfigurations")
+        Observable<Response<ResponseBody>> beginList(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @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 VpnServerConfigurationsResponseInner object if successful.
+     */
+    public VpnServerConfigurationsResponseInner list(String resourceGroupName, String virtualWANName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().last().body();
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @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<VpnServerConfigurationsResponseInner> listAsync(String resourceGroupName, String virtualWANName, final ServiceCallback<VpnServerConfigurationsResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnServerConfigurationsResponseInner> listAsync(String resourceGroupName, String virtualWANName) {
+        return listWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<VpnServerConfigurationsResponseInner>, VpnServerConfigurationsResponseInner>() {
+            @Override
+            public VpnServerConfigurationsResponseInner call(ServiceResponse<VpnServerConfigurationsResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationsResponseInner>> listWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.list(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<VpnServerConfigurationsResponseInner>() { }.getType());
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @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 VpnServerConfigurationsResponseInner object if successful.
+     */
+    public VpnServerConfigurationsResponseInner beginList(String resourceGroupName, String virtualWANName) {
+        return beginListWithServiceResponseAsync(resourceGroupName, virtualWANName).toBlocking().single().body();
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @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<VpnServerConfigurationsResponseInner> beginListAsync(String resourceGroupName, String virtualWANName, final ServiceCallback<VpnServerConfigurationsResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginListWithServiceResponseAsync(resourceGroupName, virtualWANName), serviceCallback);
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationsResponseInner object
+     */
+    public Observable<VpnServerConfigurationsResponseInner> beginListAsync(String resourceGroupName, String virtualWANName) {
+        return beginListWithServiceResponseAsync(resourceGroupName, virtualWANName).map(new Func1<ServiceResponse<VpnServerConfigurationsResponseInner>, VpnServerConfigurationsResponseInner>() {
+            @Override
+            public VpnServerConfigurationsResponseInner call(ServiceResponse<VpnServerConfigurationsResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gives the list of VpnServerConfigurations associated with Virtual Wan in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN whose associated VpnServerConfigurations is needed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationsResponseInner object
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationsResponseInner>> beginListWithServiceResponseAsync(String resourceGroupName, String virtualWANName) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginList(this.client.subscriptionId(), resourceGroupName, virtualWANName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnServerConfigurationsResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnServerConfigurationsResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnServerConfigurationsResponseInner> clientResponse = beginListDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnServerConfigurationsResponseInner> beginListDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnServerConfigurationsResponseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnServerConfigurationsResponseInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsImpl.java
new file mode 100644
index 000000000000..3293655a92e9
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurations;
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfiguration;
+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;
+
+class VpnServerConfigurationsImpl extends GroupableResourcesCoreImpl<VpnServerConfiguration, VpnServerConfigurationImpl, VpnServerConfigurationInner, VpnServerConfigurationsInner, NetworkManager>  implements VpnServerConfigurations {
+    protected VpnServerConfigurationsImpl(NetworkManager manager) {
+        super(manager.inner().vpnServerConfigurations(), manager);
+    }
+
+    @Override
+    protected Observable<VpnServerConfigurationInner> getInnerAsync(String resourceGroupName, String name) {
+        VpnServerConfigurationsInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VpnServerConfigurationsInner 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<VpnServerConfiguration> listByResourceGroup(String resourceGroupName) {
+        VpnServerConfigurationsInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VpnServerConfiguration> listByResourceGroupAsync(String resourceGroupName) {
+        VpnServerConfigurationsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VpnServerConfigurationInner>, Iterable<VpnServerConfigurationInner>>() {
+            @Override
+            public Iterable<VpnServerConfigurationInner> call(Page<VpnServerConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnServerConfigurationInner, VpnServerConfiguration>() {
+            @Override
+            public VpnServerConfiguration call(VpnServerConfigurationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VpnServerConfiguration> list() {
+        VpnServerConfigurationsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VpnServerConfiguration> listAsync() {
+        VpnServerConfigurationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VpnServerConfigurationInner>, Iterable<VpnServerConfigurationInner>>() {
+            @Override
+            public Iterable<VpnServerConfigurationInner> call(Page<VpnServerConfigurationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnServerConfigurationInner, VpnServerConfiguration>() {
+            @Override
+            public VpnServerConfiguration call(VpnServerConfigurationInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VpnServerConfigurationImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VpnServerConfigurationImpl wrapModel(VpnServerConfigurationInner inner) {
+        return  new VpnServerConfigurationImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VpnServerConfigurationImpl wrapModel(String name) {
+        return new VpnServerConfigurationImpl(name, new VpnServerConfigurationInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsInner.java
new file mode 100644
index 000000000000..41b356dc0a6d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VpnServerConfigurations.
+ */
+public class VpnServerConfigurationsInner implements InnerSupportsGet<VpnServerConfigurationInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VpnServerConfigurationInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VpnServerConfigurationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnServerConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnServerConfigurationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnServerConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnServerConfigurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnServerConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurations getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @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.network.v2020_04_01.VpnServerConfigurations createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @Query("api-version") String apiVersion, @Body VpnServerConfigurationInner vpnServerConfigurationParameters, @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.network.v2020_04_01.VpnServerConfigurations beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @Query("api-version") String apiVersion, @Body VpnServerConfigurationInner vpnServerConfigurationParameters, @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.network.v2020_04_01.VpnServerConfigurations updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject vpnServerConfigurationParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurations delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @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.network.v2020_04_01.VpnServerConfigurations beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnServerConfigurationName") String vpnServerConfigurationName, @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.network.v2020_04_01.VpnServerConfigurations listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations")
+        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.network.v2020_04_01.VpnServerConfigurations list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/vpnServerConfigurations")
+        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.network.v2020_04_01.VpnServerConfigurations 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.network.v2020_04_01.VpnServerConfigurations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being retrieved.
+     * @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 VpnServerConfigurationInner object if successful.
+     */
+    public VpnServerConfigurationInner getByResourceGroup(String resourceGroupName, String vpnServerConfigurationName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being retrieved.
+     * @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<VpnServerConfigurationInner> getByResourceGroupAsync(String resourceGroupName, String vpnServerConfigurationName, final ServiceCallback<VpnServerConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<VpnServerConfigurationInner> getByResourceGroupAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).map(new Func1<ServiceResponse<VpnServerConfigurationInner>, VpnServerConfigurationInner>() {
+            @Override
+            public VpnServerConfigurationInner call(ServiceResponse<VpnServerConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnServerConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnServerConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnServerConfigurationInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnServerConfigurationInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnServerConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnServerConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @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 VpnServerConfigurationInner object if successful.
+     */
+    public VpnServerConfigurationInner createOrUpdate(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @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<VpnServerConfigurationInner> createOrUpdateAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters, final ServiceCallback<VpnServerConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnServerConfigurationInner> createOrUpdateAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters).map(new Func1<ServiceResponse<VpnServerConfigurationInner>, VpnServerConfigurationInner>() {
+            @Override
+            public VpnServerConfigurationInner call(ServiceResponse<VpnServerConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        if (vpnServerConfigurationParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnServerConfigurationParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, vpnServerConfigurationParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VpnServerConfigurationInner>() { }.getType());
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @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 VpnServerConfigurationInner object if successful.
+     */
+    public VpnServerConfigurationInner beginCreateOrUpdate(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @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<VpnServerConfigurationInner> beginCreateOrUpdateAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters, final ServiceCallback<VpnServerConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<VpnServerConfigurationInner> beginCreateOrUpdateAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, vpnServerConfigurationParameters).map(new Func1<ServiceResponse<VpnServerConfigurationInner>, VpnServerConfigurationInner>() {
+            @Override
+            public VpnServerConfigurationInner call(ServiceResponse<VpnServerConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VpnServerConfiguration resource if it doesn't exist else updates the existing VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being created or updated.
+     * @param vpnServerConfigurationParameters Parameters supplied to create or update VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName, VpnServerConfigurationInner vpnServerConfigurationParameters) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        if (vpnServerConfigurationParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnServerConfigurationParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, vpnServerConfigurationParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnServerConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnServerConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnServerConfigurationInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnServerConfigurationInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnServerConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnServerConfigurationInner>() { }.getType())
+                .register(201, new TypeToken<VpnServerConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @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 VpnServerConfigurationInner object if successful.
+     */
+    public VpnServerConfigurationInner updateTags(String resourceGroupName, String vpnServerConfigurationName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being 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<VpnServerConfigurationInner> updateTagsAsync(String resourceGroupName, String vpnServerConfigurationName, final ServiceCallback<VpnServerConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<VpnServerConfigurationInner> updateTagsAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).map(new Func1<ServiceResponse<VpnServerConfigurationInner>, VpnServerConfigurationInner>() {
+            @Override
+            public VpnServerConfigurationInner call(ServiceResponse<VpnServerConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject vpnServerConfigurationParameters = new TagsObject();
+        vpnServerConfigurationParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, this.client.acceptLanguage(), vpnServerConfigurationParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnServerConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnServerConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnServerConfigurationInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @param tags Resource tags.
+     * @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 VpnServerConfigurationInner object if successful.
+     */
+    public VpnServerConfigurationInner updateTags(String resourceGroupName, String vpnServerConfigurationName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @param tags Resource tags.
+     * @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<VpnServerConfigurationInner> updateTagsAsync(String resourceGroupName, String vpnServerConfigurationName, Map<String, String> tags, final ServiceCallback<VpnServerConfigurationInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<VpnServerConfigurationInner> updateTagsAsync(String resourceGroupName, String vpnServerConfigurationName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName, tags).map(new Func1<ServiceResponse<VpnServerConfigurationInner>, VpnServerConfigurationInner>() {
+            @Override
+            public VpnServerConfigurationInner call(ServiceResponse<VpnServerConfigurationInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VpnServerConfiguration tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnServerConfigurationInner object
+     */
+    public Observable<ServiceResponse<VpnServerConfigurationInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName, Map<String, String> tags) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject vpnServerConfigurationParameters = new TagsObject();
+        vpnServerConfigurationParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, this.client.acceptLanguage(), vpnServerConfigurationParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnServerConfigurationInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnServerConfigurationInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnServerConfigurationInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnServerConfigurationInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnServerConfigurationInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnServerConfigurationInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @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 vpnServerConfigurationName) {
+        deleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @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 vpnServerConfigurationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @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 vpnServerConfigurationName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @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 vpnServerConfigurationName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, vpnServerConfigurationName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VpnServerConfiguration.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String vpnServerConfigurationName) {
+        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 (vpnServerConfigurationName == null) {
+            throw new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, vpnServerConfigurationName, 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);
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @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;VpnServerConfigurationInner&gt; object if successful.
+     */
+    public PagedList<VpnServerConfigurationInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VpnServerConfigurationInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VpnServerConfigurationInner>(response.body()) {
+            @Override
+            public Page<VpnServerConfigurationInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @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<VpnServerConfigurationInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VpnServerConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<Page<VpnServerConfigurationInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Page<VpnServerConfigurationInner>>() {
+                @Override
+                public Page<VpnServerConfigurationInner> call(ServiceResponse<Page<VpnServerConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(ServiceResponse<Page<VpnServerConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnServerConfigurationInner>> * @param resourceGroupName The resource group name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnServerConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnServerConfigurationInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnServerConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnServerConfigurationInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnServerConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnServerConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a 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;VpnServerConfigurationInner&gt; object if successful.
+     */
+    public PagedList<VpnServerConfigurationInner> list() {
+        ServiceResponse<Page<VpnServerConfigurationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VpnServerConfigurationInner>(response.body()) {
+            @Override
+            public Page<VpnServerConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a 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<VpnServerConfigurationInner>> listAsync(final ListOperationCallback<VpnServerConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<Page<VpnServerConfigurationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Page<VpnServerConfigurationInner>>() {
+                @Override
+                public Page<VpnServerConfigurationInner> call(ServiceResponse<Page<VpnServerConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(ServiceResponse<Page<VpnServerConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnServerConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnServerConfigurationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnServerConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnServerConfigurationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnServerConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnServerConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in 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;VpnServerConfigurationInner&gt; object if successful.
+     */
+    public PagedList<VpnServerConfigurationInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnServerConfigurationInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnServerConfigurationInner>(response.body()) {
+            @Override
+            public Page<VpnServerConfigurationInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in 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<VpnServerConfigurationInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VpnServerConfigurationInner>> serviceFuture, final ListOperationCallback<VpnServerConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in 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;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<Page<VpnServerConfigurationInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Page<VpnServerConfigurationInner>>() {
+                @Override
+                public Page<VpnServerConfigurationInner> call(ServiceResponse<Page<VpnServerConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in 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;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(ServiceResponse<Page<VpnServerConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnServerConfigurations in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnServerConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnServerConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> 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<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnServerConfigurationInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnServerConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnServerConfigurationInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnServerConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnServerConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @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;VpnServerConfigurationInner&gt; object if successful.
+     */
+    public PagedList<VpnServerConfigurationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnServerConfigurationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnServerConfigurationInner>(response.body()) {
+            @Override
+            public Page<VpnServerConfigurationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @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<VpnServerConfigurationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VpnServerConfigurationInner>> serviceFuture, final ListOperationCallback<VpnServerConfigurationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @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;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<Page<VpnServerConfigurationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Page<VpnServerConfigurationInner>>() {
+                @Override
+                public Page<VpnServerConfigurationInner> call(ServiceResponse<Page<VpnServerConfigurationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+     * @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;VpnServerConfigurationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnServerConfigurationInner>>, Observable<ServiceResponse<Page<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(ServiceResponse<Page<VpnServerConfigurationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnServerConfigurations in a subscription.
+     *
+    ServiceResponse<PageImpl<VpnServerConfigurationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnServerConfigurationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> 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<VpnServerConfigurationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnServerConfigurationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnServerConfigurationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnServerConfigurationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnServerConfigurationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnServerConfigurationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnServerConfigurationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseImpl.java
new file mode 100644
index 000000000000..4123da62d89f
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnServerConfigurationsResponse;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+
+class VpnServerConfigurationsResponseImpl extends WrapperImpl<VpnServerConfigurationsResponseInner> implements VpnServerConfigurationsResponse {
+    private final NetworkManager manager;
+    VpnServerConfigurationsResponseImpl(VpnServerConfigurationsResponseInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<String> vpnServerConfigurationResourceIds() {
+        return this.inner().vpnServerConfigurationResourceIds();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseInner.java
new file mode 100644
index 000000000000..11e7de63f697
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnServerConfigurationsResponseInner.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.network.v2020_04_01.implementation;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * VpnServerConfigurations list associated with VirtualWan Response.
+ */
+public class VpnServerConfigurationsResponseInner {
+    /**
+     * List of VpnServerConfigurations associated with VirtualWan.
+     */
+    @JsonProperty(value = "vpnServerConfigurationResourceIds")
+    private List<String> vpnServerConfigurationResourceIds;
+
+    /**
+     * Get list of VpnServerConfigurations associated with VirtualWan.
+     *
+     * @return the vpnServerConfigurationResourceIds value
+     */
+    public List<String> vpnServerConfigurationResourceIds() {
+        return this.vpnServerConfigurationResourceIds;
+    }
+
+    /**
+     * Set list of VpnServerConfigurations associated with VirtualWan.
+     *
+     * @param vpnServerConfigurationResourceIds the vpnServerConfigurationResourceIds value to set
+     * @return the VpnServerConfigurationsResponseInner object itself.
+     */
+    public VpnServerConfigurationsResponseInner withVpnServerConfigurationResourceIds(List<String> vpnServerConfigurationResourceIds) {
+        this.vpnServerConfigurationResourceIds = vpnServerConfigurationResourceIds;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteImpl.java
new file mode 100644
index 000000000000..d60c4ae2c125
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteImpl.java
@@ -0,0 +1,158 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSite;
+import rx.Observable;
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.DeviceProperties;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLink;
+
+class VpnSiteImpl extends GroupableResourceCoreImpl<VpnSite, VpnSiteInner, VpnSiteImpl, NetworkManager> implements VpnSite, VpnSite.Definition, VpnSite.Update {
+    VpnSiteImpl(String name, VpnSiteInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<VpnSite> createResourceAsync() {
+        VpnSitesInner client = this.manager().inner().vpnSites();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VpnSite> updateResourceAsync() {
+        VpnSitesInner client = this.manager().inner().vpnSites();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VpnSiteInner> getInnerAsync() {
+        VpnSitesInner client = this.manager().inner().vpnSites();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public AddressSpace addressSpace() {
+        return this.inner().addressSpace();
+    }
+
+    @Override
+    public BgpSettings bgpProperties() {
+        return this.inner().bgpProperties();
+    }
+
+    @Override
+    public DeviceProperties deviceProperties() {
+        return this.inner().deviceProperties();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String ipAddress() {
+        return this.inner().ipAddress();
+    }
+
+    @Override
+    public Boolean isSecuritySite() {
+        return this.inner().isSecuritySite();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String siteKey() {
+        return this.inner().siteKey();
+    }
+
+    @Override
+    public SubResource virtualWan() {
+        return this.inner().virtualWan();
+    }
+
+    @Override
+    public List<VpnSiteLink> vpnSiteLinks() {
+        List<VpnSiteLink> lst = new ArrayList<VpnSiteLink>();
+        if (this.inner().vpnSiteLinks() != null) {
+            for (VpnSiteLinkInner inner : this.inner().vpnSiteLinks()) {
+                lst.add( new VpnSiteLinkImpl(inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public VpnSiteImpl withAddressSpace(AddressSpace addressSpace) {
+        this.inner().withAddressSpace(addressSpace);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withBgpProperties(BgpSettings bgpProperties) {
+        this.inner().withBgpProperties(bgpProperties);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withDeviceProperties(DeviceProperties deviceProperties) {
+        this.inner().withDeviceProperties(deviceProperties);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withIpAddress(String ipAddress) {
+        this.inner().withIpAddress(ipAddress);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withIsSecuritySite(Boolean isSecuritySite) {
+        this.inner().withIsSecuritySite(isSecuritySite);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withSiteKey(String siteKey) {
+        this.inner().withSiteKey(siteKey);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withVirtualWan(SubResource virtualWan) {
+        this.inner().withVirtualWan(virtualWan);
+        return this;
+    }
+
+    @Override
+    public VpnSiteImpl withVpnSiteLinks(List<VpnSiteLinkInner> vpnSiteLinks) {
+        this.inner().withVpnSiteLinks(vpnSiteLinks);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteInner.java
new file mode 100644
index 000000000000..9895436a90e1
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteInner.java
@@ -0,0 +1,293 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.DeviceProperties;
+import com.microsoft.azure.management.network.v2020_04_01.AddressSpace;
+import com.microsoft.azure.management.network.v2020_04_01.BgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * VpnSite Resource.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class VpnSiteInner extends Resource {
+    /**
+     * The VirtualWAN to which the vpnSite belongs.
+     */
+    @JsonProperty(value = "properties.virtualWan")
+    private SubResource virtualWan;
+
+    /**
+     * The device properties.
+     */
+    @JsonProperty(value = "properties.deviceProperties")
+    private DeviceProperties deviceProperties;
+
+    /**
+     * The ip-address for the vpn-site.
+     */
+    @JsonProperty(value = "properties.ipAddress")
+    private String ipAddress;
+
+    /**
+     * The key for vpn-site that can be used for connections.
+     */
+    @JsonProperty(value = "properties.siteKey")
+    private String siteKey;
+
+    /**
+     * The AddressSpace that contains an array of IP address ranges.
+     */
+    @JsonProperty(value = "properties.addressSpace")
+    private AddressSpace addressSpace;
+
+    /**
+     * The set of bgp properties.
+     */
+    @JsonProperty(value = "properties.bgpProperties")
+    private BgpSettings bgpProperties;
+
+    /**
+     * The provisioning state of the VPN site resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * IsSecuritySite flag.
+     */
+    @JsonProperty(value = "properties.isSecuritySite")
+    private Boolean isSecuritySite;
+
+    /**
+     * List of all vpn site links.
+     */
+    @JsonProperty(value = "properties.vpnSiteLinks")
+    private List<VpnSiteLinkInner> vpnSiteLinks;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the VirtualWAN to which the vpnSite belongs.
+     *
+     * @return the virtualWan value
+     */
+    public SubResource virtualWan() {
+        return this.virtualWan;
+    }
+
+    /**
+     * Set the VirtualWAN to which the vpnSite belongs.
+     *
+     * @param virtualWan the virtualWan value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withVirtualWan(SubResource virtualWan) {
+        this.virtualWan = virtualWan;
+        return this;
+    }
+
+    /**
+     * Get the device properties.
+     *
+     * @return the deviceProperties value
+     */
+    public DeviceProperties deviceProperties() {
+        return this.deviceProperties;
+    }
+
+    /**
+     * Set the device properties.
+     *
+     * @param deviceProperties the deviceProperties value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withDeviceProperties(DeviceProperties deviceProperties) {
+        this.deviceProperties = deviceProperties;
+        return this;
+    }
+
+    /**
+     * Get the ip-address for the vpn-site.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set the ip-address for the vpn-site.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * Get the key for vpn-site that can be used for connections.
+     *
+     * @return the siteKey value
+     */
+    public String siteKey() {
+        return this.siteKey;
+    }
+
+    /**
+     * Set the key for vpn-site that can be used for connections.
+     *
+     * @param siteKey the siteKey value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withSiteKey(String siteKey) {
+        this.siteKey = siteKey;
+        return this;
+    }
+
+    /**
+     * Get the AddressSpace that contains an array of IP address ranges.
+     *
+     * @return the addressSpace value
+     */
+    public AddressSpace addressSpace() {
+        return this.addressSpace;
+    }
+
+    /**
+     * Set the AddressSpace that contains an array of IP address ranges.
+     *
+     * @param addressSpace the addressSpace value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withAddressSpace(AddressSpace addressSpace) {
+        this.addressSpace = addressSpace;
+        return this;
+    }
+
+    /**
+     * Get the set of bgp properties.
+     *
+     * @return the bgpProperties value
+     */
+    public BgpSettings bgpProperties() {
+        return this.bgpProperties;
+    }
+
+    /**
+     * Set the set of bgp properties.
+     *
+     * @param bgpProperties the bgpProperties value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withBgpProperties(BgpSettings bgpProperties) {
+        this.bgpProperties = bgpProperties;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN site resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get isSecuritySite flag.
+     *
+     * @return the isSecuritySite value
+     */
+    public Boolean isSecuritySite() {
+        return this.isSecuritySite;
+    }
+
+    /**
+     * Set isSecuritySite flag.
+     *
+     * @param isSecuritySite the isSecuritySite value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withIsSecuritySite(Boolean isSecuritySite) {
+        this.isSecuritySite = isSecuritySite;
+        return this;
+    }
+
+    /**
+     * Get list of all vpn site links.
+     *
+     * @return the vpnSiteLinks value
+     */
+    public List<VpnSiteLinkInner> vpnSiteLinks() {
+        return this.vpnSiteLinks;
+    }
+
+    /**
+     * Set list of all vpn site links.
+     *
+     * @param vpnSiteLinks the vpnSiteLinks value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withVpnSiteLinks(List<VpnSiteLinkInner> vpnSiteLinks) {
+        this.vpnSiteLinks = vpnSiteLinks;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the VpnSiteInner object itself.
+     */
+    public VpnSiteInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionInner.java
new file mode 100644
index 000000000000..962721704188
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionInner.java
@@ -0,0 +1,416 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.SubResource;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionStatus;
+import com.microsoft.azure.management.network.v2020_04_01.VirtualNetworkGatewayConnectionProtocol;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.IpsecPolicy;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * VpnSiteLinkConnection Resource.
+ */
+@JsonFlatten
+public class VpnSiteLinkConnectionInner extends SubResource {
+    /**
+     * Id of the connected vpn site link.
+     */
+    @JsonProperty(value = "properties.vpnSiteLink")
+    private SubResource vpnSiteLink;
+
+    /**
+     * Routing weight for vpn connection.
+     */
+    @JsonProperty(value = "properties.routingWeight")
+    private Integer routingWeight;
+
+    /**
+     * The connection status. Possible values include: 'Unknown', 'Connecting',
+     * 'Connected', 'NotConnected'.
+     */
+    @JsonProperty(value = "properties.connectionStatus")
+    private VpnConnectionStatus connectionStatus;
+
+    /**
+     * Connection protocol used for this connection. Possible values include:
+     * 'IKEv2', 'IKEv1'.
+     */
+    @JsonProperty(value = "properties.vpnConnectionProtocolType")
+    private VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType;
+
+    /**
+     * Ingress bytes transferred.
+     */
+    @JsonProperty(value = "properties.ingressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long ingressBytesTransferred;
+
+    /**
+     * Egress bytes transferred.
+     */
+    @JsonProperty(value = "properties.egressBytesTransferred", access = JsonProperty.Access.WRITE_ONLY)
+    private Long egressBytesTransferred;
+
+    /**
+     * Expected bandwidth in MBPS.
+     */
+    @JsonProperty(value = "properties.connectionBandwidth")
+    private Integer connectionBandwidth;
+
+    /**
+     * SharedKey for the vpn connection.
+     */
+    @JsonProperty(value = "properties.sharedKey")
+    private String sharedKey;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableBgp")
+    private Boolean enableBgp;
+
+    /**
+     * Enable policy-based traffic selectors.
+     */
+    @JsonProperty(value = "properties.usePolicyBasedTrafficSelectors")
+    private Boolean usePolicyBasedTrafficSelectors;
+
+    /**
+     * The IPSec Policies to be considered by this connection.
+     */
+    @JsonProperty(value = "properties.ipsecPolicies")
+    private List<IpsecPolicy> ipsecPolicies;
+
+    /**
+     * EnableBgp flag.
+     */
+    @JsonProperty(value = "properties.enableRateLimiting")
+    private Boolean enableRateLimiting;
+
+    /**
+     * Use local azure ip to initiate connection.
+     */
+    @JsonProperty(value = "properties.useLocalAzureIpAddress")
+    private Boolean useLocalAzureIpAddress;
+
+    /**
+     * The provisioning state of the VPN site link connection resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get id of the connected vpn site link.
+     *
+     * @return the vpnSiteLink value
+     */
+    public SubResource vpnSiteLink() {
+        return this.vpnSiteLink;
+    }
+
+    /**
+     * Set id of the connected vpn site link.
+     *
+     * @param vpnSiteLink the vpnSiteLink value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withVpnSiteLink(SubResource vpnSiteLink) {
+        this.vpnSiteLink = vpnSiteLink;
+        return this;
+    }
+
+    /**
+     * Get routing weight for vpn connection.
+     *
+     * @return the routingWeight value
+     */
+    public Integer routingWeight() {
+        return this.routingWeight;
+    }
+
+    /**
+     * Set routing weight for vpn connection.
+     *
+     * @param routingWeight the routingWeight value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withRoutingWeight(Integer routingWeight) {
+        this.routingWeight = routingWeight;
+        return this;
+    }
+
+    /**
+     * Get the connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @return the connectionStatus value
+     */
+    public VpnConnectionStatus connectionStatus() {
+        return this.connectionStatus;
+    }
+
+    /**
+     * Set the connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'.
+     *
+     * @param connectionStatus the connectionStatus value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withConnectionStatus(VpnConnectionStatus connectionStatus) {
+        this.connectionStatus = connectionStatus;
+        return this;
+    }
+
+    /**
+     * Get connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @return the vpnConnectionProtocolType value
+     */
+    public VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType() {
+        return this.vpnConnectionProtocolType;
+    }
+
+    /**
+     * Set connection protocol used for this connection. Possible values include: 'IKEv2', 'IKEv1'.
+     *
+     * @param vpnConnectionProtocolType the vpnConnectionProtocolType value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withVpnConnectionProtocolType(VirtualNetworkGatewayConnectionProtocol vpnConnectionProtocolType) {
+        this.vpnConnectionProtocolType = vpnConnectionProtocolType;
+        return this;
+    }
+
+    /**
+     * Get ingress bytes transferred.
+     *
+     * @return the ingressBytesTransferred value
+     */
+    public Long ingressBytesTransferred() {
+        return this.ingressBytesTransferred;
+    }
+
+    /**
+     * Get egress bytes transferred.
+     *
+     * @return the egressBytesTransferred value
+     */
+    public Long egressBytesTransferred() {
+        return this.egressBytesTransferred;
+    }
+
+    /**
+     * Get expected bandwidth in MBPS.
+     *
+     * @return the connectionBandwidth value
+     */
+    public Integer connectionBandwidth() {
+        return this.connectionBandwidth;
+    }
+
+    /**
+     * Set expected bandwidth in MBPS.
+     *
+     * @param connectionBandwidth the connectionBandwidth value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withConnectionBandwidth(Integer connectionBandwidth) {
+        this.connectionBandwidth = connectionBandwidth;
+        return this;
+    }
+
+    /**
+     * Get sharedKey for the vpn connection.
+     *
+     * @return the sharedKey value
+     */
+    public String sharedKey() {
+        return this.sharedKey;
+    }
+
+    /**
+     * Set sharedKey for the vpn connection.
+     *
+     * @param sharedKey the sharedKey value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withSharedKey(String sharedKey) {
+        this.sharedKey = sharedKey;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableBgp value
+     */
+    public Boolean enableBgp() {
+        return this.enableBgp;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableBgp the enableBgp value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withEnableBgp(Boolean enableBgp) {
+        this.enableBgp = enableBgp;
+        return this;
+    }
+
+    /**
+     * Get enable policy-based traffic selectors.
+     *
+     * @return the usePolicyBasedTrafficSelectors value
+     */
+    public Boolean usePolicyBasedTrafficSelectors() {
+        return this.usePolicyBasedTrafficSelectors;
+    }
+
+    /**
+     * Set enable policy-based traffic selectors.
+     *
+     * @param usePolicyBasedTrafficSelectors the usePolicyBasedTrafficSelectors value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors) {
+        this.usePolicyBasedTrafficSelectors = usePolicyBasedTrafficSelectors;
+        return this;
+    }
+
+    /**
+     * Get the IPSec Policies to be considered by this connection.
+     *
+     * @return the ipsecPolicies value
+     */
+    public List<IpsecPolicy> ipsecPolicies() {
+        return this.ipsecPolicies;
+    }
+
+    /**
+     * Set the IPSec Policies to be considered by this connection.
+     *
+     * @param ipsecPolicies the ipsecPolicies value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withIpsecPolicies(List<IpsecPolicy> ipsecPolicies) {
+        this.ipsecPolicies = ipsecPolicies;
+        return this;
+    }
+
+    /**
+     * Get enableBgp flag.
+     *
+     * @return the enableRateLimiting value
+     */
+    public Boolean enableRateLimiting() {
+        return this.enableRateLimiting;
+    }
+
+    /**
+     * Set enableBgp flag.
+     *
+     * @param enableRateLimiting the enableRateLimiting value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withEnableRateLimiting(Boolean enableRateLimiting) {
+        this.enableRateLimiting = enableRateLimiting;
+        return this;
+    }
+
+    /**
+     * Get use local azure ip to initiate connection.
+     *
+     * @return the useLocalAzureIpAddress value
+     */
+    public Boolean useLocalAzureIpAddress() {
+        return this.useLocalAzureIpAddress;
+    }
+
+    /**
+     * Set use local azure ip to initiate connection.
+     *
+     * @param useLocalAzureIpAddress the useLocalAzureIpAddress value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withUseLocalAzureIpAddress(Boolean useLocalAzureIpAddress) {
+        this.useLocalAzureIpAddress = useLocalAzureIpAddress;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN site link connection resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VpnSiteLinkConnectionInner object itself.
+     */
+    public VpnSiteLinkConnectionInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsImpl.java
new file mode 100644
index 000000000000..4eb694edc4e7
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsImpl.java
@@ -0,0 +1,50 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinkConnections;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.management.network.v2020_04_01.VpnConnectionVpnGatewayVpnSiteLinkConnection;
+
+class VpnSiteLinkConnectionsImpl extends WrapperImpl<VpnSiteLinkConnectionsInner> implements VpnSiteLinkConnections {
+    private final NetworkManager manager;
+
+    VpnSiteLinkConnectionsImpl(NetworkManager manager) {
+        super(manager.inner().vpnSiteLinkConnections());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl wrapModel(VpnSiteLinkConnectionInner inner) {
+        return  new VpnConnectionVpnGatewayVpnSiteLinkConnectionImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VpnConnectionVpnGatewayVpnSiteLinkConnection> getAsync(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName) {
+        VpnSiteLinkConnectionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, gatewayName, connectionName, linkConnectionName)
+        .flatMap(new Func1<VpnSiteLinkConnectionInner, Observable<VpnConnectionVpnGatewayVpnSiteLinkConnection>>() {
+            @Override
+            public Observable<VpnConnectionVpnGatewayVpnSiteLinkConnection> call(VpnSiteLinkConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VpnConnectionVpnGatewayVpnSiteLinkConnection)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsInner.java
new file mode 100644
index 000000000000..dfab0cbf4f91
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkConnectionsInner.java
@@ -0,0 +1,158 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+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.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VpnSiteLinkConnections.
+ */
+public class VpnSiteLinkConnectionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnSiteLinkConnectionsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnSiteLinkConnectionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnSiteLinkConnectionsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnSiteLinkConnectionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnSiteLinkConnections to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnSiteLinkConnectionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinkConnections get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("gatewayName") String gatewayName, @Path("connectionName") String connectionName, @Path("linkConnectionName") String linkConnectionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a vpn site link connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @param linkConnectionName The name of the vpn connection.
+     * @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 VpnSiteLinkConnectionInner object if successful.
+     */
+    public VpnSiteLinkConnectionInner get(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, linkConnectionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a vpn site link connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @param linkConnectionName The name of the vpn connection.
+     * @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<VpnSiteLinkConnectionInner> getAsync(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName, final ServiceCallback<VpnSiteLinkConnectionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, linkConnectionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a vpn site link connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @param linkConnectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteLinkConnectionInner object
+     */
+    public Observable<VpnSiteLinkConnectionInner> getAsync(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName) {
+        return getWithServiceResponseAsync(resourceGroupName, gatewayName, connectionName, linkConnectionName).map(new Func1<ServiceResponse<VpnSiteLinkConnectionInner>, VpnSiteLinkConnectionInner>() {
+            @Override
+            public VpnSiteLinkConnectionInner call(ServiceResponse<VpnSiteLinkConnectionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a vpn site link connection.
+     *
+     * @param resourceGroupName The resource group name of the VpnGateway.
+     * @param gatewayName The name of the gateway.
+     * @param connectionName The name of the vpn connection.
+     * @param linkConnectionName The name of the vpn connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteLinkConnectionInner object
+     */
+    public Observable<ServiceResponse<VpnSiteLinkConnectionInner>> getWithServiceResponseAsync(String resourceGroupName, String gatewayName, String connectionName, String linkConnectionName) {
+        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 (gatewayName == null) {
+            throw new IllegalArgumentException("Parameter gatewayName is required and cannot be null.");
+        }
+        if (connectionName == null) {
+            throw new IllegalArgumentException("Parameter connectionName is required and cannot be null.");
+        }
+        if (linkConnectionName == null) {
+            throw new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, gatewayName, connectionName, linkConnectionName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteLinkConnectionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteLinkConnectionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteLinkConnectionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnSiteLinkConnectionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnSiteLinkConnectionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnSiteLinkConnectionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkImpl.java
new file mode 100644
index 000000000000..56dc0d76bcdf
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkImpl.java
@@ -0,0 +1,91 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLink;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkBgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkProviderProperties;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+
+class VpnSiteLinkImpl extends IndexableRefreshableWrapperImpl<VpnSiteLink, VpnSiteLinkInner> implements VpnSiteLink {
+    private final NetworkManager manager;
+    private String resourceGroupName;
+    private String vpnSiteName;
+    private String vpnSiteLinkName;
+
+    VpnSiteLinkImpl(VpnSiteLinkInner inner,  NetworkManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.vpnSiteName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnSites");
+        this.vpnSiteLinkName = IdParsingUtils.getValueFromIdByName(inner.id(), "vpnSiteLinks");
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<VpnSiteLinkInner> getInnerAsync() {
+        VpnSiteLinksInner client = this.manager().inner().vpnSiteLinks();
+        return client.getAsync(this.resourceGroupName, this.vpnSiteName, this.vpnSiteLinkName);
+    }
+
+
+
+    @Override
+    public VpnLinkBgpSettings bgpProperties() {
+        return this.inner().bgpProperties();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public String fqdn() {
+        return this.inner().fqdn();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String ipAddress() {
+        return this.inner().ipAddress();
+    }
+
+    @Override
+    public VpnLinkProviderProperties linkProperties() {
+        return this.inner().linkProperties();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkInner.java
new file mode 100644
index 000000000000..6df2c5a688d8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinkInner.java
@@ -0,0 +1,200 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkProviderProperties;
+import com.microsoft.azure.management.network.v2020_04_01.VpnLinkBgpSettings;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * VpnSiteLink Resource.
+ */
+@JsonFlatten
+public class VpnSiteLinkInner extends SubResource {
+    /**
+     * The link provider properties.
+     */
+    @JsonProperty(value = "properties.linkProperties")
+    private VpnLinkProviderProperties linkProperties;
+
+    /**
+     * The ip-address for the vpn-site-link.
+     */
+    @JsonProperty(value = "properties.ipAddress")
+    private String ipAddress;
+
+    /**
+     * FQDN of vpn-site-link.
+     */
+    @JsonProperty(value = "properties.fqdn")
+    private String fqdn;
+
+    /**
+     * The set of bgp properties.
+     */
+    @JsonProperty(value = "properties.bgpProperties")
+    private VpnLinkBgpSettings bgpProperties;
+
+    /**
+     * The provisioning state of the VPN site link resource. Possible values
+     * include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * The name of the resource that is unique within a resource group. This
+     * name can be used to access the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get the link provider properties.
+     *
+     * @return the linkProperties value
+     */
+    public VpnLinkProviderProperties linkProperties() {
+        return this.linkProperties;
+    }
+
+    /**
+     * Set the link provider properties.
+     *
+     * @param linkProperties the linkProperties value to set
+     * @return the VpnSiteLinkInner object itself.
+     */
+    public VpnSiteLinkInner withLinkProperties(VpnLinkProviderProperties linkProperties) {
+        this.linkProperties = linkProperties;
+        return this;
+    }
+
+    /**
+     * Get the ip-address for the vpn-site-link.
+     *
+     * @return the ipAddress value
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Set the ip-address for the vpn-site-link.
+     *
+     * @param ipAddress the ipAddress value to set
+     * @return the VpnSiteLinkInner object itself.
+     */
+    public VpnSiteLinkInner withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * Get fQDN of vpn-site-link.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set fQDN of vpn-site-link.
+     *
+     * @param fqdn the fqdn value to set
+     * @return the VpnSiteLinkInner object itself.
+     */
+    public VpnSiteLinkInner withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get the set of bgp properties.
+     *
+     * @return the bgpProperties value
+     */
+    public VpnLinkBgpSettings bgpProperties() {
+        return this.bgpProperties;
+    }
+
+    /**
+     * Set the set of bgp properties.
+     *
+     * @param bgpProperties the bgpProperties value to set
+     * @return the VpnSiteLinkInner object itself.
+     */
+    public VpnSiteLinkInner withBgpProperties(VpnLinkBgpSettings bgpProperties) {
+        this.bgpProperties = bgpProperties;
+        return this;
+    }
+
+    /**
+     * Get the provisioning state of the VPN site link resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the VpnSiteLinkInner object itself.
+     */
+    public VpnSiteLinkInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksImpl.java
new file mode 100644
index 000000000000..f94a679a04fe
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinks;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSiteLink;
+
+class VpnSiteLinksImpl extends WrapperImpl<VpnSiteLinksInner> implements VpnSiteLinks {
+    private final NetworkManager manager;
+
+    VpnSiteLinksImpl(NetworkManager manager) {
+        super(manager.inner().vpnSiteLinks());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    private VpnSiteLinkImpl wrapModel(VpnSiteLinkInner inner) {
+        return  new VpnSiteLinkImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VpnSiteLink> listByVpnSiteAsync(final String resourceGroupName, final String vpnSiteName) {
+        VpnSiteLinksInner client = this.inner();
+        return client.listByVpnSiteAsync(resourceGroupName, vpnSiteName)
+        .flatMapIterable(new Func1<Page<VpnSiteLinkInner>, Iterable<VpnSiteLinkInner>>() {
+            @Override
+            public Iterable<VpnSiteLinkInner> call(Page<VpnSiteLinkInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnSiteLinkInner, VpnSiteLink>() {
+            @Override
+            public VpnSiteLink call(VpnSiteLinkInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<VpnSiteLink> getAsync(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName) {
+        VpnSiteLinksInner client = this.inner();
+        return client.getAsync(resourceGroupName, vpnSiteName, vpnSiteLinkName)
+        .flatMap(new Func1<VpnSiteLinkInner, Observable<VpnSiteLink>>() {
+            @Override
+            public Observable<VpnSiteLink> call(VpnSiteLinkInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VpnSiteLink)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksInner.java
new file mode 100644
index 000000000000..656a04187f2e
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSiteLinksInner.java
@@ -0,0 +1,397 @@
+/**
+ * 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.network.v2020_04_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.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.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 VpnSiteLinks.
+ */
+public class VpnSiteLinksInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnSiteLinksService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnSiteLinksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnSiteLinksInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnSiteLinksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnSiteLinks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnSiteLinksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnSiteLinks get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks/{vpnSiteLinkName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @Path("vpnSiteLinkName") String vpnSiteLinkName, @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.network.v2020_04_01.VpnSiteLinks listByVpnSite" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks")
+        Observable<Response<ResponseBody>> listByVpnSite(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @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.network.v2020_04_01.VpnSiteLinks listByVpnSiteNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByVpnSiteNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VPN site link.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @param vpnSiteLinkName The name of the VpnSiteLink being retrieved.
+     * @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 VpnSiteLinkInner object if successful.
+     */
+    public VpnSiteLinkInner get(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName) {
+        return getWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteLinkName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VPN site link.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @param vpnSiteLinkName The name of the VpnSiteLink being retrieved.
+     * @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<VpnSiteLinkInner> getAsync(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName, final ServiceCallback<VpnSiteLinkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteLinkName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VPN site link.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @param vpnSiteLinkName The name of the VpnSiteLink being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteLinkInner object
+     */
+    public Observable<VpnSiteLinkInner> getAsync(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName) {
+        return getWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteLinkName).map(new Func1<ServiceResponse<VpnSiteLinkInner>, VpnSiteLinkInner>() {
+            @Override
+            public VpnSiteLinkInner call(ServiceResponse<VpnSiteLinkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VPN site link.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @param vpnSiteLinkName The name of the VpnSiteLink being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteLinkInner object
+     */
+    public Observable<ServiceResponse<VpnSiteLinkInner>> getWithServiceResponseAsync(String resourceGroupName, String vpnSiteName, String vpnSiteLinkName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        if (vpnSiteLinkName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteLinkName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, vpnSiteName, vpnSiteLinkName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteLinkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteLinkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteLinkInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnSiteLinkInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnSiteLinkInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnSiteLinkInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @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;VpnSiteLinkInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteLinkInner> listByVpnSite(final String resourceGroupName, final String vpnSiteName) {
+        ServiceResponse<Page<VpnSiteLinkInner>> response = listByVpnSiteSinglePageAsync(resourceGroupName, vpnSiteName).toBlocking().single();
+        return new PagedList<VpnSiteLinkInner>(response.body()) {
+            @Override
+            public Page<VpnSiteLinkInner> nextPage(String nextPageLink) {
+                return listByVpnSiteNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @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<VpnSiteLinkInner>> listByVpnSiteAsync(final String resourceGroupName, final String vpnSiteName, final ListOperationCallback<VpnSiteLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnSiteSinglePageAsync(resourceGroupName, vpnSiteName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(String nextPageLink) {
+                    return listByVpnSiteNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteLinkInner&gt; object
+     */
+    public Observable<Page<VpnSiteLinkInner>> listByVpnSiteAsync(final String resourceGroupName, final String vpnSiteName) {
+        return listByVpnSiteWithServiceResponseAsync(resourceGroupName, vpnSiteName)
+            .map(new Func1<ServiceResponse<Page<VpnSiteLinkInner>>, Page<VpnSiteLinkInner>>() {
+                @Override
+                public Page<VpnSiteLinkInner> call(ServiceResponse<Page<VpnSiteLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> listByVpnSiteWithServiceResponseAsync(final String resourceGroupName, final String vpnSiteName) {
+        return listByVpnSiteSinglePageAsync(resourceGroupName, vpnSiteName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteLinkInner>>, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(ServiceResponse<Page<VpnSiteLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnSiteNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+    ServiceResponse<PageImpl<VpnSiteLinkInner>> * @param resourceGroupName The resource group name of the VpnSite.
+    ServiceResponse<PageImpl<VpnSiteLinkInner>> * @param vpnSiteName The name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> listByVpnSiteSinglePageAsync(final String resourceGroupName, final String vpnSiteName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByVpnSite(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteLinkInner>> result = listByVpnSiteDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteLinkInner>> listByVpnSiteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteLinkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @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;VpnSiteLinkInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteLinkInner> listByVpnSiteNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnSiteLinkInner>> response = listByVpnSiteNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnSiteLinkInner>(response.body()) {
+            @Override
+            public Page<VpnSiteLinkInner> nextPage(String nextPageLink) {
+                return listByVpnSiteNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @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<VpnSiteLinkInner>> listByVpnSiteNextAsync(final String nextPageLink, final ServiceFuture<List<VpnSiteLinkInner>> serviceFuture, final ListOperationCallback<VpnSiteLinkInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByVpnSiteNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(String nextPageLink) {
+                    return listByVpnSiteNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @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;VpnSiteLinkInner&gt; object
+     */
+    public Observable<Page<VpnSiteLinkInner>> listByVpnSiteNextAsync(final String nextPageLink) {
+        return listByVpnSiteNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnSiteLinkInner>>, Page<VpnSiteLinkInner>>() {
+                @Override
+                public Page<VpnSiteLinkInner> call(ServiceResponse<Page<VpnSiteLinkInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+     * @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;VpnSiteLinkInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> listByVpnSiteNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByVpnSiteNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteLinkInner>>, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(ServiceResponse<Page<VpnSiteLinkInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByVpnSiteNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSiteLinks in a resource group for a vpn site.
+     *
+    ServiceResponse<PageImpl<VpnSiteLinkInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteLinkInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> listByVpnSiteNextSinglePageAsync(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.listByVpnSiteNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteLinkInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteLinkInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteLinkInner>> result = listByVpnSiteNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteLinkInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteLinkInner>> listByVpnSiteNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteLinkInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteLinkInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsImpl.java
new file mode 100644
index 000000000000..1a3a79361295
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsImpl.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.
+ * abc
+ */
+
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSitesConfigurations;
+import rx.Completable;
+import com.microsoft.azure.management.network.v2020_04_01.GetVpnSitesConfigurationRequest;
+
+class VpnSitesConfigurationsImpl extends WrapperImpl<VpnSitesConfigurationsInner> implements VpnSitesConfigurations {
+    private final NetworkManager manager;
+
+    VpnSitesConfigurationsImpl(NetworkManager manager) {
+        super(manager.inner().vpnSitesConfigurations());
+        this.manager = manager;
+    }
+
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Completable downloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        VpnSitesConfigurationsInner client = this.inner();
+        return client.downloadAsync(resourceGroupName, virtualWANName, request).toCompletable();
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsInner.java
new file mode 100644
index 000000000000..25c835761c44
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesConfigurationsInner.java
@@ -0,0 +1,235 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.network.v2020_04_01.GetVpnSitesConfigurationRequest;
+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 okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in VpnSitesConfigurations.
+ */
+public class VpnSitesConfigurationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private VpnSitesConfigurationsService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnSitesConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnSitesConfigurationsInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnSitesConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnSitesConfigurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnSitesConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnSitesConfigurations download" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnConfiguration")
+        Observable<Response<ResponseBody>> download(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @Body GetVpnSitesConfigurationRequest request, @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.network.v2020_04_01.VpnSitesConfigurations beginDownload" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnConfiguration")
+        Observable<Response<ResponseBody>> beginDownload(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("virtualWANName") String virtualWANName, @Body GetVpnSitesConfigurationRequest request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @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 download(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        downloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request).toBlocking().last().body();
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites 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<Void> downloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(downloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request), serviceCallback);
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> downloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        return downloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> downloadWithServiceResponseAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        Validator.validate(request);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.download(this.client.subscriptionId(), resourceGroupName, virtualWANName, request, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @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 beginDownload(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        beginDownloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request).toBlocking().single().body();
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites 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<Void> beginDownloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDownloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request), serviceCallback);
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDownloadAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        return beginDownloadWithServiceResponseAsync(resourceGroupName, virtualWANName, request).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gives the sas-url to download the configurations for vpn-sites in a resource group.
+     *
+     * @param resourceGroupName The resource group name.
+     * @param virtualWANName The name of the VirtualWAN for which configuration of all vpn-sites is needed.
+     * @param request Parameters supplied to download vpn-sites configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDownloadWithServiceResponseAsync(String resourceGroupName, String virtualWANName, GetVpnSitesConfigurationRequest request) {
+        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 (virtualWANName == null) {
+            throw new IllegalArgumentException("Parameter virtualWANName is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        Validator.validate(request);
+        final String apiVersion = "2020-04-01";
+        return service.beginDownload(this.client.subscriptionId(), resourceGroupName, virtualWANName, request, 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 = beginDownloadDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDownloadDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesImpl.java
new file mode 100644
index 000000000000..e092f96b7fd8
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSites;
+import com.microsoft.azure.management.network.v2020_04_01.VpnSite;
+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;
+
+class VpnSitesImpl extends GroupableResourcesCoreImpl<VpnSite, VpnSiteImpl, VpnSiteInner, VpnSitesInner, NetworkManager>  implements VpnSites {
+    protected VpnSitesImpl(NetworkManager manager) {
+        super(manager.inner().vpnSites(), manager);
+    }
+
+    @Override
+    protected Observable<VpnSiteInner> getInnerAsync(String resourceGroupName, String name) {
+        VpnSitesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VpnSitesInner 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<VpnSite> listByResourceGroup(String resourceGroupName) {
+        VpnSitesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VpnSite> listByResourceGroupAsync(String resourceGroupName) {
+        VpnSitesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VpnSiteInner>, Iterable<VpnSiteInner>>() {
+            @Override
+            public Iterable<VpnSiteInner> call(Page<VpnSiteInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnSiteInner, VpnSite>() {
+            @Override
+            public VpnSite call(VpnSiteInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VpnSite> list() {
+        VpnSitesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VpnSite> listAsync() {
+        VpnSitesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VpnSiteInner>, Iterable<VpnSiteInner>>() {
+            @Override
+            public Iterable<VpnSiteInner> call(Page<VpnSiteInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VpnSiteInner, VpnSite>() {
+            @Override
+            public VpnSite call(VpnSiteInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VpnSiteImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected VpnSiteImpl wrapModel(VpnSiteInner inner) {
+        return  new VpnSiteImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VpnSiteImpl wrapModel(String name) {
+        return new VpnSiteImpl(name, new VpnSiteInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesInner.java
new file mode 100644
index 000000000000..9f25ff60db7d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/VpnSitesInner.java
@@ -0,0 +1,1126 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.network.v2020_04_01.TagsObject;
+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 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.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 VpnSites.
+ */
+public class VpnSitesInner implements InnerSupportsGet<VpnSiteInner>, InnerSupportsDelete<Void>, InnerSupportsListing<VpnSiteInner> {
+    /** The Retrofit service to perform REST calls. */
+    private VpnSitesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of VpnSitesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public VpnSitesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(VpnSitesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for VpnSites to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface VpnSitesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnSites getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @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.network.v2020_04_01.VpnSites createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @Query("api-version") String apiVersion, @Body VpnSiteInner vpnSiteParameters, @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.network.v2020_04_01.VpnSites beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @Query("api-version") String apiVersion, @Body VpnSiteInner vpnSiteParameters, @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.network.v2020_04_01.VpnSites updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body TagsObject vpnSiteParameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.VpnSites delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @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.network.v2020_04_01.VpnSites beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("vpnSiteName") String vpnSiteName, @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.network.v2020_04_01.VpnSites listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites")
+        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.network.v2020_04_01.VpnSites list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/vpnSites")
+        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.network.v2020_04_01.VpnSites 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.network.v2020_04_01.VpnSites listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Retrieves the details of a VPN site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being retrieved.
+     * @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 VpnSiteInner object if successful.
+     */
+    public VpnSiteInner getByResourceGroup(String resourceGroupName, String vpnSiteName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnSiteName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the details of a VPN site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being retrieved.
+     * @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<VpnSiteInner> getByResourceGroupAsync(String resourceGroupName, String vpnSiteName, final ServiceCallback<VpnSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnSiteName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the details of a VPN site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<VpnSiteInner> getByResourceGroupAsync(String resourceGroupName, String vpnSiteName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, vpnSiteName).map(new Func1<ServiceResponse<VpnSiteInner>, VpnSiteInner>() {
+            @Override
+            public VpnSiteInner call(ServiceResponse<VpnSiteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the details of a VPN site.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<ServiceResponse<VpnSiteInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String vpnSiteName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnSiteInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnSiteInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnSiteInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @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 VpnSiteInner object if successful.
+     */
+    public VpnSiteInner createOrUpdate(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @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<VpnSiteInner> createOrUpdateAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters, final ServiceCallback<VpnSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<VpnSiteInner> createOrUpdateAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters).map(new Func1<ServiceResponse<VpnSiteInner>, VpnSiteInner>() {
+            @Override
+            public VpnSiteInner call(ServiceResponse<VpnSiteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<VpnSiteInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        if (vpnSiteParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnSiteParameters);
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, vpnSiteParameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<VpnSiteInner>() { }.getType());
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @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 VpnSiteInner object if successful.
+     */
+    public VpnSiteInner beginCreateOrUpdate(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @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<VpnSiteInner> beginCreateOrUpdateAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters, final ServiceCallback<VpnSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters), serviceCallback);
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<VpnSiteInner> beginCreateOrUpdateAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, vpnSiteName, vpnSiteParameters).map(new Func1<ServiceResponse<VpnSiteInner>, VpnSiteInner>() {
+            @Override
+            public VpnSiteInner call(ServiceResponse<VpnSiteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates a VpnSite resource if it doesn't exist else updates the existing VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being created or updated.
+     * @param vpnSiteParameters Parameters supplied to create or update VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<ServiceResponse<VpnSiteInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String vpnSiteName, VpnSiteInner vpnSiteParameters) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        if (vpnSiteParameters == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteParameters is required and cannot be null.");
+        }
+        Validator.validate(vpnSiteParameters);
+        final String apiVersion = "2020-04-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, vpnSiteParameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnSiteInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnSiteInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnSiteInner>() { }.getType())
+                .register(201, new TypeToken<VpnSiteInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @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 VpnSiteInner object if successful.
+     */
+    public VpnSiteInner updateTags(String resourceGroupName, String vpnSiteName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being 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<VpnSiteInner> updateTagsAsync(String resourceGroupName, String vpnSiteName, final ServiceCallback<VpnSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName), serviceCallback);
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<VpnSiteInner> updateTagsAsync(String resourceGroupName, String vpnSiteName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName).map(new Func1<ServiceResponse<VpnSiteInner>, VpnSiteInner>() {
+            @Override
+            public VpnSiteInner call(ServiceResponse<VpnSiteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<ServiceResponse<VpnSiteInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String vpnSiteName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        final Map<String, String> tags = null;
+        TagsObject vpnSiteParameters = new TagsObject();
+        vpnSiteParameters.withTags(null);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, this.client.acceptLanguage(), vpnSiteParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @param tags Resource tags.
+     * @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 VpnSiteInner object if successful.
+     */
+    public VpnSiteInner updateTags(String resourceGroupName, String vpnSiteName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @param tags Resource tags.
+     * @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<VpnSiteInner> updateTagsAsync(String resourceGroupName, String vpnSiteName, Map<String, String> tags, final ServiceCallback<VpnSiteInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<VpnSiteInner> updateTagsAsync(String resourceGroupName, String vpnSiteName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, vpnSiteName, tags).map(new Func1<ServiceResponse<VpnSiteInner>, VpnSiteInner>() {
+            @Override
+            public VpnSiteInner call(ServiceResponse<VpnSiteInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates VpnSite tags.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being updated.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VpnSiteInner object
+     */
+    public Observable<ServiceResponse<VpnSiteInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String vpnSiteName, Map<String, String> tags) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2020-04-01";
+        TagsObject vpnSiteParameters = new TagsObject();
+        vpnSiteParameters.withTags(tags);
+        return service.updateTags(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, this.client.acceptLanguage(), vpnSiteParameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VpnSiteInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VpnSiteInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VpnSiteInner> clientResponse = updateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VpnSiteInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VpnSiteInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VpnSiteInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @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 vpnSiteName) {
+        deleteWithServiceResponseAsync(resourceGroupName, vpnSiteName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @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 vpnSiteName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, vpnSiteName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String vpnSiteName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, vpnSiteName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String vpnSiteName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, vpnSiteName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @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 vpnSiteName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, vpnSiteName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @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 vpnSiteName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, vpnSiteName), serviceCallback);
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String vpnSiteName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, vpnSiteName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a VpnSite.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @param vpnSiteName The name of the VpnSite being deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String vpnSiteName) {
+        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 (vpnSiteName == null) {
+            throw new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, vpnSiteName, 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);
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @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;VpnSiteInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<VpnSiteInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<VpnSiteInner>(response.body()) {
+            @Override
+            public Page<VpnSiteInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @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<VpnSiteInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<VpnSiteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteInner&gt; object
+     */
+    public Observable<Page<VpnSiteInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<VpnSiteInner>>, Page<VpnSiteInner>>() {
+                @Override
+                public Page<VpnSiteInner> call(ServiceResponse<Page<VpnSiteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+     * @param resourceGroupName The resource group name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteInner>>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(ServiceResponse<Page<VpnSiteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnSiteInner>> * @param resourceGroupName The resource group name of the VpnSite.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnSites in a 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;VpnSiteInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteInner> list() {
+        ServiceResponse<Page<VpnSiteInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<VpnSiteInner>(response.body()) {
+            @Override
+            public Page<VpnSiteInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnSites in a 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<VpnSiteInner>> listAsync(final ListOperationCallback<VpnSiteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteInner&gt; object
+     */
+    public Observable<Page<VpnSiteInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<VpnSiteInner>>, Page<VpnSiteInner>>() {
+                @Override
+                public Page<VpnSiteInner> call(ServiceResponse<Page<VpnSiteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VpnSiteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteInner>>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(ServiceResponse<Page<VpnSiteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the vpnSites in 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;VpnSiteInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnSiteInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnSiteInner>(response.body()) {
+            @Override
+            public Page<VpnSiteInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the vpnSites in 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<VpnSiteInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<VpnSiteInner>> serviceFuture, final ListOperationCallback<VpnSiteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the vpnSites in 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;VpnSiteInner&gt; object
+     */
+    public Observable<Page<VpnSiteInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnSiteInner>>, Page<VpnSiteInner>>() {
+                @Override
+                public Page<VpnSiteInner> call(ServiceResponse<Page<VpnSiteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSites in 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;VpnSiteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteInner>>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(ServiceResponse<Page<VpnSiteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the vpnSites in a resource group.
+     *
+    ServiceResponse<PageImpl<VpnSiteInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> 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<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @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;VpnSiteInner&gt; object if successful.
+     */
+    public PagedList<VpnSiteInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<VpnSiteInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VpnSiteInner>(response.body()) {
+            @Override
+            public Page<VpnSiteInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @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<VpnSiteInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<VpnSiteInner>> serviceFuture, final ListOperationCallback<VpnSiteInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @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;VpnSiteInner&gt; object
+     */
+    public Observable<Page<VpnSiteInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VpnSiteInner>>, Page<VpnSiteInner>>() {
+                @Override
+                public Page<VpnSiteInner> call(ServiceResponse<Page<VpnSiteInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+     * @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;VpnSiteInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VpnSiteInner>>, Observable<ServiceResponse<Page<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(ServiceResponse<Page<VpnSiteInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the VpnSites in a subscription.
+     *
+    ServiceResponse<PageImpl<VpnSiteInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VpnSiteInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VpnSiteInner>>> 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<VpnSiteInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VpnSiteInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VpnSiteInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VpnSiteInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VpnSiteInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VpnSiteInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VpnSiteInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesImpl.java
new file mode 100644
index 000000000000..f189c2738cec
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicies;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicy;
+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;
+
+class WebApplicationFirewallPoliciesImpl extends GroupableResourcesCoreImpl<WebApplicationFirewallPolicy, WebApplicationFirewallPolicyImpl, WebApplicationFirewallPolicyInner, WebApplicationFirewallPoliciesInner, NetworkManager>  implements WebApplicationFirewallPolicies {
+    protected WebApplicationFirewallPoliciesImpl(NetworkManager manager) {
+        super(manager.inner().webApplicationFirewallPolicies(), manager);
+    }
+
+    @Override
+    protected Observable<WebApplicationFirewallPolicyInner> getInnerAsync(String resourceGroupName, String name) {
+        WebApplicationFirewallPoliciesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        WebApplicationFirewallPoliciesInner 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<WebApplicationFirewallPolicy> listByResourceGroup(String resourceGroupName) {
+        WebApplicationFirewallPoliciesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<WebApplicationFirewallPolicy> listByResourceGroupAsync(String resourceGroupName) {
+        WebApplicationFirewallPoliciesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<WebApplicationFirewallPolicyInner>, Iterable<WebApplicationFirewallPolicyInner>>() {
+            @Override
+            public Iterable<WebApplicationFirewallPolicyInner> call(Page<WebApplicationFirewallPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<WebApplicationFirewallPolicyInner, WebApplicationFirewallPolicy>() {
+            @Override
+            public WebApplicationFirewallPolicy call(WebApplicationFirewallPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<WebApplicationFirewallPolicy> list() {
+        WebApplicationFirewallPoliciesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<WebApplicationFirewallPolicy> listAsync() {
+        WebApplicationFirewallPoliciesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<WebApplicationFirewallPolicyInner>, Iterable<WebApplicationFirewallPolicyInner>>() {
+            @Override
+            public Iterable<WebApplicationFirewallPolicyInner> call(Page<WebApplicationFirewallPolicyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<WebApplicationFirewallPolicyInner, WebApplicationFirewallPolicy>() {
+            @Override
+            public WebApplicationFirewallPolicy call(WebApplicationFirewallPolicyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public WebApplicationFirewallPolicyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected WebApplicationFirewallPolicyImpl wrapModel(WebApplicationFirewallPolicyInner inner) {
+        return  new WebApplicationFirewallPolicyImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected WebApplicationFirewallPolicyImpl wrapModel(String name) {
+        return new WebApplicationFirewallPolicyImpl(name, new WebApplicationFirewallPolicyInner(), this.manager());
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesInner.java
new file mode 100644
index 000000000000..1f78f8ab48d4
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPoliciesInner.java
@@ -0,0 +1,869 @@
+/**
+ * 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.network.v2020_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.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+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 WebApplicationFirewallPolicies.
+ */
+public class WebApplicationFirewallPoliciesInner implements InnerSupportsGet<WebApplicationFirewallPolicyInner>, InnerSupportsDelete<Void>, InnerSupportsListing<WebApplicationFirewallPolicyInner> {
+    /** The Retrofit service to perform REST calls. */
+    private WebApplicationFirewallPoliciesService service;
+    /** The service client containing this operation class. */
+    private NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of WebApplicationFirewallPoliciesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public WebApplicationFirewallPoliciesInner(Retrofit retrofit, NetworkManagementClientImpl client) {
+        this.service = retrofit.create(WebApplicationFirewallPoliciesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for WebApplicationFirewallPolicies to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface WebApplicationFirewallPoliciesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicies listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies")
+        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.network.v2020_04_01.WebApplicationFirewallPolicies list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies")
+        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.network.v2020_04_01.WebApplicationFirewallPolicies getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/{policyName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("policyName") String policyName, @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.network.v2020_04_01.WebApplicationFirewallPolicies createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/{policyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("policyName") String policyName, @Path("subscriptionId") String subscriptionId, @Body WebApplicationFirewallPolicyInner 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.network.v2020_04_01.WebApplicationFirewallPolicies delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/{policyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("policyName") String policyName, @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.network.v2020_04_01.WebApplicationFirewallPolicies beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/{policyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("policyName") String policyName, @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.network.v2020_04_01.WebApplicationFirewallPolicies 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.network.v2020_04_01.WebApplicationFirewallPolicies listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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;WebApplicationFirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<WebApplicationFirewallPolicyInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<WebApplicationFirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<WebApplicationFirewallPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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<WebApplicationFirewallPolicyInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<Page<WebApplicationFirewallPolicyInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Page<WebApplicationFirewallPolicyInner>>() {
+                @Override
+                public Page<WebApplicationFirewallPolicyInner> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+    ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> 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.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<WebApplicationFirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<WebApplicationFirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<WebApplicationFirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the WAF policies in a 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;WebApplicationFirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<WebApplicationFirewallPolicyInner> list() {
+        ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<WebApplicationFirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<WebApplicationFirewallPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the WAF policies in a 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<WebApplicationFirewallPolicyInner>> listAsync(final ListOperationCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<Page<WebApplicationFirewallPolicyInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Page<WebApplicationFirewallPolicyInner>>() {
+                @Override
+                public Page<WebApplicationFirewallPolicyInner> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<WebApplicationFirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<WebApplicationFirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<WebApplicationFirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve protection policy with specified name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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 WebApplicationFirewallPolicyInner object if successful.
+     */
+    public WebApplicationFirewallPolicyInner getByResourceGroup(String resourceGroupName, String policyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, policyName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieve protection policy with specified name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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<WebApplicationFirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String policyName, final ServiceCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, policyName), serviceCallback);
+    }
+
+    /**
+     * Retrieve protection policy with specified name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WebApplicationFirewallPolicyInner object
+     */
+    public Observable<WebApplicationFirewallPolicyInner> getByResourceGroupAsync(String resourceGroupName, String policyName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, policyName).map(new Func1<ServiceResponse<WebApplicationFirewallPolicyInner>, WebApplicationFirewallPolicyInner>() {
+            @Override
+            public WebApplicationFirewallPolicyInner call(ServiceResponse<WebApplicationFirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieve protection policy with specified name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WebApplicationFirewallPolicyInner object
+     */
+    public Observable<ServiceResponse<WebApplicationFirewallPolicyInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String policyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyName == null) {
+            throw new IllegalArgumentException("Parameter policyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.getByResourceGroup(resourceGroupName, policyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<WebApplicationFirewallPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<WebApplicationFirewallPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<WebApplicationFirewallPolicyInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<WebApplicationFirewallPolicyInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<WebApplicationFirewallPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<WebApplicationFirewallPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or update policy with specified rule set name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @param parameters Policy to be created.
+     * @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 WebApplicationFirewallPolicyInner object if successful.
+     */
+    public WebApplicationFirewallPolicyInner createOrUpdate(String resourceGroupName, String policyName, WebApplicationFirewallPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, policyName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or update policy with specified rule set name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @param parameters Policy to be created.
+     * @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<WebApplicationFirewallPolicyInner> createOrUpdateAsync(String resourceGroupName, String policyName, WebApplicationFirewallPolicyInner parameters, final ServiceCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, policyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or update policy with specified rule set name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @param parameters Policy to be created.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WebApplicationFirewallPolicyInner object
+     */
+    public Observable<WebApplicationFirewallPolicyInner> createOrUpdateAsync(String resourceGroupName, String policyName, WebApplicationFirewallPolicyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, policyName, parameters).map(new Func1<ServiceResponse<WebApplicationFirewallPolicyInner>, WebApplicationFirewallPolicyInner>() {
+            @Override
+            public WebApplicationFirewallPolicyInner call(ServiceResponse<WebApplicationFirewallPolicyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or update policy with specified rule set name within a resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @param parameters Policy to be created.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WebApplicationFirewallPolicyInner object
+     */
+    public Observable<ServiceResponse<WebApplicationFirewallPolicyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String policyName, WebApplicationFirewallPolicyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyName == null) {
+            throw new IllegalArgumentException("Parameter policyName 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.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2020-04-01";
+        return service.createOrUpdate(resourceGroupName, policyName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<WebApplicationFirewallPolicyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<WebApplicationFirewallPolicyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<WebApplicationFirewallPolicyInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<WebApplicationFirewallPolicyInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<WebApplicationFirewallPolicyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<WebApplicationFirewallPolicyInner>() { }.getType())
+                .register(201, new TypeToken<WebApplicationFirewallPolicyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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 policyName) {
+        deleteWithServiceResponseAsync(resourceGroupName, policyName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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 policyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, policyName), serviceCallback);
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String policyName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, policyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String policyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyName == null) {
+            throw new IllegalArgumentException("Parameter policyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, policyName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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 policyName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, policyName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @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 policyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, policyName), serviceCallback);
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String policyName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, policyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes Policy.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param policyName The name of the policy.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String policyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyName == null) {
+            throw new IllegalArgumentException("Parameter policyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2020-04-01";
+        return service.beginDelete(resourceGroupName, policyName, this.client.subscriptionId(), 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);
+    }
+
+    /**
+     * Lists all of the protection policies 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;WebApplicationFirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<WebApplicationFirewallPolicyInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<WebApplicationFirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<WebApplicationFirewallPolicyInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the protection policies 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<WebApplicationFirewallPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<WebApplicationFirewallPolicyInner>> serviceFuture, final ListOperationCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the protection policies 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;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<Page<WebApplicationFirewallPolicyInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Page<WebApplicationFirewallPolicyInner>>() {
+                @Override
+                public Page<WebApplicationFirewallPolicyInner> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the protection policies 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;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the protection policies within a resource group.
+     *
+    ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> 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<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<WebApplicationFirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<WebApplicationFirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<WebApplicationFirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @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;WebApplicationFirewallPolicyInner&gt; object if successful.
+     */
+    public PagedList<WebApplicationFirewallPolicyInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<WebApplicationFirewallPolicyInner>(response.body()) {
+            @Override
+            public Page<WebApplicationFirewallPolicyInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @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<WebApplicationFirewallPolicyInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<WebApplicationFirewallPolicyInner>> serviceFuture, final ListOperationCallback<WebApplicationFirewallPolicyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @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;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<Page<WebApplicationFirewallPolicyInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Page<WebApplicationFirewallPolicyInner>>() {
+                @Override
+                public Page<WebApplicationFirewallPolicyInner> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+     * @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;WebApplicationFirewallPolicyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>, Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(ServiceResponse<Page<WebApplicationFirewallPolicyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the WAF policies in a subscription.
+     *
+    ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;WebApplicationFirewallPolicyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> 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<WebApplicationFirewallPolicyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<WebApplicationFirewallPolicyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<WebApplicationFirewallPolicyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<WebApplicationFirewallPolicyInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<WebApplicationFirewallPolicyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<WebApplicationFirewallPolicyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyImpl.java
new file mode 100644
index 000000000000..dcd33e6f13cd
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyImpl.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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicy;
+import rx.Observable;
+import com.microsoft.azure.management.network.v2020_04_01.PolicySettings;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallCustomRule;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicyResourceState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedRulesDefinition;
+import com.microsoft.azure.SubResource;
+import java.util.ArrayList;
+import com.microsoft.azure.management.network.v2020_04_01.ApplicationGateway;
+
+class WebApplicationFirewallPolicyImpl extends GroupableResourceCoreImpl<WebApplicationFirewallPolicy, WebApplicationFirewallPolicyInner, WebApplicationFirewallPolicyImpl, NetworkManager> implements WebApplicationFirewallPolicy, WebApplicationFirewallPolicy.Definition, WebApplicationFirewallPolicy.Update {
+    WebApplicationFirewallPolicyImpl(String name, WebApplicationFirewallPolicyInner inner, NetworkManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<WebApplicationFirewallPolicy> createResourceAsync() {
+        WebApplicationFirewallPoliciesInner client = this.manager().inner().webApplicationFirewallPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<WebApplicationFirewallPolicy> updateResourceAsync() {
+        WebApplicationFirewallPoliciesInner client = this.manager().inner().webApplicationFirewallPolicies();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<WebApplicationFirewallPolicyInner> getInnerAsync() {
+        WebApplicationFirewallPoliciesInner client = this.manager().inner().webApplicationFirewallPolicies();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<ApplicationGateway> applicationGateways() {
+        List<ApplicationGateway> lst = new ArrayList<ApplicationGateway>();
+        if (this.inner().applicationGateways() != null) {
+            for (ApplicationGatewayInner inner : this.inner().applicationGateways()) {
+                lst.add( new ApplicationGatewayImpl(inner.name(), inner, manager()));
+            }
+        }
+        return lst;
+    }
+
+    @Override
+    public List<WebApplicationFirewallCustomRule> customRules() {
+        return this.inner().customRules();
+    }
+
+    @Override
+    public String etag() {
+        return this.inner().etag();
+    }
+
+    @Override
+    public List<SubResource> httpListeners() {
+        return this.inner().httpListeners();
+    }
+
+    @Override
+    public ManagedRulesDefinition managedRules() {
+        return this.inner().managedRules();
+    }
+
+    @Override
+    public List<SubResource> pathBasedRules() {
+        return this.inner().pathBasedRules();
+    }
+
+    @Override
+    public PolicySettings policySettings() {
+        return this.inner().policySettings();
+    }
+
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public WebApplicationFirewallPolicyResourceState resourceState() {
+        return this.inner().resourceState();
+    }
+
+    @Override
+    public WebApplicationFirewallPolicyImpl withManagedRules(ManagedRulesDefinition managedRules) {
+        this.inner().withManagedRules(managedRules);
+        return this;
+    }
+
+    @Override
+    public WebApplicationFirewallPolicyImpl withCustomRules(List<WebApplicationFirewallCustomRule> customRules) {
+        this.inner().withCustomRules(customRules);
+        return this;
+    }
+
+    @Override
+    public WebApplicationFirewallPolicyImpl withPolicySettings(PolicySettings policySettings) {
+        this.inner().withPolicySettings(policySettings);
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyInner.java
new file mode 100644
index 000000000000..199af253abdb
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/WebApplicationFirewallPolicyInner.java
@@ -0,0 +1,226 @@
+/**
+ * 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.network.v2020_04_01.implementation;
+
+import com.microsoft.azure.management.network.v2020_04_01.PolicySettings;
+import java.util.List;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallCustomRule;
+import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
+import com.microsoft.azure.management.network.v2020_04_01.WebApplicationFirewallPolicyResourceState;
+import com.microsoft.azure.management.network.v2020_04_01.ManagedRulesDefinition;
+import com.microsoft.azure.SubResource;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Defines web application firewall policy.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class WebApplicationFirewallPolicyInner extends Resource {
+    /**
+     * The PolicySettings for policy.
+     */
+    @JsonProperty(value = "properties.policySettings")
+    private PolicySettings policySettings;
+
+    /**
+     * The custom rules inside the policy.
+     */
+    @JsonProperty(value = "properties.customRules")
+    private List<WebApplicationFirewallCustomRule> customRules;
+
+    /**
+     * A collection of references to application gateways.
+     */
+    @JsonProperty(value = "properties.applicationGateways", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ApplicationGatewayInner> applicationGateways;
+
+    /**
+     * The provisioning state of the web application firewall policy resource.
+     * Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningState provisioningState;
+
+    /**
+     * Resource status of the policy.
+     * Resource status of the policy. Possible values include: 'Creating',
+     * 'Enabling', 'Enabled', 'Disabling', 'Disabled', 'Deleting'.
+     */
+    @JsonProperty(value = "properties.resourceState", access = JsonProperty.Access.WRITE_ONLY)
+    private WebApplicationFirewallPolicyResourceState resourceState;
+
+    /**
+     * Describes the managedRules structure.
+     */
+    @JsonProperty(value = "properties.managedRules", required = true)
+    private ManagedRulesDefinition managedRules;
+
+    /**
+     * A collection of references to application gateway http listeners.
+     */
+    @JsonProperty(value = "properties.httpListeners", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> httpListeners;
+
+    /**
+     * A collection of references to application gateway path rules.
+     */
+    @JsonProperty(value = "properties.pathBasedRules", access = JsonProperty.Access.WRITE_ONLY)
+    private List<SubResource> pathBasedRules;
+
+    /**
+     * A unique read-only string that changes whenever the resource is updated.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Resource ID.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get the PolicySettings for policy.
+     *
+     * @return the policySettings value
+     */
+    public PolicySettings policySettings() {
+        return this.policySettings;
+    }
+
+    /**
+     * Set the PolicySettings for policy.
+     *
+     * @param policySettings the policySettings value to set
+     * @return the WebApplicationFirewallPolicyInner object itself.
+     */
+    public WebApplicationFirewallPolicyInner withPolicySettings(PolicySettings policySettings) {
+        this.policySettings = policySettings;
+        return this;
+    }
+
+    /**
+     * Get the custom rules inside the policy.
+     *
+     * @return the customRules value
+     */
+    public List<WebApplicationFirewallCustomRule> customRules() {
+        return this.customRules;
+    }
+
+    /**
+     * Set the custom rules inside the policy.
+     *
+     * @param customRules the customRules value to set
+     * @return the WebApplicationFirewallPolicyInner object itself.
+     */
+    public WebApplicationFirewallPolicyInner withCustomRules(List<WebApplicationFirewallCustomRule> customRules) {
+        this.customRules = customRules;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to application gateways.
+     *
+     * @return the applicationGateways value
+     */
+    public List<ApplicationGatewayInner> applicationGateways() {
+        return this.applicationGateways;
+    }
+
+    /**
+     * Get the provisioning state of the web application firewall policy resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get resource status of the policy. Possible values include: 'Creating', 'Enabling', 'Enabled', 'Disabling', 'Disabled', 'Deleting'.
+     *
+     * @return the resourceState value
+     */
+    public WebApplicationFirewallPolicyResourceState resourceState() {
+        return this.resourceState;
+    }
+
+    /**
+     * Get describes the managedRules structure.
+     *
+     * @return the managedRules value
+     */
+    public ManagedRulesDefinition managedRules() {
+        return this.managedRules;
+    }
+
+    /**
+     * Set describes the managedRules structure.
+     *
+     * @param managedRules the managedRules value to set
+     * @return the WebApplicationFirewallPolicyInner object itself.
+     */
+    public WebApplicationFirewallPolicyInner withManagedRules(ManagedRulesDefinition managedRules) {
+        this.managedRules = managedRules;
+        return this;
+    }
+
+    /**
+     * Get a collection of references to application gateway http listeners.
+     *
+     * @return the httpListeners value
+     */
+    public List<SubResource> httpListeners() {
+        return this.httpListeners;
+    }
+
+    /**
+     * Get a collection of references to application gateway path rules.
+     *
+     * @return the pathBasedRules value
+     */
+    public List<SubResource> pathBasedRules() {
+        return this.pathBasedRules;
+    }
+
+    /**
+     * Get a unique read-only string that changes whenever the resource is updated.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param id the id value to set
+     * @return the WebApplicationFirewallPolicyInner object itself.
+     */
+    public WebApplicationFirewallPolicyInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/package-info.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/package-info.java
new file mode 100644
index 000000000000..846d4657229d
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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 NetworkManagementClient.
+ * Network Client.
+ */
+package com.microsoft.azure.management.network.v2020_04_01.implementation;
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/package-info.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/package-info.java
new file mode 100644
index 000000000000..58c0c834d3f2
--- /dev/null
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_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 NetworkManagementClient.
+ * Network Client.
+ */
+package com.microsoft.azure.management.network.v2020_04_01;
diff --git a/sdk/network/pom.mgmt.xml b/sdk/network/pom.mgmt.xml
index 229c5614a3f1..dc5a6fa97fba 100644
--- a/sdk/network/pom.mgmt.xml
+++ b/sdk/network/pom.mgmt.xml
@@ -23,5 +23,6 @@
     <module>mgmt-v2019_09_01</module>
     <module>mgmt-v2019_11_01</module>
     <module>mgmt-v2020_03_01</module>
+    <module>mgmt-v2020_04_01</module>
   </modules>
 </project>

From fcdaff1ebc84a6f660f94c54038c2c34fef76e0c Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Fri, 8 May 2020 06:23:26 -0700
Subject: [PATCH 31/41] Update EH versions for May release (#10914)

* Update EH versions for May release

* Update amqp version

* Update readme and changelog

* Update readme and changelog
---
 eng/jacoco-test-coverage/pom.xml                           | 4 ++--
 eng/versioning/version_client.txt                          | 7 +++----
 sdk/core/azure-core-amqp/CHANGELOG.md                      | 4 ++++
 sdk/core/azure-core-amqp/README.md                         | 2 +-
 .../CHANGELOG.md                                           | 5 ++++-
 .../README.md                                              | 2 +-
 .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 4 ++--
 sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md       | 7 ++++++-
 sdk/eventhubs/azure-messaging-eventhubs/README.md          | 2 +-
 sdk/eventhubs/azure-messaging-eventhubs/pom.xml            | 4 ++--
 sdk/servicebus/azure-messaging-servicebus/pom.xml          | 2 +-
 11 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 917e3fbc14f3..1344a54204a2 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -119,12 +119,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+      <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
+      <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 47322524d680..6d2ddb9e2601 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -7,7 +7,7 @@ com.azure:azure-client-sdk-parent;1.7.0;1.7.0
 com.azure:azure-ai-formrecognizer;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-ai-textanalytics;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-core;1.5.0;1.6.0-beta.1
-com.azure:azure-core-amqp;1.1.1;1.2.0-beta.1
+com.azure:azure-core-amqp;1.1.2;1.2.0-beta.1
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-http-netty;1.5.1;1.6.0-beta.1
 com.azure:azure-core-http-okhttp;1.2.2;1.3.0-beta.1
@@ -23,8 +23,8 @@ com.azure:azure-data-appconfiguration;1.1.1;1.2.0-beta.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-identity;1.0.6;1.1.0-beta.4
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-messaging-eventhubs;5.0.3;5.1.0-beta.1
-com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0-beta.1
+com.azure:azure-messaging-eventhubs;5.0.3;5.1.0
+com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0
 com.azure:azure-messaging-servicebus;7.0.0-beta.1;7.0.0-beta.2
 com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
@@ -48,7 +48,6 @@ com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 # Format;
 # unreleased_<groupId>:<artifactId>;dependency-version
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
-unreleased_com.azure:azure-core-amqp;1.1.0
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
 # version and set the version to the released beta. Released beta dependencies are only valid
diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md
index b5713e7fb93e..afe1283c77b3 100644
--- a/sdk/core/azure-core-amqp/CHANGELOG.md
+++ b/sdk/core/azure-core-amqp/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## 1.2.0-beta.1 (Unreleased)
 
 
+## 1.1.2 (2020-05-07)
+
+- Fixes dependency version of `azure-core`.
+
 ## 1.1.1 (2020-05-07)
 - Bug fix to get link size from service the first time before sending message from `ReactorSender`.
 
diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md
index 651e0fbbf525..4b2055a81f78 100644
--- a/sdk/core/azure-core-amqp/README.md
+++ b/sdk/core/azure-core-amqp/README.md
@@ -16,7 +16,7 @@ own AMQP client library that abstracts from the underlying transport library's i
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-amqp</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
index b8543fc8c974..90fdbfc7f111 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.1.0 (2020-05-07)
+- Updated version of `azure-messaging-eventhubs` to `5.1.0`.
 
+## 1.1.0-beta.1 (2020-04-08)
+- Updated version of `azure-messaging-eventhubs` to `5.1.0-beta.1` that supports receiving events in batches.
 
 ## 1.0.3 (2020-04-08)
 - Fix bug where processor would hang after a reconnect due to being unable to load balance partitions.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md
index e28be92d86d0..88502077372f 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md
@@ -27,7 +27,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples]
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
index 51ecdaa85565..02ae5b06cc69 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-  <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
+  <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
 
   <name>Microsoft Azure client library for storing checkpoints in Storage Blobs</name>
   <description>Library for using storing checkpoints in Storage Blobs</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+      <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
index 2d9d55399041..7e19bde17a49 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Release History
 
-## 5.1.0-beta.1 (Unreleased)
+## 5.1.0 (2020-05-07)
+- Add support for sending a collection of events as a single batch from `EventHubProducerClient` and `EventHubProducerAsyncClient`.
+- Updated dependency version of `azure-core-amqp` to `1.1.2`.
 
+## 5.1.0-beta.1 (2020-04-08)
+- Add support for heartbeat for single process event function in Event Processor Client.
+- Add support for receiving events in batches in Event Processor Client.
 
 ## 5.0.3 (2020-04-08)
 - Fix bug where producers and consumers would be unable to get partition information after a reconnect.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md
index 4b43e241caa9..909de00859f5 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/README.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md
@@ -59,7 +59,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples]
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-messaging-eventhubs</artifactId>
-    <version>5.0.3</version>
+    <version>5.1.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
index da04f32024ba..635772faf26a 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-messaging-eventhubs</artifactId>
-  <version>5.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+  <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
 
   <name>Microsoft Azure client library for Event Hubs</name>
   <description>Libraries built on Microsoft Azure Event Hubs</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.1.0</version> <!-- {x-version-update;unreleased_com.azure:azure-core-amqp;dependency} -->
+      <version>1.1.2</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml
index 1b8a9bf2a600..a89e381ed309 100644
--- a/sdk/servicebus/azure-messaging-servicebus/pom.xml
+++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.1.0</version> <!-- {x-version-update;unreleased_com.azure:azure-core-amqp;dependency} -->
+      <version>1.1.2</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

From 495d1c6629dc627a4af0dba8fd812ec50e688339 Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Fri, 8 May 2020 10:52:09 -0700
Subject: [PATCH 32/41] Update building and testing section to refer to wiki
 (#10911)

---
 CONTRIBUTING.md | 51 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d5ebf0f6e7b..1d478985997a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@ Merging Pull Requests (for project contributors with write access)
 
 ### Pre-requisites
 
-- Install Java Development Kit 8
+- Install Java Development Kit 8 or 11
   - add `JAVA_HOME` to environment variables
 - Install [Maven](http://maven.apache.org/download.cgi)
   - add `MAVEN_HOME` to environment variables
@@ -54,52 +54,11 @@ Merging Pull Requests (for project contributors with write access)
 `REG ADD HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1`<br>*(might need to type `yes` to override key if it already exists)*<br><br>
 2.- Set up `git` by running:<br> `git config --system core.longpaths true`
 
-### Building and Testing
+### Building and Unit Testing
 
->**Note**: Build and test instructions have recently changed. The ```pom.client.xml``` file is no
-> longer in the root of the repository and should be not be used as an aggregator moving forward.
-
-This repository uses Maven to build the various modules that make up the Azure SDK for Java. You can build the entire set of modules by running the following command from the root of the repository:
-
-```
-mvn -Dgpg.skip clean install
-```
-
-This will build, test and install all of the modules into your local Maven cache. Optionally, you
-can also skip unit test execution by issuing the following command. This can be useful when you
-just want to try out a quick change without having to worry about unit tests.
-
-```
-mvn -Dgpg.skip -DskipTests clean install
-```
-
-If you only want to work on one module, you may opt to build just that module and its dependencies (e.g. com.azure:azure-messaging-eventhubs):
-
-```
-mvn -Dgpg.skip -DskipTests -pl com.azure:azure-messaging-eventhubs -am
-```
-
-The ```-pl``` switch takes a comma seperated list of fully qualified module names and the ```-am```
-switch tells Maven to _also make_ all of the dependencies within the repository that it depends on. If
-you are making changes across two modules you can tell Maven to build them both like this:
-
-```
-mvn -Dgpg.skip -DskipTests -pl com.azure:azure-messaging-eventhubs,com.azure:azure-core-amqp -am
-```
-
-Some parts of the SDK have multiple modules for a particular service, if you want to avoid typing
-in all those module names for the ```-pl``` switch you can just target the appropriate POM file
-(e.g. sdk/eventhubs/pom.xml) and execute the following command.
-
-```
-mvn -f sdk/eventhubs/pom.xml -Dgpg.skip clean install
-```
-
-Note that any dependencies for those modules will need to be in the Maven cache so will want to run
-the first command listed above once to get the cache primed with all the dependencies.
-
->**Note**: Refer to [wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning about how to build using Java 11 
->and [this wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit testing
+Refer to the [build wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Building) for learning how to build Java SDKs
+and the [unit testing wiki](https://github.com/Azure/azure-sdk-for-java/wiki/Unit-Testing) for guidelines on unit 
+testing.
 
 ### Live testing
 

From 8297bf5c9da2015ddd5817e596041f9a77916fa3 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Fri, 8 May 2020 12:30:31 -0700
Subject: [PATCH 33/41] Set default test order to alphabetical (#10925)

- If unset, the default order is "filesystem" which can vary based on OS or configuration and cause unexpected test failures.
- Ideally, tests should pass in any order, but it seems some tests currently have ordering requirements (likely unintentional).
---
 sdk/parents/azure-client-sdk-parent/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
index 3dccca4f957c..723a04d6366a 100644
--- a/sdk/parents/azure-client-sdk-parent/pom.xml
+++ b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -718,6 +718,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
           <configuration>
+            <runOrder>alphabetical</runOrder>
             <useSystemClassLoader>false</useSystemClassLoader>
             <properties>
               <configurationParameters>

From 50b0531cfc750d6eca681cef2d0eaf82ac0d511d Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Fri, 8 May 2020 12:35:16 -0700
Subject: [PATCH 34/41] Update org.springframework:spring-web for CVE issue
 (#10971)

---
 eng/versioning/external_dependencies.txt                    | 2 +-
 .../azure-spring-boot-starter-active-directory/pom.xml      | 4 ++--
 sdk/spring/azure-spring-boot/pom.xml                        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
index cb9b5c4e0298..8881dde9edfd 100644
--- a/eng/versioning/external_dependencies.txt
+++ b/eng/versioning/external_dependencies.txt
@@ -69,7 +69,7 @@ org.springframework.security:spring-security-web;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-client;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-core;5.2.0.RELEASE
 org.springframework.security:spring-security-oauth2-jose;5.2.0.RELEASE
-org.springframework:spring-web;5.2.0.RELEASE
+org.springframework:spring-web;5.2.5.RELEASE
 pl.pragmatists:JUnitParams;1.1.1
 
 ## Test dependency versions
diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
index 711803dd33e6..615a3027b462 100644
--- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.2.0.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
+      <version>5.2.5.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -86,7 +86,7 @@
                 <include>com.fasterxml.jackson.core:jackson-databind:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
                 <include>com.microsoft.azure:msal4j:[1.3.0]</include> <!-- {x-include-update;com.microsoft.azure:msal4j;external_dependency} -->
                 <include>com.nimbusds:nimbus-jose-jwt:[7.9]</include> <!-- {x-include-update;com.nimbusds:nimbus-jose-jwt;external_dependency} -->
-                <include>org.springframework:spring-web:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
+                <include>org.springframework:spring-web:[5.2.5.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
                 <include>org.springframework.security:spring-security-config:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.security:spring-security-config;external_dependency} -->
diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml
index 8865bab2aad1..da5366d7d5ce 100644
--- a/sdk/spring/azure-spring-boot/pom.xml
+++ b/sdk/spring/azure-spring-boot/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.2.0.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
+      <version>5.2.5.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -204,14 +204,14 @@
                 <include>javax.validation:validation-api:[2.0.1.Final]</include> <!-- {x-include-update;javax.validation:validation-api;external_dependency} -->
                 <include>org.slf4j:slf4j-api:[1.7.28]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
                 <include>org.hibernate.validator:hibernate-validator:[6.0.17.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
-                <include>org.springframework:spring-web:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
+                <include>org.springframework:spring-web:[5.2.5.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-autoconfigure:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-test:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
-                <include>org.springframework:spring-web:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
+                <include>org.springframework:spring-web:[5.2.5.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
                 <include>org.springframework.security:spring-security-config:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.security:spring-security-config;external_dependency} -->
                 <include>org.springframework.security:spring-security-core:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.security:spring-security-core;external_dependency} -->
                 <include>org.springframework.security:spring-security-oauth2-client:[5.2.0.RELEASE]</include> <!-- {x-include-update;org.springframework.security:spring-security-oauth2-client;external_dependency} -->

From 3777e2d02395b9c482142e330aeb667bf7adaa28 Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Fri, 8 May 2020 12:52:26 -0700
Subject: [PATCH 35/41] Update dep scanner (#10961)

---
 .../scan_for_unreleased_dependencies.ps1       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/eng/versioning/scan_for_unreleased_dependencies.ps1 b/eng/versioning/scan_for_unreleased_dependencies.ps1
index 4727f0d4f182..b890bd913cc4 100644
--- a/eng/versioning/scan_for_unreleased_dependencies.ps1
+++ b/eng/versioning/scan_for_unreleased_dependencies.ps1
@@ -87,6 +87,21 @@ Get-ChildItem -Path $serviceDirectory -Filter pom*.xml -Recurse -File | ForEach-
                         Write-Error-With-Color "Error: Cannot release non-beta libraries with beta_ dependencies. dependency=$($versionUpdateTag)"
                     }
                     continue
+                } else {
+                    # If this is an external dependency then continue
+                    if ($versionUpdateTag -match "external_dependency}") {
+                        continue
+                    }
+                    # If this isn't an external dependency then ensure that if the dependency
+                    # version is beta, that we're releasing a beta, otherwise fail
+                    if ($versionNode.InnerText -like '*-beta.*') 
+                    {
+                        if (!$libraryIsBeta)
+                        {
+                            $script:FoundError = $true
+                            Write-Error-With-Color "Error: Cannot release non-beta libraries with beta dependencies. dependency=$($versionUpdateTag), version=$($versionNode.InnerText.Trim())"
+                        }
+                    }
                 }
             }
             else
@@ -106,8 +121,7 @@ if (-Not $script:FoundPomFile) {
     exit(1)
 }
 if ($script:FoundError) {
-    Write-Error-With-Color "Libaries with unreleased dependencies cannot be released."
     exit(1)
 }
 
-Write-Host "$($inputGroupId):$($inputArtifactId) looks goood to release" -ForegroundColor Green
\ No newline at end of file
+Write-Host "$($inputGroupId):$($inputArtifactId) looks good to release" -ForegroundColor Green
\ No newline at end of file

From f620acc4b6c968de8af26a8d088f41477ec7739c Mon Sep 17 00:00:00 2001
From: Hemant Tanwar <hemant_tanwar@hotmail.com>
Date: Fri, 8 May 2020 13:46:37 -0700
Subject: [PATCH 36/41] README: Changing identity version to latest and adding
 some more explanation (#10977)

changing identity version
---
 sdk/servicebus/azure-messaging-servicebus/README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md
index 9c9b489e3172..18f538c07392 100644
--- a/sdk/servicebus/azure-messaging-servicebus/README.md
+++ b/sdk/servicebus/azure-messaging-servicebus/README.md
@@ -103,7 +103,7 @@ platform. First, add the package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -232,6 +232,14 @@ receiver.receive(10).forEach(context -> {
     receiver.complete(message);
 });
 ```
+There are four ways of settling messages:
+  - Complete - causes the message to be deleted from the queue or topic.
+  - Abandon - releases the receiver's lock on the message allowing for the message to be received by other receivers.
+  - Defer - defers the message from being received by normal means. In order to receive deferred messages, the sequence 
+number of the message needs to be retained.
+  - Dead-letter - moves the message to the [dead-letter queue](https://docs.microsoft.com/azure/service-bus-messaging/service-bus-dead-letter-queues). This will prevent the message from being received again. 
+In order to receive messages from the dead-letter queue, a receiver scoped to the dead-letter queue is needed.
+
 
 ### Send and receive from session enabled queues or topics
 

From b801aed4c2c945e7891f2fb6333c85bd1af1e4b9 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Fri, 8 May 2020 14:06:34 -0700
Subject: [PATCH 37/41] Increment version for eventhubs releases (#10967)

* Increment package version after release of com.azure azure-messaging-eventhubs-checkpointstore-blob

* Increment package version after release of com.azure azure-messaging-eventhubs
---
 eng/jacoco-test-coverage/pom.xml                              | 4 ++--
 eng/versioning/version_client.txt                             | 4 ++--
 .../CHANGELOG.md                                              | 3 +++
 .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml    | 4 ++--
 sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md          | 3 +++
 sdk/eventhubs/azure-messaging-eventhubs/pom.xml               | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 1344a54204a2..b67e5414737c 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -119,12 +119,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+      <version>5.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
+      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 6d2ddb9e2601..88e44527049d 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -23,8 +23,8 @@ com.azure:azure-data-appconfiguration;1.1.1;1.2.0-beta.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-identity;1.0.6;1.1.0-beta.4
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-messaging-eventhubs;5.0.3;5.1.0
-com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0
+com.azure:azure-messaging-eventhubs;5.1.0;5.2.0-beta.1
+com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.0;1.2.0-beta.1
 com.azure:azure-messaging-servicebus;7.0.0-beta.1;7.0.0-beta.2
 com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
index 90fdbfc7f111..8662243786c9 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.2.0-beta.1 (Unreleased)
+
+
 ## 1.1.0 (2020-05-07)
 - Updated version of `azure-messaging-eventhubs` to `5.1.0`.
 
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
index 02ae5b06cc69..487fa53ea7cb 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-  <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
+  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
 
   <name>Microsoft Azure client library for storing checkpoints in Storage Blobs</name>
   <description>Library for using storing checkpoints in Storage Blobs</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+      <version>5.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
index 7e19bde17a49..4ea46cdb5d19 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 5.2.0-beta.1 (Unreleased)
+
+
 ## 5.1.0 (2020-05-07)
 - Add support for sending a collection of events as a single batch from `EventHubProducerClient` and `EventHubProducerAsyncClient`.
 - Updated dependency version of `azure-core-amqp` to `1.1.2`.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
index 635772faf26a..93172fb920ee 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-messaging-eventhubs</artifactId>
-  <version>5.1.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
+  <version>5.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
 
   <name>Microsoft Azure client library for Event Hubs</name>
   <description>Libraries built on Microsoft Azure Event Hubs</description>

From 150680cc74d04e3a4ca61e76f894ff470651c74a Mon Sep 17 00:00:00 2001
From: Bhaskar Mallapragada <mbhaskar@gmail.com>
Date: Fri, 8 May 2020 15:24:11 -0700
Subject: [PATCH 38/41] Adding support for autoscale throughput (#10650)

* Autoscale/Autopilot support
- Added ThroughputProperties class which contains factories for creating autoscaled or fixed throughput
- Added ThroughputResponse class to fetch relevant details of offer response
- Added overloads for database and container to create using throughput properties
- Added read and replace overloads for database and container to read or replace throughput response
* Moving throughput tests to a new test class.
---
 .../com/azure/cosmos/CosmosAsyncClient.java   |  14 ++
 .../azure/cosmos/CosmosAsyncContainer.java    |  66 ++++++++
 .../com/azure/cosmos/CosmosAsyncDatabase.java |  96 ++++++++++++
 .../com/azure/cosmos/CosmosContainer.java     |  20 +++
 .../java/com/azure/cosmos/CosmosDatabase.java |  41 ++++-
 .../cosmos/implementation/Constants.java      |   5 +
 .../cosmos/implementation/HttpConstants.java  |   3 +
 .../azure/cosmos/implementation/Offer.java    | 105 ++++++++++++-
 .../OfferAutoscaleAutoUpgradeProperties.java  |  42 ++++++
 .../OfferAutoscaleSettings.java               |  55 +++++++
 .../cosmos/implementation/RequestOptions.java |  10 ++
 .../implementation/RxDocumentClientImpl.java  |  28 ++++
 .../models/CosmosContainerRequestOptions.java |   7 +
 .../models/CosmosDatabaseRequestOptions.java  |   8 +
 .../azure/cosmos/models/CosmosResponse.java   |   2 +-
 .../cosmos/models/ModelBridgeInternal.java    |  24 +++
 .../cosmos/models/ThroughputProperties.java   |  93 ++++++++++++
 .../cosmos/models/ThroughputResponse.java     |  54 +++++++
 .../ThroughputPropertiesCodeSnippet.java      |  20 +++
 .../azure/cosmos/CosmosResponseValidator.java |   4 +-
 .../azure/cosmos/rx/CollectionCrudTest.java   |  22 +++
 .../com/azure/cosmos/rx/DatabaseCrudTest.java |   5 +
 .../com/azure/cosmos/rx/ThroughputTests.java  | 142 ++++++++++++++++++
 23 files changed, 862 insertions(+), 4 deletions(-)
 create mode 100644 sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleAutoUpgradeProperties.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleSettings.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputProperties.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputResponse.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/ThroughputPropertiesCodeSnippet.java
 create mode 100644 sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ThroughputTests.java

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
index 2e2aaf51d213..afdb6877aa63 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java
@@ -16,6 +16,7 @@
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.UtilBridgeInternal;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -342,6 +343,19 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabase(String id, int throughpu
         return createDatabase(new CosmosDatabaseProperties(id), options);
     }
 
+    /**
+     * Creates a database.
+     *
+     * @param id the id
+     * @param throughputProperties the throughputProperties
+     * @return the mono
+     */
+    public Mono<CosmosAsyncDatabaseResponse> createDatabase(String id, ThroughputProperties throughputProperties) {
+        CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions();
+        ModelBridgeInternal.setOfferProperties(options, throughputProperties);
+        return createDatabase(new CosmosDatabaseProperties(id), options);
+    }
+
     /**
      * Reads all databases.
      * <p>
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java
index f33665cdbc54..9e416dc328a7 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java
@@ -19,6 +19,8 @@
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.UtilBridgeInternal;
 import reactor.core.publisher.Flux;
@@ -661,6 +663,70 @@ public Mono<Integer> replaceProvisionedThroughput(int requestUnitsPerSecond) {
                    }).map(offerResourceResponse -> offerResourceResponse.getResource().getThroughput());
     }
 
+    /**
+     * Replace the throughput .
+     *
+     * @param throughputProperties the throughput properties
+     * @return the mono containing throughput response
+     */
+    public Mono<ThroughputResponse> replaceThroughput(ThroughputProperties throughputProperties) {
+        return this.read()
+                   .flatMap(response -> this.database.getDocClientWrapper()
+                                            .queryOffers(database.getOfferQuerySpecFromResourceId(response
+                                                                                                      .getProperties()
+                                                                                                      .getResourceId())
+                                                , new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the " +
+                                                                                  "resource " + this.getId()));
+                                                }
+
+                                                Offer existingOffer = offerFeedResponse.getResults().get(0);
+                                                Offer updatedOffer =
+                                                    ModelBridgeInternal.updateOfferFromProperties(existingOffer,
+                                                                                              throughputProperties);
+                                                return this.database.getDocClientWrapper()
+                                                           .replaceOffer(updatedOffer)
+                                                           .single();
+                                            }).map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+    /**
+     * Read the throughput throughput .
+     *
+     * @return the mono containing throughput response
+     */
+    public Mono<ThroughputResponse> readThroughput() {
+        return this.read()
+                   .flatMap(response -> this.database.getDocClientWrapper()
+                                            .queryOffers(database.getOfferQuerySpecFromResourceId(response
+                                                                                                      .getProperties()
+                                                                                                      .getResourceId())
+                                                , new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the resource "
+                                                                                  + this.getId()));
+                                                }
+                                                return this.database.getDocClientWrapper()
+                                                           .readOffer(offerFeedResponse.getResults()
+                                                                          .get(0)
+                                                                          .getSelfLink())
+                                                           .single();
+                                            })
+                                            .map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+
     /**
      * Gets the parent Database
      *
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java
index f84535a1ee77..e0352ec3893d 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java
@@ -11,17 +11,24 @@
 import com.azure.cosmos.models.CosmosAsyncUserResponse;
 import com.azure.cosmos.models.CosmosContainerProperties;
 import com.azure.cosmos.models.CosmosContainerRequestOptions;
+import com.azure.cosmos.models.CosmosDatabaseProperties;
 import com.azure.cosmos.models.CosmosDatabaseRequestOptions;
 import com.azure.cosmos.models.CosmosUserProperties;
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.ModelBridgeInternal;
+import com.azure.cosmos.models.SqlParameter;
 import com.azure.cosmos.models.SqlQuerySpec;
 import com.azure.cosmos.implementation.apachecommons.lang.StringUtils;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.UtilBridgeInternal;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Mono;
 
+import java.util.Collections;
+import java.util.List;
+
 import static com.azure.cosmos.implementation.Utils.setContinuationTokenAndMaxItemCount;
 
 /**
@@ -154,6 +161,22 @@ public Mono<CosmosAsyncContainerResponse> createContainer(
         return createContainer(containerProperties, options);
     }
 
+    /**
+     * Creates a container.
+     *
+     * @param containerProperties the container properties
+     * @param throughputProperties the throughput properties
+     * @param options the request options
+     * @return the mono
+     */
+    public Mono<CosmosAsyncContainerResponse> createContainer(
+        CosmosContainerProperties containerProperties,
+        ThroughputProperties throughputProperties,
+        CosmosContainerRequestOptions options){
+        ModelBridgeInternal.setOfferProperties(options, throughputProperties);
+        return createContainer(containerProperties, options);
+    }
+
     /**
      * Creates a document container.
      * <p>
@@ -663,6 +686,79 @@ public Mono<Integer> replaceProvisionedThroughput(int requestUnitsPerSecond) {
                                                                                               .getThroughput()));
     }
 
+    /**
+     * Sets throughput provisioned for a container in measurement of
+     * Requests-per-Unit in the Azure Cosmos service.
+     *
+     * @param throughputProperties the throughput properties
+     * @return the mono
+     */
+    public Mono<ThroughputResponse> replaceThroughput(ThroughputProperties throughputProperties) {
+        return this.read()
+                   .flatMap(response -> this.getDocClientWrapper()
+                                            .queryOffers(getOfferQuerySpecFromResourceId(response.getProperties()
+                                                                                             .getResourceId()),
+                                                         new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the " +
+                                                                                  "resource " + this.getId()));
+                                                }
+
+                                                Offer existingOffer = offerFeedResponse.getResults().get(0);
+                                                Offer updatedOffer =
+                                                    ModelBridgeInternal.updateOfferFromProperties(existingOffer,
+                                                                                              throughputProperties);
+
+                                                return this.getDocClientWrapper()
+                                                           .replaceOffer(updatedOffer)
+                                                           .single();
+                                            })
+                                            .map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+    /**
+     * Gets the throughput of the database
+     *
+     * @return the mono containing throughput response
+     */
+    public Mono<ThroughputResponse> readThroughput() {
+        return this.read()
+                   .flatMap(response -> getDocClientWrapper()
+                                            .queryOffers(getOfferQuerySpecFromResourceId(response.getProperties()
+                                                                                            .getResourceId()),
+                                                         new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the " +
+                                                                                  "resource " + this.getId()));
+                                                }
+                                                return getDocClientWrapper()
+                                                           .readOffer(offerFeedResponse.getResults()
+                                                                          .get(0)
+                                                                          .getSelfLink())
+                                                           .single();
+                                            })
+                                            .map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+    SqlQuerySpec getOfferQuerySpecFromResourceId(String resourceId) {
+        String queryText = "select * from c where c.offerResourceId = @resourceId";
+        SqlQuerySpec querySpec = new SqlQuerySpec(queryText);
+        List<SqlParameter> parameters = Collections
+                                            .singletonList(new SqlParameter("@resourceId", resourceId));
+        querySpec.setParameters(parameters);
+        return querySpec;
+    }
+
     CosmosAsyncClient getClient() {
         return client;
     }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java
index bb9c874f3d44..06002438b337 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java
@@ -13,6 +13,8 @@
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.CosmosPagedIterable;
 import com.azure.cosmos.util.UtilBridgeInternal;
@@ -140,6 +142,24 @@ public Integer replaceProvisionedThroughput(int requestUnitsPerSecond) throws Co
                                                       .replaceProvisionedThroughput(requestUnitsPerSecond));
     }
 
+    /**
+     * Sets the throughput.
+     *
+     * @param throughputProperties the throughput properties
+     * @return the throughput response
+     */
+    public ThroughputResponse replaceThroughput(ThroughputProperties throughputProperties) {
+        return database.throughputResponseToBlock(this.asyncContainer.replaceThroughput(throughputProperties));
+    }
+
+    /**
+     * Gets the throughput.
+     *
+     * @return the throughput response
+     */
+    public ThroughputResponse readThroughput() {
+        return database.throughputResponseToBlock(this.asyncContainer.readThroughput());
+    }
 
     /* CosmosAsyncItem operations */
 
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java
index 9fee11c726be..cf9fd465ed70 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java
@@ -15,6 +15,8 @@
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.CosmosPagedIterable;
 import com.azure.cosmos.util.UtilBridgeInternal;
@@ -155,6 +157,24 @@ public CosmosContainerResponse createContainer(
                                                                                  options));
     }
 
+    /**
+     * Creates a cosmos container.
+     *
+     * @param containerProperties the container properties
+     * @param throughputProperties the throughput properties
+     * @param options the options
+     * @return the cosmos container response
+     * @throws CosmosClientException the cosmos client exception
+     */
+    public CosmosContainerResponse createContainer(
+        CosmosContainerProperties containerProperties,
+        ThroughputProperties throughputProperties,
+        CosmosContainerRequestOptions options) throws CosmosClientException {
+        return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties,
+                                                                                 throughputProperties,
+                                                                                 options));
+    }
+
     /**
      * Create container cosmos sync container response.
      *
@@ -479,7 +499,26 @@ public Integer replaceProvisionedThroughput(int requestUnitsPerSecond) throws Co
         return throughputResponseToBlock(databaseWrapper.replaceProvisionedThroughput(requestUnitsPerSecond));
     }
 
-    Integer throughputResponseToBlock(Mono<Integer> throughputResponse) throws CosmosClientException {
+    /**
+     * Sets the throughput.
+     *
+     * @param throughputProperties the throughput properties
+     * @return the throughput response
+     */
+    public ThroughputResponse replaceThroughput(ThroughputProperties throughputProperties) {
+        return throughputResponseToBlock(databaseWrapper.replaceThroughput(throughputProperties));
+    }
+
+    /**
+     * Gets the throughput of the database
+     *
+     * @return the throughput response
+     */
+    public ThroughputResponse readThroughput() {
+        return throughputResponseToBlock(databaseWrapper.readThroughput());
+    }
+
+    <T> T throughputResponseToBlock(Mono<T> throughputResponse) throws CosmosClientException {
         try {
             return throughputResponse.block();
         } catch (Exception ex) {
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Constants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Constants.java
index 5e1fac067138..fea6a976cb21 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Constants.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Constants.java
@@ -50,6 +50,11 @@ public static final class Properties {
         public static final String DOCUMENTS_LINK = "_docs";
         public static final String RESOURCE_LINK = "resource";
         public static final String MEDIA_LINK = "media";
+        public static final String AUTOPILOT_MAX_THROUGHPUT = "maxThroughput";
+        public static final String AUTOPILOT_AUTO_UPGRADE_POLICY = "autoUpgradePolicy";
+        public static final String AUTOPILOT_AUTO_THROUGHPUT_POLICY = "throughputPolicy";
+        public static final String AUTOPILOT_THROUGHPUT_POLICY_INCREMENT_PERCENT = "incrementPercent";
+        public static final String AUTOPILOT_SETTINGS = "offerAutopilotSettings";
 
         public static final String PERMISSION_MODE = "permissionMode";
         public static final String RESOURCE_KEY = "key";
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
index b6ba29c7f982..b14fce7394f8 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
@@ -171,6 +171,9 @@ public static class HttpHeaders {
         public static final String OFFER_TYPE = "x-ms-offer-type";
         public static final String OFFER_THROUGHPUT = "x-ms-offer-throughput";
         public static final String OFFER_IS_RU_PER_MINUTE_THROUGHPUT_ENABLED = "x-ms-offer-is-ru-per-minute-throughput-enabled";
+        public static final String OFFER_MIN_THROUGHPUT = "x-ms-cosmos-min-throughput";
+        public static final String OFFER_AUTOPILOT_SETTINGS = "x-ms-cosmos-offer-autopilot-settings";
+        public static final String OFFER_REPLACE_PENDING = "x-ms-offer-replace-pending";
 
         // Upsert header
         public static final String IS_UPSERT = "x-ms-documentdb-is-upsert";
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Offer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Offer.java
index 0364a22f11b6..c5c5db127928 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Offer.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Offer.java
@@ -4,6 +4,7 @@
 package com.azure.cosmos.implementation;
 
 import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.Resource;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -26,6 +27,18 @@ public Offer(int offerThroughput) {
         this.setContent(content);
     }
 
+    Offer(OfferAutoscaleSettings offerAutoscaleSettings) {
+        super();
+        this.setOfferVersion(Constants.Properties.OFFER_VERSION_V2);
+        this.setOfferType("");
+        ObjectNode content = Utils.getSimpleObjectMapper().createObjectNode();
+//        content.put(Constants.Properties.OFFER_THROUGHPUT, null);
+        content.replace(Constants.Properties.AUTOPILOT_SETTINGS, ModelBridgeInternal
+                                                                     .getPropertyBagFromJsonSerializable(offerAutoscaleSettings));
+        this.setContent(content);
+    }
+
+
     /**
      * Initialize an offer object from json string.
      *
@@ -34,7 +47,80 @@ public Offer(int offerThroughput) {
     public Offer(String jsonString) {
         super(jsonString);
     }
-    
+
+    /**
+     * Instantiates a new Offer from object node.
+     *
+     * @param objectNode the object node
+     */
+    public Offer(ObjectNode objectNode) {
+        super(objectNode);
+    }
+
+    /**
+     * Create fixed offer.
+     *
+     * @param throughput the throughput
+     * @return the offer
+     */
+    public static Offer createManualOffer(int throughput) {
+        return new Offer(throughput);
+    }
+
+    /**
+     * Create autoscale offer.
+     *
+     * @param startingMaxThroughput the starting max throughput
+     * @param autoUpgradeMaxThroughputIncrementPercentage the auto upgrade max throughput increment percentage
+     * @return the offer
+     */
+    public static Offer createAutoscaleOffer(
+        int startingMaxThroughput,
+        int autoUpgradeMaxThroughputIncrementPercentage) {
+        return new Offer(new OfferAutoscaleSettings(startingMaxThroughput,
+                                                    autoUpgradeMaxThroughputIncrementPercentage));
+    }
+
+    /**
+     * Gets offer auto scale settings.
+     *
+     * @return the offer auto scale settings
+     */
+    public OfferAutoscaleSettings getOfferAutoScaleSettings() {
+        if (this.getContent().hasNonNull(Constants.Properties.AUTOPILOT_SETTINGS)) {
+            return new OfferAutoscaleSettings((ObjectNode) this.getContent()
+                                                               .get(Constants.Properties.AUTOPILOT_SETTINGS));
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets max autoscale throughput.
+     *
+     * @return the max autoscale throughput
+     */
+    public int getAutoscaleMaxThroughput() {
+        OfferAutoscaleSettings offerAutoscaleSettings = this.getOfferAutoScaleSettings();
+        if (offerAutoscaleSettings != null) {
+            return offerAutoscaleSettings.getMaxThroughput();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Sets max autoscale throughput.
+     *
+     * @param autoscaleMaxThroughput the max autoscale throughput
+     */
+    public void setAutoscaleMaxThroughput(int autoscaleMaxThroughput) {
+        OfferAutoscaleSettings offerAutoscaleSettings = this.getOfferAutoScaleSettings();
+        if (offerAutoscaleSettings != null) {
+            offerAutoscaleSettings.setMaxThroughput(autoscaleMaxThroughput);
+        }
+    }
+
     /**
      * Gets the self-link of a resource to which the resource offer applies.
      *
@@ -116,6 +202,15 @@ public int getThroughput() {
         return this.getContent().get(Constants.Properties.OFFER_THROUGHPUT).asInt();
     }
 
+    /**
+     * Has offer throughput.
+     *
+     * @return the if the offer has throughput
+     */
+    public boolean hasOfferThroughput(){
+        return this.getContent().hasNonNull(Constants.Properties.OFFER_THROUGHPUT);
+    }
+
     /**
      * Sets the offer throughput for this offer.
      *
@@ -142,4 +237,12 @@ public String getString(String propertyName) {
     public Integer getInt(String propertyName) {
         return super.getInt(propertyName);
     }
+
+    public void updateAutoscaleThroughput(int maxAutoscaleThroughput) {
+        this.getOfferAutoScaleSettings().setMaxThroughput(maxAutoscaleThroughput);
+    }
+
+    public void updateContent(Offer offer) {
+        this.setContent(offer.getContent());
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleAutoUpgradeProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleAutoUpgradeProperties.java
new file mode 100644
index 000000000000..13f7671c5778
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleAutoUpgradeProperties.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.cosmos.implementation;
+
+import com.azure.cosmos.models.JsonSerializable;
+import com.azure.cosmos.models.ModelBridgeInternal;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class OfferAutoscaleAutoUpgradeProperties extends JsonSerializable {
+
+    private AutoscaleThroughputProperties autoscaleThroughputProperties;
+
+    OfferAutoscaleAutoUpgradeProperties(int maxThroughputIncrementPercentage) {
+        this.autoscaleThroughputProperties = new AutoscaleThroughputProperties(maxThroughputIncrementPercentage);
+        super.set(Constants.Properties.AUTOPILOT_AUTO_THROUGHPUT_POLICY, autoscaleThroughputProperties);
+    }
+
+    OfferAutoscaleAutoUpgradeProperties(ObjectNode objectNode) {
+        super(objectNode);
+    }
+
+    AutoscaleThroughputProperties getAutoscaleThroughputProperties() {
+        return autoscaleThroughputProperties;
+    }
+
+    public static class AutoscaleThroughputProperties extends JsonSerializable {
+
+        AutoscaleThroughputProperties(int maxThroughputIncrementPercentage) {
+            super.set(Constants.Properties.AUTOPILOT_THROUGHPUT_POLICY_INCREMENT_PERCENT,
+                      maxThroughputIncrementPercentage);
+        }
+
+        /**
+         * Getter for property 'incrementPercent'.
+         *
+         * @return Value for property 'incrementPercent'.
+         */
+        int getIncrementPercent() {
+            return this.getInt(Constants.Properties.AUTOPILOT_THROUGHPUT_POLICY_INCREMENT_PERCENT);
+        }
+    }
+}
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleSettings.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleSettings.java
new file mode 100644
index 000000000000..d53a6f2688b6
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/OfferAutoscaleSettings.java
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.cosmos.implementation;
+
+import com.azure.cosmos.models.JsonSerializable;
+import com.azure.cosmos.models.ModelBridgeInternal;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+
+public class OfferAutoscaleSettings extends JsonSerializable {
+    OfferAutoscaleAutoUpgradeProperties offerAutoscaleAutoUpgradeProperties;
+
+    OfferAutoscaleSettings(final int maxThroughput, int maxThroughputIncrementPercentage) {
+        super();
+        offerAutoscaleAutoUpgradeProperties = new OfferAutoscaleAutoUpgradeProperties(maxThroughputIncrementPercentage);
+        super.set(Constants.Properties.AUTOPILOT_MAX_THROUGHPUT, maxThroughput);
+        super.set(Constants.Properties.AUTOPILOT_AUTO_UPGRADE_POLICY, offerAutoscaleAutoUpgradeProperties);
+    }
+
+    OfferAutoscaleSettings(String json) {
+        super(json);
+    }
+
+    OfferAutoscaleSettings(ObjectNode objectNode) {
+        super(objectNode);
+    }
+
+    /**
+     * Getter for property 'maxThroughput'.
+     *
+     * @return Value for property 'maxThroughput'.
+     */
+    int getMaxThroughput() {
+        return this.getInt(Constants.Properties.AUTOPILOT_MAX_THROUGHPUT);
+    }
+
+    void setMaxThroughput(int maxAutoscaleThroughput) {
+        super.set(Constants.Properties.AUTOPILOT_MAX_THROUGHPUT, maxAutoscaleThroughput);
+    }
+
+    /**
+     * Getter for property 'autoscaleAutoUpgradeProperties'.
+     *
+     * @return Value for property 'autoscaleAutoUpgradeProperties'.
+     */
+    OfferAutoscaleAutoUpgradeProperties getAutoscaleAutoUpgradeProperties() {
+        if (offerAutoscaleAutoUpgradeProperties == null) {
+            if (this.has(Constants.Properties.AUTOPILOT_AUTO_UPGRADE_POLICY))
+                offerAutoscaleAutoUpgradeProperties =
+                    new OfferAutoscaleAutoUpgradeProperties((ObjectNode) this.get(Constants.Properties
+                                                                                      .AUTOPILOT_AUTO_UPGRADE_POLICY));
+        }
+        return offerAutoscaleAutoUpgradeProperties;
+    }
+}
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RequestOptions.java
index 62b7a14154cc..31cc4e95ec4e 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RequestOptions.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RequestOptions.java
@@ -7,6 +7,7 @@
 import com.azure.cosmos.ConsistencyLevel;
 import com.azure.cosmos.models.IndexingDirective;
 import com.azure.cosmos.models.PartitionKey;
+import com.azure.cosmos.models.ThroughputProperties;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +32,7 @@ public class RequestOptions {
     private boolean scriptLoggingEnabled;
     private boolean populateQuotaInfo;
     private Map<String, Object> properties;
+    private ThroughputProperties throughputProperties;
 
     /**
      * Gets the triggers to be invoked before the operation.
@@ -194,6 +196,14 @@ public void setOfferThroughput(Integer offerThroughput) {
         this.offerThroughput = offerThroughput;
     }
 
+    public void setThroughputProperties(ThroughputProperties throughputProperties) {
+        this.throughputProperties = throughputProperties;
+    }
+
+    public ThroughputProperties getThroughputProperties() {
+        return this.throughputProperties;
+    }
+
     /**
      * Gets the partition key used to identify the current request's target partition.
      *
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
index 93c44e39cc1d..a0e597a815af 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
@@ -918,6 +918,34 @@ private Map<String, String> getRequestHeaders(RequestOptions options, ResourceTy
             headers.put(HttpConstants.HttpHeaders.OFFER_TYPE, options.getOfferType());
         }
 
+        if (options.getOfferThroughput() == null) {
+            if (options.getThroughputProperties() != null) {
+                Offer offer = ModelBridgeInternal.getOfferFromThroughputProperties(options.getThroughputProperties());
+                final OfferAutoscaleSettings offerAutoscaleSettings = offer.getOfferAutoScaleSettings();
+                OfferAutoscaleAutoUpgradeProperties autoscaleAutoUpgradeProperties = null;
+                if (offerAutoscaleSettings != null) {
+                     autoscaleAutoUpgradeProperties
+                        = offer.getOfferAutoScaleSettings().getAutoscaleAutoUpgradeProperties();
+                }
+                if (offer.hasOfferThroughput() &&
+                        (offerAutoscaleSettings != null && offerAutoscaleSettings.getMaxThroughput() >= 0 ||
+                             autoscaleAutoUpgradeProperties != null &&
+                                 autoscaleAutoUpgradeProperties
+                                     .getAutoscaleThroughputProperties()
+                                     .getIncrementPercent() >= 0)) {
+                    throw new IllegalArgumentException("Autoscale provisioned throughput can not be configured with "
+                                                           + "fixed offer");
+                }
+
+                if (offer.hasOfferThroughput()) {
+                    headers.put(HttpConstants.HttpHeaders.OFFER_THROUGHPUT, String.valueOf(offer.getThroughput()));
+                } else if (offer.getOfferAutoScaleSettings() != null) {
+                    headers.put(HttpConstants.HttpHeaders.OFFER_AUTOPILOT_SETTINGS,
+                                ModelBridgeInternal.toJsonFromJsonSerializable(offer.getOfferAutoScaleSettings()));
+                }
+            }
+        }
+
         if (options.isPopulateQuotaInfo()) {
             headers.put(HttpConstants.HttpHeaders.POPULATE_QUOTA_INFO, String.valueOf(true));
         }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerRequestOptions.java
index 80e2fcc74c62..331184db2f1e 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerRequestOptions.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerRequestOptions.java
@@ -14,6 +14,7 @@ public final class CosmosContainerRequestOptions {
     private ConsistencyLevel consistencyLevel;
     private String sessionToken;
     private AccessCondition accessCondition;
+    private ThroughputProperties throughputProperties;
 
     /**
      * Gets the throughput in the form of Request Units per second when creating a cosmos container.
@@ -119,6 +120,11 @@ public CosmosContainerRequestOptions setAccessCondition(AccessCondition accessCo
         return this;
     }
 
+    CosmosContainerRequestOptions setThroughputProperties(ThroughputProperties throughputProperties) {
+        this.throughputProperties = throughputProperties;
+        return this;
+    }
+
     RequestOptions toRequestOptions() {
         RequestOptions options = new RequestOptions();
         options.setAccessCondition(accessCondition);
@@ -126,6 +132,7 @@ RequestOptions toRequestOptions() {
         options.setPopulateQuotaInfo(populateQuotaInfo);
         options.setSessionToken(sessionToken);
         options.setConsistencyLevel(consistencyLevel);
+        options.setThroughputProperties(this.throughputProperties);
         return options;
     }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosDatabaseRequestOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosDatabaseRequestOptions.java
index 3fe4b1d5d976..f810e57cfd21 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosDatabaseRequestOptions.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosDatabaseRequestOptions.java
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 package com.azure.cosmos.models;
 
+import com.azure.cosmos.implementation.Offer;
 import com.azure.cosmos.implementation.RequestOptions;
 
 /**
@@ -10,6 +11,7 @@
 public final class CosmosDatabaseRequestOptions {
     private Integer offerThroughput;
     private AccessCondition accessCondition;
+    private ThroughputProperties throughputProperties;
 
     /**
      * Gets the conditions associated with the request.
@@ -51,10 +53,16 @@ CosmosDatabaseRequestOptions setOfferThroughput(Integer offerThroughput) {
         return this;
     }
 
+    CosmosDatabaseRequestOptions setThroughputProperties(ThroughputProperties throughputProperties) {
+        this.throughputProperties = throughputProperties;
+        return this;
+    }
+
     RequestOptions toRequestOptions() {
         RequestOptions options = new RequestOptions();
         options.setAccessCondition(accessCondition);
         options.setOfferThroughput(offerThroughput);
+        options.setThroughputProperties(this.throughputProperties);
         return options;
     }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java
index d81f04396180..cded9a4d3b3a 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java
@@ -13,7 +13,7 @@
  * The cosmos response
  * @param <T> the type of resource
  */
-public class CosmosResponse<T extends Resource> {
+public class CosmosResponse<T> {
     private T properties;
     protected final ResourceResponse<?> resourceResponseWrapper;
 
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java
index 4f2280c979cd..c978c8fbac9a 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java
@@ -20,6 +20,7 @@
 import com.azure.cosmos.implementation.Document;
 import com.azure.cosmos.implementation.DocumentCollection;
 import com.azure.cosmos.implementation.HttpConstants;
+import com.azure.cosmos.implementation.Offer;
 import com.azure.cosmos.implementation.PartitionKeyRange;
 import com.azure.cosmos.implementation.Permission;
 import com.azure.cosmos.implementation.QueryMetrics;
@@ -226,6 +227,22 @@ public static CosmosDatabaseRequestOptions setOfferThroughput(CosmosDatabaseRequ
         return cosmosDatabaseRequestOptions.setOfferThroughput(offerThroughput);
     }
 
+    public static CosmosDatabaseRequestOptions setOfferProperties(
+        CosmosDatabaseRequestOptions cosmosDatabaseRequestOptions,
+        ThroughputProperties throughputProperties) {
+        return cosmosDatabaseRequestOptions.setThroughputProperties(throughputProperties);
+    }
+
+    public static CosmosContainerRequestOptions setOfferProperties(
+        CosmosContainerRequestOptions containerRequestOptions,
+        ThroughputProperties throughputProperties) {
+        return containerRequestOptions.setThroughputProperties(throughputProperties);
+    }
+
+    public static Offer updateOfferFromProperties(Offer offer, ThroughputProperties properties) {
+        return properties.updateOfferFromProperties(offer);
+    }
+
     public static CosmosItemRequestOptions setPartitionKey(CosmosItemRequestOptions cosmosItemRequestOptions,
                                                            PartitionKey partitionKey) {
         return cosmosItemRequestOptions.setPartitionKey(partitionKey);
@@ -483,4 +500,11 @@ public static void setFeedOptionsMaxItemCount(FeedOptions feedOptions, Integer m
         feedOptions.setMaxItemCount(maxItemCount);
     }
 
+    public static Offer getOfferFromThroughputProperties(ThroughputProperties properties) {
+        return properties.getOffer();
+    }
+
+    public static ThroughputResponse createThroughputRespose(ResourceResponse<Offer> offerResourceResponse) {
+        return new ThroughputResponse(offerResourceResponse);
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputProperties.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputProperties.java
new file mode 100644
index 000000000000..503f17b9958e
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputProperties.java
@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.cosmos.models;
+
+import com.azure.cosmos.implementation.Offer;
+import com.azure.cosmos.implementation.OfferAutoscaleSettings;
+
+/**
+ * Represents throughput of the resources in the Azure Cosmos DB service.
+ */
+public class ThroughputProperties {
+    private final Offer offer;
+
+    ThroughputProperties(Offer offer) {
+        this.offer = offer;
+    }
+
+    /**
+     * Create fixed throughput properties.
+     *
+     * @param throughput the throughput
+     * @return the throughput properties
+     */
+    public static ThroughputProperties createManualThroughput(int throughput) {
+        return new ThroughputProperties(Offer.createManualOffer(throughput));
+    }
+
+    /**
+     * Create auto scale throughput properties.
+     *
+     * @param autoScaleMaxThroughput the max auto scale throughput
+     * @param autoUpgradethroughputIncrementPercentage the auto upgrade max throughput increment percentage
+     * @return the throughput properties
+     */
+    static ThroughputProperties createAutoscaledThroughput(
+        int autoScaleMaxThroughput,
+        int autoUpgradethroughputIncrementPercentage) {
+        return new ThroughputProperties(Offer.createAutoscaleOffer(autoScaleMaxThroughput,
+                                                                   autoUpgradethroughputIncrementPercentage));
+    }
+
+    /**
+     * Create auto scaled provisioned throughput throughput properties.
+     *
+     * @param autoScaleMaxThroughput the max auto scale throughput
+     * @return the throughput properties
+     */
+    public static ThroughputProperties createAutoscaledThroughput(int autoScaleMaxThroughput) {
+        return new ThroughputProperties(Offer.createAutoscaleOffer(autoScaleMaxThroughput,
+                                                                   0));
+    }
+
+    /**
+     * Gets offer throughput.
+     *
+     * @return the offer throughput
+     */
+    public Integer getManualThroughput() {
+        return offer.getThroughput();
+    }
+
+    /**
+     * Gets offer autoscale properties.
+     *
+     * @return the offer autoscale properties
+     */
+    OfferAutoscaleSettings getOfferAutoscaleProperties() {
+        return this.offer.getOfferAutoScaleSettings();
+    }
+
+    /**
+     * Gets max autoscale throughput.
+     *
+     * @return the max autoscale throughput
+     */
+    public int getAutoscaleMaxThroughput() {
+        return this.offer.getAutoscaleMaxThroughput();
+    }
+
+
+    Offer getOffer() {
+        return this.offer;
+    }
+
+    /**
+     * Get an updated offer based on the properties.
+     */
+    Offer updateOfferFromProperties(Offer oldOffer) {
+        oldOffer.updateContent(this.offer);
+        return oldOffer;
+    }
+
+}
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputResponse.java
new file mode 100644
index 000000000000..199d0882da82
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ThroughputResponse.java
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.cosmos.models;
+
+import com.azure.cosmos.implementation.HttpConstants;
+import com.azure.cosmos.implementation.Offer;
+import com.azure.cosmos.implementation.ResourceResponse;
+
+/**
+ * The cosmos throughput response.
+ */
+public class ThroughputResponse extends CosmosResponse<ThroughputProperties> {
+
+    private ResourceResponse<Offer> offerResourceResponse;
+    private ThroughputProperties throughputProperties;
+
+    ThroughputResponse(ResourceResponse<Offer> offerResourceResponse) {
+        super(offerResourceResponse);
+        this.offerResourceResponse = offerResourceResponse;
+    }
+
+    @Override
+    public ThroughputProperties getProperties(){
+        if (throughputProperties == null){
+            Offer offer =
+                new Offer(ModelBridgeInternal.getPropertyBagFromJsonSerializable(offerResourceResponse.getResource()));
+            throughputProperties = new ThroughputProperties(offer);
+        }
+        return throughputProperties;
+    }
+
+    /**
+     * Gets minimum throughput in measurement of request units per second in the Azure Cosmos service.
+     *
+     * @return the minimun throughput
+     */
+    public int getMinThroughput(){
+        return Integer.parseInt(offerResourceResponse
+                                    .getResponseHeaders()
+                                    .get(HttpConstants.HttpHeaders.OFFER_MIN_THROUGHPUT));
+    }
+
+    /**
+     * Gets the status whether offer replace is successful or pending.
+     *
+     * @return the boolean representing the status
+     */
+    public boolean isReplacePending(){
+        return Boolean.parseBoolean(offerResourceResponse
+                                        .getResponseHeaders()
+                                        .get(HttpConstants.HttpHeaders.OFFER_REPLACE_PENDING));
+    }
+
+}
diff --git a/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/ThroughputPropertiesCodeSnippet.java b/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/ThroughputPropertiesCodeSnippet.java
new file mode 100644
index 000000000000..91200638154c
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/samples/java/com/azure/cosmos/ThroughputPropertiesCodeSnippet.java
@@ -0,0 +1,20 @@
+package com.azure.cosmos;
+
+import com.azure.cosmos.implementation.TestConfigurations;
+import com.azure.cosmos.models.ThroughputProperties;
+
+public class ThroughputPropertiesCodeSnippet {
+    public static void main(String[] args) throws Exception {
+
+        CosmosAsyncClient client = new CosmosClientBuilder()
+                                       .endpoint(TestConfigurations.HOST)
+                                       .key(TestConfigurations.MASTER_KEY)
+                                       .buildAsyncClient();
+
+        final String databaseName = "testDB";
+        int throughput = 5000;
+        ThroughputProperties properties = ThroughputProperties.createAutoscaledThroughput(throughput);
+        client.createDatabase(databaseName, properties).block();
+        client.close();
+    }
+}
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java
index b332307829a6..a4425c48d211 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosResponseValidator.java
@@ -226,7 +226,9 @@ public Builder<T> notNullEtag() {
                 @Override
                 public void validate(T resourceResponse) {
                     assertThat(resourceResponse.getProperties()).isNotNull();
-                    assertThat(resourceResponse.getProperties().getETag()).isNotNull();
+                    if (resourceResponse.getProperties() instanceof Resource) {
+                        assertThat(((Resource)resourceResponse.getProperties()).getETag()).isNotNull();
+                    }
                 }
             });
             return this;
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java
index 585bf91db842..f3f226492ec8 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java
@@ -27,6 +27,8 @@
 import com.azure.cosmos.implementation.Database;
 import com.azure.cosmos.implementation.FailureValidator;
 import com.azure.cosmos.implementation.RetryAnalyzer;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
@@ -367,6 +369,26 @@ public void sessionTokenConsistencyCollectionDeleteCreateSameName() {
         }
     }
 
+    @Test(groups = {"emulator"}, timeOut = TIMEOUT)
+    public void replaceProvisionedThroughput(){
+        final String databaseName = CosmosDatabaseForTest.generateId();
+        CosmosAsyncDatabase database = client.createDatabase(databaseName)
+                                           .block()
+                                           .getDatabase();
+        CosmosContainerProperties containerProperties = new CosmosContainerProperties("testCol", "/myPk");
+        CosmosAsyncContainer container = database.createContainer(containerProperties, 1000,
+                                                                  new CosmosContainerRequestOptions())
+                                             .block()
+                                             .getContainer();
+        Integer throughput = container.readProvisionedThroughput().block();
+
+        assertThat(throughput).isEqualTo(1000);
+
+        throughput = container.replaceProvisionedThroughput(2000).block();
+        assertThat(throughput).isEqualTo(2000);
+    }
+
+
     @BeforeClass(groups = { "emulator" }, timeOut = SETUP_TIMEOUT)
     public void before_CollectionCrudTest() {
         client = getClientBuilder().buildAsyncClient();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java
index acbbecede623..05c25605466e 100644
--- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DatabaseCrudTest.java
@@ -11,6 +11,8 @@
 import com.azure.cosmos.models.CosmosDatabaseRequestOptions;
 import com.azure.cosmos.CosmosResponseValidator;
 import com.azure.cosmos.implementation.FailureValidator;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Factory;
@@ -19,6 +21,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DatabaseCrudTest extends TestSuiteBase {
     private final String preExistingDatabaseId = CosmosDatabaseForTest.generateId();
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ThroughputTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ThroughputTests.java
new file mode 100644
index 000000000000..9d31248e760e
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ThroughputTests.java
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.cosmos.rx;
+
+import com.azure.cosmos.CosmosAsyncClient;
+import com.azure.cosmos.CosmosAsyncContainer;
+import com.azure.cosmos.CosmosAsyncDatabase;
+import com.azure.cosmos.CosmosClientBuilder;
+import com.azure.cosmos.CosmosDatabaseForTest;
+import com.azure.cosmos.models.CosmosContainerProperties;
+import com.azure.cosmos.models.CosmosContainerRequestOptions;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ThroughputTests extends TestSuiteBase{
+
+    private CosmosAsyncClient client;
+
+    @Factory(dataProvider = "clientBuilders")
+    public ThroughputTests(CosmosClientBuilder clientBuilder) {
+        super(clientBuilder);
+    }
+
+    @BeforeClass(groups = { "simple" }, timeOut = SETUP_TIMEOUT)
+    public void before_ThroughputTests() {
+        client = getClientBuilder().buildAsyncClient();
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void readReplaceAutoscaleThroughputDb() throws Exception {
+        final String databaseName = CosmosDatabaseForTest.generateId();
+        int initalThroughput = 5000;
+        ThroughputProperties properties = ThroughputProperties.createAutoscaledThroughput(initalThroughput);
+        CosmosAsyncDatabase database = client.createDatabase(databaseName, properties)
+                                           .block()
+                                           .getDatabase();
+
+        ThroughputResponse readThroughputResponse = database.readThroughput().block();
+        assertThat(readThroughputResponse.getProperties().getAutoscaleMaxThroughput()).isEqualTo(initalThroughput);
+        String collectionId = UUID.randomUUID().toString();
+        database.createContainer(collectionId, "/myPk").block();
+        // Replace
+        int tagetThroughput = 6000;
+        properties = ThroughputProperties.createAutoscaledThroughput(tagetThroughput);
+        ThroughputResponse replaceResponse = database.replaceThroughput(properties).block();
+        assertThat(replaceResponse.getProperties().getAutoscaleMaxThroughput()).isEqualTo(tagetThroughput);
+        safeDeleteDatabase(client.getDatabase(databaseName));
+
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void readReplaceManualThroughputDb() throws Exception {
+        final String databaseName = CosmosDatabaseForTest.generateId();
+        int initalThroughput = 5000;
+        ThroughputProperties properties = ThroughputProperties.createManualThroughput(initalThroughput);
+        CosmosAsyncDatabase database = client.createDatabase(databaseName, properties)
+                                           .block()
+                                           .getDatabase();
+
+        ThroughputResponse readThroughputResponse = database.readThroughput().block();
+        assertThat(readThroughputResponse.getProperties().getManualThroughput()).isEqualTo(initalThroughput);
+        database.createContainer("testCol", "/myPk").block();
+        int tagetThroughput = 6000;
+        properties = ThroughputProperties.createManualThroughput(tagetThroughput);
+        ThroughputResponse replaceResponse = database.replaceThroughput(properties).block();
+        assertThat(replaceResponse.getProperties().getManualThroughput()).isEqualTo(tagetThroughput);
+        safeDeleteDatabase(client.getDatabase(databaseName));
+
+    }
+
+    @Test(groups = {"simple"}, timeOut = TIMEOUT)
+    public void readReplaceManualThroughputCollection() throws Exception {
+        final String databaseName = CosmosDatabaseForTest.generateId();
+        int initalThroughput = 5000;
+        ThroughputProperties throughputProperties =
+            ThroughputProperties.createManualThroughput(initalThroughput);
+        CosmosAsyncDatabase database = client.createDatabase(databaseName)
+                                           .block()
+                                           .getDatabase();
+
+        CosmosContainerProperties containerProperties = new CosmosContainerProperties("testCol", "/myPk");
+        CosmosAsyncContainer container = database.createContainer(containerProperties, throughputProperties,
+                                                                  new CosmosContainerRequestOptions())
+                                             .block()
+                                             .getContainer();
+
+        // Read
+        ThroughputResponse readThroughputResponse = container.readThroughput().block();
+        assertThat(readThroughputResponse.getProperties().getManualThroughput()).isEqualTo(initalThroughput);
+
+        // Replace
+        int tagetThroughput = 6000;
+        throughputProperties = ThroughputProperties.createManualThroughput(tagetThroughput);
+        ThroughputResponse replaceResponse = container.replaceThroughput(throughputProperties).block();
+        assertThat(replaceResponse.getProperties().getManualThroughput()).isEqualTo(tagetThroughput);
+        safeDeleteDatabase(client.getDatabase(databaseName));
+
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void readReplaceAutoscaleThroughputCollection() throws Exception {
+        final String databaseName = CosmosDatabaseForTest.generateId();
+        int initalThroughput = 5000;
+        ThroughputProperties throughputProperties =
+            ThroughputProperties.createAutoscaledThroughput(initalThroughput);
+        CosmosAsyncDatabase database = client.createDatabase(databaseName)
+                                           .block()
+                                           .getDatabase();
+        String collectionId = UUID.randomUUID().toString();
+
+        CosmosContainerProperties containerProperties = new CosmosContainerProperties(collectionId, "/myPk");
+        CosmosAsyncContainer container = database.createContainer(containerProperties, throughputProperties,
+                                                                  new CosmosContainerRequestOptions())
+                                             .block()
+                                             .getContainer();
+
+        // Read
+        ThroughputResponse readThroughputResponse = container.readThroughput().block();
+        assertThat(readThroughputResponse.getProperties().getAutoscaleMaxThroughput()).isEqualTo(initalThroughput);
+
+        // Replace
+        int tagetThroughput = 6000;
+        throughputProperties = ThroughputProperties.createAutoscaledThroughput(tagetThroughput);
+        ThroughputResponse replaceResponse = container.replaceThroughput(throughputProperties).block();
+        assertThat(replaceResponse.getProperties().getAutoscaleMaxThroughput()).isEqualTo(tagetThroughput);
+        safeDeleteDatabase(client.getDatabase(databaseName));
+    }
+
+    @AfterClass(groups = { "simple" }, timeOut = SHUTDOWN_TIMEOUT, alwaysRun = true)
+    public void afterClass() {
+        assertThat(this.client).isNotNull();
+        this.client.close();
+    }
+}

From 7e1c1e1b301b1491c2f8fe6b17f48451c98c271a Mon Sep 17 00:00:00 2001
From: Vinay Gera <vigera@microsoft.com>
Date: Fri, 8 May 2020 16:00:35 -0700
Subject: [PATCH 39/41] update (#10978)

---
 eng/jacoco-test-coverage/pom.xml         | 2 +-
 eng/versioning/version_client.txt        | 2 +-
 sdk/e2e/pom.xml                          | 2 +-
 sdk/identity/azure-identity-perf/pom.xml | 2 +-
 sdk/identity/azure-identity/CHANGELOG.md | 2 ++
 sdk/identity/azure-identity/pom.xml      | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index b67e5414737c..97c09f1e53ef 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 88e44527049d..f5f67245c982 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -21,7 +21,7 @@ com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
 com.azure:azure-data-appconfiguration;1.1.1;1.2.0-beta.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-identity;1.0.6;1.1.0-beta.4
+com.azure:azure-identity;1.0.6;1.1.0-beta.5
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-eventhubs;5.1.0;5.2.0-beta.1
 com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.0;1.2.0-beta.1
diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml
index dbfeebb48eee..c3720d2c2c82 100644
--- a/sdk/e2e/pom.xml
+++ b/sdk/e2e/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/identity/azure-identity-perf/pom.xml b/sdk/identity/azure-identity-perf/pom.xml
index a48d02f94172..ef385a26573c 100644
--- a/sdk/identity/azure-identity-perf/pom.xml
+++ b/sdk/identity/azure-identity-perf/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index eea6c6807e72..bb9b2c1a61e2 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Release History
 
+## 1.1.0-beta.5 (Unreleased)
+
 ## 1.1.0-beta.4 (2020-05-06)
 - Added `IntelliJCredential` support in `DefaultAzureCredential`.
 - Added `VsCodeCredential` support in `DefaultAzureCredential`.
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index 0ae681d56e5b..42c04241a56c 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+  <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
 
   <name>Microsoft Azure client library for Identity</name>
   <description>This module contains client library for Microsoft Azure Identity.</description>

From 3d3e6f0ae1011d7e63a63d420461daac98a69db2 Mon Sep 17 00:00:00 2001
From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com>
Date: Fri, 8 May 2020 19:49:46 -0700
Subject: [PATCH 40/41] Update Storage ci.yml Additional Modules (#10982)

* Add EventHubs as an additional module to allow the EventHubs Checkpoint Store to build properly

* Update ci.yml

* Update tests.yml
---
 sdk/storage/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 87d979c0738a..30cad1fe3f63 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -82,3 +82,5 @@ stages:
       AdditionalModules:
         - name: azure-storage-perf
           groupId: com.azure
+        - name: azure-messaging-eventhubs
+          groupId: com.azure

From 62005e7d01aad535d55815f749daa5b48da53bf4 Mon Sep 17 00:00:00 2001
From: Shawn Fang <45607042+mssfang@users.noreply.github.com>
Date: Fri, 8 May 2020 21:45:50 -0700
Subject: [PATCH 41/41] [TA] Changes based on V3.0 swagger, etc (#10593)

* Use V3.0 swagger code base
---
 sdk/parents/azure-client-sdk-parent/pom.xml   |   1 +
 .../azure-ai-textanalytics/CHANGELOG.md       |  30 +-
 .../azure-ai-textanalytics/README.md          |  38 +-
 .../AnalyzeSentimentAsyncClient.java          |  70 +-
 .../DetectLanguageAsyncClient.java            | 101 +--
 .../ExtractKeyPhraseAsyncClient.java          | 115 +--
 .../RecognizeEntityAsyncClient.java           | 154 ++--
 .../RecognizeLinkedEntityAsyncClient.java     | 112 +--
 .../TextAnalyticsAsyncClient.java             | 164 ++--
 .../ai/textanalytics/TextAnalyticsClient.java | 129 ++--
 .../TextAnalyticsServiceVersion.java          |   4 +-
 .../azure/ai/textanalytics/Transforms.java    |  17 +-
 .../TextAnalyticsClientImpl.java              | 236 +++---
 .../textanalytics/implementation/Utility.java | 101 +++
 .../models/DetectedLanguage.java              |  38 +-
 .../models/DocumentEntities.java              |  40 +-
 .../implementation/models/DocumentError.java  |   8 +-
 .../models/DocumentKeyPhrases.java            |  40 +-
 .../models/DocumentLanguage.java              |  50 +-
 .../models/DocumentLinkedEntities.java        |  40 +-
 .../models/DocumentSentiment.java             |  86 ++-
 .../models/DocumentSentimentValue.java        |   2 +-
 .../models/DocumentStatistics.java            |  11 +-
 .../implementation/models/EntitiesResult.java |  25 +-
 .../implementation/models/Entity.java         |  94 +--
 .../models/EntityLinkingResult.java           |  25 +-
 .../implementation/models/ErrorCodeValue.java |   2 +-
 .../implementation/models/InnerError.java     |  55 +-
 .../models/InnerErrorCodeValue.java           |   2 +-
 .../models/KeyPhraseResult.java               |  25 +-
 .../models/LanguageBatchInput.java            |   4 +-
 .../implementation/models/LanguageInput.java  |  12 +-
 .../implementation/models/LanguageResult.java |  25 +-
 .../implementation/models/LinkedEntity.java   |  24 +-
 .../implementation/models/Match.java          |  42 +-
 .../models/MultiLanguageBatchInput.java       |   6 +-
 .../models/MultiLanguageInput.java            |  14 +-
 .../models/RequestStatistics.java             |  19 +-
 .../models/SentenceSentiment.java             |  94 ++-
 .../models/SentenceSentimentValue.java        |   2 +-
 .../SentimentConfidenceScorePerLabel.java     |  21 +-
 .../models/SentimentResponse.java             |  25 +-
 .../models/TextAnalyticsError.java            |  51 +-
 .../models/TextAnalyticsErrorException.java   |   4 +-
 .../models/TextAnalyticsWarning.java          |  94 +++
 .../models/WarningCodeValue.java              |  55 ++
 .../models/AnalyzeSentimentResult.java        |   4 +-
 .../models/CategorizedEntity.java             |  45 +-
 .../models/CategorizedEntityCollection.java   |  36 +
 .../models/DetectLanguageResult.java          |   4 +-
 .../models/DetectedLanguage.java              |  50 +-
 .../models/DocumentSentiment.java             |  32 +-
 .../textanalytics/models/EntityCategory.java  |   4 +
 .../models/ExtractKeyPhraseResult.java        |  19 +-
 .../models/KeyPhrasesCollection.java          |  35 +
 .../ai/textanalytics/models/LinkedEntity.java |  18 +-
 .../models/LinkedEntityCollection.java        |  36 +
 .../models/LinkedEntityMatch.java             |  34 +-
 .../RecognizeCategorizedEntitiesResult.java   |  41 -
 .../models/RecognizeEntitiesResult.java       |  39 +
 .../models/RecognizeLinkedEntitiesResult.java |  14 +-
 .../models/SentenceSentiment.java             |  33 +-
 .../models/TextAnalyticsError.java            |   2 +-
 .../models/TextAnalyticsException.java        |   2 +-
 ...ntResult.java => TextAnalyticsResult.java} |  15 +-
 .../models/TextAnalyticsWarning.java          |  51 ++
 .../models/TextDocumentBatchStatistics.java   |   2 +-
 .../models/TextDocumentInput.java             |  31 +-
 .../models/TextDocumentStatistics.java        |  16 +-
 .../ai/textanalytics/models/WarningCode.java  |  36 +
 .../azure/ai/textanalytics/package-info.java  |  13 +-
 .../src/main/java/module-info.java            |   2 +-
 .../ai/textanalytics/DetectLanguage.java      |   4 +-
 .../ai/textanalytics/DetectLanguageAsync.java |   4 +-
 .../azure/ai/textanalytics/ReadmeSamples.java |  12 +-
 .../ai/textanalytics/RecognizeEntities.java   |   4 +-
 .../textanalytics/RecognizeEntitiesAsync.java |  10 +-
 .../RecognizeLinkedEntities.java              |   5 +-
 .../RecognizeLinkedEntitiesAsync.java         |   9 +-
 ...alyticsAsyncClientJavaDocCodeSnippets.java | 120 +--
 ...extAnalyticsClientJavaDocCodeSnippets.java |  97 +--
 .../batch/AnalyzeSentimentBatchDocuments.java |   6 +-
 .../AnalyzeSentimentBatchDocumentsAsync.java  |   6 +-
 .../batch/DetectLanguageBatchDocuments.java   |   4 +-
 .../DetectLanguageBatchDocumentsAsync.java    |   4 +-
 .../DetectLanguageBatchStringDocuments.java   |   4 +-
 ...tectLanguageBatchStringDocumentsAsync.java |   4 +-
 .../ExtractKeyPhrasesBatchDocuments.java      |   4 +-
 .../ExtractKeyPhrasesBatchDocumentsAsync.java |   4 +-
 .../RecognizeEntitiesBatchDocuments.java      |  14 +-
 .../RecognizeEntitiesBatchDocumentsAsync.java |  12 +-
 ...RecognizeEntitiesBatchStringDocuments.java |   8 +-
 ...nizeEntitiesBatchStringDocumentsAsync.java |   4 +-
 ...RecognizeLinkedEntitiesBatchDocuments.java |  10 +-
 ...nizeLinkedEntitiesBatchDocumentsAsync.java |   9 +-
 ...izeLinkedEntitiesBatchStringDocuments.java |   5 +-
 ...nkedEntitiesBatchStringDocumentsAsync.java |   4 +-
 .../textanalytics/DocumentInputAsyncTest.java | 721 ++++++++++++++++++
 .../ai/textanalytics/DocumentInputTest.java   | 393 +++++-----
 .../com/azure/ai/textanalytics/TestUtils.java |  85 ++-
 .../TextAnalyticsAsyncClientTest.java         | 129 +++-
 .../TextAnalyticsClientTest.java              | 114 ++-
 .../TextAnalyticsClientTestBase.java          | 129 +++-
 .../analyseSentimentDuplicateIdInput.json     |  25 +
 .../analyseSentimentForBatchInput.json        |  17 +-
 ...eSentimentForBatchInputShowStatistics.json |  17 +-
 .../analyseSentimentForBatchStringInput.json  |  17 +-
 .../analyseSentimentForEmptyText.json         |  17 +-
 .../analyseSentimentForFaultyText.json        |  17 +-
 .../analyseSentimentForListLanguageHint.json  |  17 +-
 ...lyseSentimentForListStringWithOptions.json |  16 +-
 .../analyseSentimentForTextInput.json         |  17 +-
 .../clientBuilderWithDefaultCountryHint.json  |  12 +-
 ...thDefaultCountryHintForBatchOperation.json |  14 +-
 .../clientBuilderWithDefaultLanguage.json     |  14 +-
 ...rWithDefaultLanguageForBatchOperation.json |  14 +-
 .../clientBuilderWithDefaultPipeline.json     |  12 +-
 ...entBuilderWithInvalidApiKeyCredential.json |  17 +-
 .../clientBuilderWithNewCountryHint.json      |  14 +-
 ...erWithNewCountryHintForBatchOperation.json |  12 +-
 .../clientBuilderWithNewLanguage.json         |  14 +-
 ...ilderWithNewLanguageForBatchOperation.json |  14 +-
 .../clientBuilderWithNullServiceVersion.json  |  14 +-
 .../clientBuilderWithRotateToInvalidKey.json  |  17 +-
 .../clientBuilderWithRotateToValidKey.json    |  12 +-
 ...lientBuilderWithValidApiKeyCredential.json |  12 +-
 .../detectLanguageDuplicateIdInput.json       |  19 +-
 .../detectLanguageEmptyCountryHint.json       |  16 +-
 .../detectLanguageEmptyText.json              |  19 +-
 .../detectLanguageFaultyText.json             |  17 +-
 .../detectLanguageInvalidCountryHint.json     |  17 +-
 .../detectLanguageNoneCountryHint.json        |  16 +-
 .../detectLanguagesBatchInput.json            |  19 +-
 ...tectLanguagesBatchInputShowStatistics.json |  19 +-
 .../detectLanguagesBatchListCountryHint.json  |  19 +-
 ...guagesBatchListCountryHintWithOptions.json |  18 +-
 .../detectLanguagesBatchStringInput.json      |  19 +-
 .../detectSingleTextLanguage.json             |  19 +-
 .../extractKeyPhrasesBatchWarning.json        |  26 +
 .../extractKeyPhrasesDuplicateIdInput.json    |  25 +
 .../extractKeyPhrasesForBatchInput.json       |  19 +-
 ...KeyPhrasesForBatchInputShowStatistics.json |  19 +-
 .../extractKeyPhrasesForBatchStringInput.json |  19 +-
 .../extractKeyPhrasesForEmptyText.json        |  16 +-
 .../extractKeyPhrasesForFaultyText.json       |  19 +-
 .../extractKeyPhrasesForListLanguageHint.json |  19 +-
 ...actKeyPhrasesForListStringWithOptions.json |  16 +-
 .../extractKeyPhrasesForTextInput.json        |  19 +-
 .../extractKeyPhrasesWarning.json             |  26 +
 ...ecognizeEntitiesBatchInputSingleError.json |  14 +-
 .../recognizeEntitiesDuplicateIdInput.json    |  25 +
 .../recognizeEntitiesForBatchInput.json       |  16 +-
 ...zeEntitiesForBatchInputShowStatistics.json |  16 +-
 .../recognizeEntitiesForBatchStringInput.json |  16 +-
 .../recognizeEntitiesForEmptyText.json        |  17 +-
 .../recognizeEntitiesForFaultyText.json       |  19 +-
 .../recognizeEntitiesForListLanguageHint.json |  16 +-
 .../recognizeEntitiesForListWithOptions.json  |  16 +-
 .../recognizeEntitiesForTextInput.json        |  16 +-
 .../recognizeEntitiesTooManyDocuments.json    |  26 +
 ...cognizeLinkedEntitiesDuplicateIdInput.json |  25 +
 .../recognizeLinkedEntitiesForBatchInput.json |  19 +-
 ...edEntitiesForBatchInputShowStatistics.json |  19 +-
 ...nizeLinkedEntitiesForBatchStringInput.json |  19 +-
 .../recognizeLinkedEntitiesForEmptyText.json  |  17 +-
 .../recognizeLinkedEntitiesForFaultyText.json |  19 +-
 ...nizeLinkedEntitiesForListLanguageHint.json |  19 +-
 ...inkedEntitiesForListStringWithOptions.json |  16 +-
 .../recognizeLinkedEntitiesForTextInput.json  |  19 +-
 ...cognizeLinkedEntitiesTooManyDocuments.json |  26 +
 .../azure-ai-textanalytics/swagger/README.md  |   8 +-
 171 files changed, 3952 insertions(+), 2102 deletions(-)
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsWarning.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/WarningCodeValue.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntityCollection.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/KeyPhrasesCollection.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityCollection.java
 delete mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeCategorizedEntitiesResult.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeEntitiesResult.java
 rename sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/{DocumentResult.java => TextAnalyticsResult.java} (81%)
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsWarning.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/WarningCode.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesBatchWarning.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesDuplicateIdInput.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesWarning.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesDuplicateIdInput.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesTooManyDocuments.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesDuplicateIdInput.json
 create mode 100644 sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesTooManyDocuments.json

diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
index 723a04d6366a..a2b620cc44b4 100644
--- a/sdk/parents/azure-client-sdk-parent/pom.xml
+++ b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -1087,6 +1087,7 @@
                 --add-opens com.azure.core/com.azure.core.implementation.serializer=ALL-UNNAMED
                 --add-opens com.azure.ai.formrecognizer/com.azure.ai.formrecognizer=ALL-UNNAMED
                 --add-opens com.azure.ai.textanalytics/com.azure.ai.textanalytics=ALL-UNNAMED
+                --add-opens com.azure.ai.textanalytics/com.azure.ai.textanalytics.implementation.models=com.azure.core
                 --add-opens com.azure.data.appconfiguration/com.azure.data.appconfiguration=ALL-UNNAMED
                 --add-opens com.azure.security.keyvault.certificates/com.azure.security.keyvault.certificates=ALL-UNNAMED
                 --add-opens com.azure.security.keyvault.secrets/com.azure.security.keyvault.secrets=ALL-UNNAMED
diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
index 62108b5578b0..428ea497fe8b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -1,8 +1,36 @@
 # Release History
 
 ## 1.0.0-beta.5 (Unreleased)
-- Rename `apiKey()` to `credential()` on TextAnalyticsClientBuilder.
+**New features**
+- Added Text property and `getText()` to `SentenceSentiment`.
+- `Warnings` property added to each document-level response object returned from the endpoints. It is a list of `TextAnalyticsWarnings`.
+- Added `CategorizedEntityCollection`, `KeyPhrasesCollection`, `LinkedEntityCollection` for having `getWarnings()` to retrieve warnings. 
+- Added a new enum value `ADDRESS` to `EntityCategory`.
+- Text analytics SDK update the service to version `v3.0` from `v3.0-preview.1`.
 
+**Breaking changes**
+- Renamed `apiKey()` to `credential()` on TextAnalyticsClientBuilder.
+- Removed `getGraphemeLength()` and `getGraphemeOffset()` from `CategorizedEntity`, `SentenceSentiment`, and `LinkedEntityMatch`.
+- `getGraphemeCount()` in `TextDocumentStatistics` has been renamed to `getCharacterCount()`.
+- `getScore()` in `DetectedLanguage` has been renamed to `getConfidenceScore()`.
+- `getSubCategory()` in `CategorizedEntity` has been renamed to `getSubcategory()`.
+- `getLinkedEntityMatches()` in `LinkedEntity` has been renamed to `getMatches()`.
+- `getCode()` in `TextAnalyticsException` and `TextAnalyticsError` has been renamed to `getErrorCode()`.
+- `getCode()` in `TextAnalyticsWarning` has been renamed to `getWarningCode()`.
+- Async client returns errors, mono error or flux error but no longer throws exception. Sync client throws exceptions only.
+- Deprecated `TextDocumentInput(String id, String text, String language)` constructor, but added `setLanguage()` setter since `language` is optional.
+- Renamed `RecognizeCategorizedEntitiesResult` to `RecognizeEntitiesResult`.
+- Renamed `DocumentResult` to `TextAnalyticsResult`.
+- Removed `getServiceVersion()` from both synchronous and asynchronous clients.
+- Replaced all single input asynchronous APIs, e.x., 
+  - `TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String document)` to `Mono<CategorizedEntityCollection> recognizeEntities(String document)`.
+  - `TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String document)` to `Mono<LinkedEntityCollection> recognizeLinkedEntities(String document)`.
+  - `TextAnalyticsPagedFlux<String> extractKeyPhrases(String document)` to `Mono<KeyPhrasesCollection> extractKeyPhrases(String document)`.
+- Replaced all single input synchronous APIs, e.x., 
+  - `TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntities(String document)` to `CategorizedEntityCollection recognizeEntities(String document)`.
+  - `TextAnalyticsPagedIterable<LinkedEntity> recognizeLinkedEntities(String document)` to `LinkedEntityCollection recognizeLinkedEntities(String document)`.
+  - `TextAnalyticsPagedIterable<String> extractKeyPhrases(String document)` to `KeyPhrasesCollection extractKeyPhrases(String document)`.
+  
 ## 1.0.0-beta.4 (2020-04-07)
 - Throws an illegal argument exception when the given list of documents is an empty list.
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md
index 54f9af356ed2..116121544709 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/README.md
@@ -24,7 +24,7 @@ and includes six main functions:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-ai-textanalytics</artifactId>
-    <version>1.0.0-beta.4</version>
+    <version>1.0.0-beta.5</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -137,18 +137,18 @@ and supported text encoding.
 
 ### Return value
 An operation result, such as `AnalyzeSentimentResult`, is the result of a Text Analytics operation, containing a 
-prediction or predictions about a single document. An operation's result type also may optionally include information
-about the input document and how it was processed. An operation result contains a `isError` property that allows to
-identify if an operation executed was successful or unsuccessful for the given document. When the operation results
-an error, you can simply call `getError()` to get `TextAnalyticsError` which contains the reason why it is unsuccessful. 
-If you are interested in how many characters are in your document, or the number of operation transactions that have gone
-through, simply call `getStatistics()` to get the `TextDocumentStatistics` which contains both information.
+prediction or predictions about a single document and a list of warnings inside of it. An operation's result type also 
+may optionally include information about the input document and how it was processed. An operation result contains a 
+`isError` property that allows to identify if an operation executed was successful or unsuccessful for the given
+document. When the operation results an error, you can simply call `getError()` to get `TextAnalyticsError` which 
+contains the reason why it is unsuccessful. If you are interested in how many characters are in your document, 
+or the number of operation transactions that have gone through, simply call `getStatistics()` to get the
+`TextDocumentStatistics` which contains both information. 
 
 ### Return value collection
-An operation result collection, such as `DocumentResultCollection<AnalyzeSentimentResult>`, which is the collection of 
-the result of a Text Analytics analyzing sentiment operation. `DocumentResultCollection` includes the model version of
-the operation and statistics of the batch documents. Since `DocumentResultCollection<T>` extends `IterableStream<T>`,
-the list of item can be retrieved by streaming or iterating the list.
+An operation result collection, such as `TextAnalyticsPagedResponse<AnalyzeSentimentResult>`, which is the collection of 
+the result of a Text Analytics analyzing sentiment operation. For `TextAnalyticsPagedResponse` includes the model
+version of the operation and statistics of the batch documents. 
 
 ### Operation on multiple documents
 For each supported operation, the Text Analytics client provides method overloads to take a single document, a batch 
@@ -229,8 +229,8 @@ documentSentiment.getSentences().forEach(sentenceSentiment ->
 ```java
 String document = "Bonjour tout le monde";
 DetectedLanguage detectedLanguage = textAnalyticsClient.detectLanguage(document);
-System.out.printf("Detected language name: %s, ISO 6391 name: %s, score: %f.%n",
-    detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+System.out.printf("Detected language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+    detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
 ```
 
 ### Recognize entity
@@ -238,8 +238,8 @@ System.out.printf("Detected language name: %s, ISO 6391 name: %s, score: %f.%n",
 ```java
 String document = "Satya Nadella is the CEO of Microsoft";
 textAnalyticsClient.recognizeEntities(document).forEach(entity ->
-    System.out.printf("Recognized entity: %s, category: %s, subCategory: %s, score: %f.%n",
-        entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+    System.out.printf("Recognized entity: %s, category: %s, subcategory: %s, confidence score: %f.%n",
+        entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
 ```
 
 ### Recognize linked entity
@@ -251,8 +251,8 @@ textAnalyticsClient.recognizeLinkedEntities(document).forEach(linkedEntity -> {
     System.out.println("Linked Entities:");
     System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
         linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(), linkedEntity.getDataSource());
-    linkedEntity.getLinkedEntityMatches().forEach(linkedEntityMatch ->
-        System.out.printf("Text: %s, score: %f.%n", linkedEntityMatch.getText(), linkedEntityMatch.getConfidenceScore()));
+    linkedEntity.getMatches().forEach(match ->
+        System.out.printf("Text: %s, confidence score: %f.%n", match.getText(), match.getConfidenceScore()));
 });
 ```
 ### Extract key phrases
@@ -314,13 +314,12 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact [opencode@microsoft.com][coc_contact] with any additional questions or comments.
 
 <!-- LINKS -->
-[azure_key_credential]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/core/azure-core/src/main/java/com/azure/core/credential/AzureKeyCredential.java
 [aad_credential]: https://docs.microsoft.com/azure/cognitive-services/authentication#authenticate-with-azure-active-directory
-[key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
 [api_reference_doc]: https://aka.ms/azsdk-java-textanalytics-ref-docs
 [authentication]: https://docs.microsoft.com/azure/cognitive-services/authentication
 [azure_cli]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account-cli?tabs=windows
 [azure_identity]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity#credentials
+[azure_key_credential]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/core/azure-core/src/main/java/com/azure/core/credential/AzureKeyCredential.java
 [azure_portal]: https://ms.portal.azure.com
 [azure_subscription]: https://azure.microsoft.com/free
 [cla]: https://cla.microsoft.com
@@ -333,6 +332,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
 [default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity#defaultazurecredential
 [grant_access]: https://docs.microsoft.com/azure/cognitive-services/authentication#assign-a-role-to-a-service-principal
 [install_azure_identity]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity#install-the-package
+[key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
 [key_phrase_extraction]: https://docs.microsoft.com/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-keyword-extraction
 [language_detection]: https://docs.microsoft.com/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-language-detection
 [language_regional_support]: https://docs.microsoft.com/azure/cognitive-services/text-analytics/language-support
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeSentimentAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeSentimentAsyncClient.java
index d15edf3068fe..728c5a73eb09 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeSentimentAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeSentimentAsyncClient.java
@@ -13,10 +13,13 @@
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.SentimentConfidenceScores;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsWarning;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
 import com.azure.ai.textanalytics.models.TextSentiment;
+import com.azure.ai.textanalytics.models.WarningCode;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.IterableStream;
@@ -24,16 +27,17 @@
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.azure.ai.textanalytics.TextAnalyticsAsyncClient.COGNITIVE_TRACING_NAMESPACE_VALUE;
 import static com.azure.ai.textanalytics.Transforms.toBatchStatistics;
 import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsError;
 import static com.azure.ai.textanalytics.Transforms.toTextDocumentStatistics;
+import static com.azure.ai.textanalytics.implementation.Utility.getEmptyErrorIdHttpResponse;
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExist;
 import static com.azure.core.util.FluxUtil.fluxError;
 import static com.azure.core.util.FluxUtil.withContext;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
@@ -46,7 +50,7 @@ class AnalyzeSentimentAsyncClient {
     private final TextAnalyticsClientImpl service;
 
     /**
-     * Create a {@link AnalyzeSentimentAsyncClient} that sends requests to the Text Analytics services's sentiment
+     * Create an {@link AnalyzeSentimentAsyncClient} that sends requests to the Text Analytics services's sentiment
      * analysis endpoint.
      *
      * @param service The proxy service used to perform REST calls.
@@ -66,18 +70,12 @@ class AnalyzeSentimentAsyncClient {
      */
     TextAnalyticsPagedFlux<AnalyzeSentimentResult> analyzeSentimentBatch(Iterable<TextDocumentInput> documents,
         TextAnalyticsRequestOptions options) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
-        }
-
         try {
+            inputDocumentsValidation(documents);
             return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> withContext(context ->
                 getAnalyzedSentimentResponseInPage(documents, options, context)).flux());
         } catch (RuntimeException ex) {
-            return new TextAnalyticsPagedFlux<>(() ->
-                (continuationToken, pageSize) -> fluxError(logger, ex));
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
     }
 
@@ -93,14 +91,13 @@ TextAnalyticsPagedFlux<AnalyzeSentimentResult> analyzeSentimentBatch(Iterable<Te
      */
     TextAnalyticsPagedFlux<AnalyzeSentimentResult> analyzeSentimentBatchWithContext(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
+        try {
+            inputDocumentsValidation(documents);
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
+                getAnalyzedSentimentResponseInPage(documents, options, context).flux());
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
-
-        return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
-            getAnalyzedSentimentResponseInPage(documents, options, context).flux());
     }
 
     /**
@@ -119,6 +116,16 @@ private TextAnalyticsPagedResponse<AnalyzeSentimentResult> toTextAnalyticsPagedR
             analyzeSentimentResults.add(convertToAnalyzeSentimentResult(documentSentiment));
         }
         for (DocumentError documentError : sentimentResponse.getErrors()) {
+            /*
+             *  TODO: Remove this after service update to throw exception.
+             *  Currently, service sets max limit of document size to 5, if the input documents size > 5, it will
+             *  have an id = "", empty id. In the future, they will remove this and throw HttpResponseException.
+             */
+            if (documentError.getId().isEmpty()) {
+                throw logger.logExceptionAsError(
+                    new HttpResponseException(documentError.getError().getInnererror().getMessage(),
+                    getEmptyErrorIdHttpResponse(response), documentError.getError().getInnererror().getCode()));
+            }
             analyzeSentimentResults.add(new AnalyzeSentimentResult(documentError.getId(), null,
                 toTextAnalyticsError(documentError.getError()), null));
         }
@@ -148,7 +155,7 @@ private AnalyzeSentimentResult convertToAnalyzeSentimentResult(DocumentSentiment
                     documentSentiment.getSentiment())));
         }
 
-        final SentimentConfidenceScorePerLabel confidenceScorePerLabel = documentSentiment.getDocumentScores();
+        final SentimentConfidenceScorePerLabel confidenceScorePerLabel = documentSentiment.getConfidenceScores();
 
         // Sentence text sentiment
         final List<SentenceSentiment> sentenceSentiments = documentSentiment.getSentences().stream()
@@ -163,16 +170,19 @@ private AnalyzeSentimentResult convertToAnalyzeSentimentResult(DocumentSentiment
                             sentenceSentiment.getSentiment())));
                 }
                 final SentimentConfidenceScorePerLabel confidenceScorePerSentence =
-                    sentenceSentiment.getSentenceScores();
+                    sentenceSentiment.getConfidenceScores();
 
-                return new SentenceSentiment(
+                return new SentenceSentiment(sentenceSentiment.getText(),
                     sentenceSentimentLabel,
                     new SentimentConfidenceScores(confidenceScorePerSentence.getNegative(),
-                        confidenceScorePerSentence.getNeutral(), confidenceScorePerSentence.getPositive()),
-                    sentenceSentiment.getLength(),
-                    sentenceSentiment.getOffset());
+                        confidenceScorePerSentence.getNeutral(), confidenceScorePerSentence.getPositive()));
             }).collect(Collectors.toList());
 
+        // Warnings
+        final List<TextAnalyticsWarning> warnings = documentSentiment.getWarnings().stream().map(
+            warning -> new TextAnalyticsWarning(WarningCode.fromString(warning.getCode().toString()),
+                warning.getMessage())).collect(Collectors.toList());
+
         return new AnalyzeSentimentResult(
             documentSentiment.getId(),
             documentSentiment.getStatistics() == null
@@ -184,7 +194,8 @@ private AnalyzeSentimentResult convertToAnalyzeSentimentResult(DocumentSentiment
                     confidenceScorePerLabel.getNegative(),
                     confidenceScorePerLabel.getNeutral(),
                     confidenceScorePerLabel.getPositive()),
-                new IterableStream<>(sentenceSentiments)));
+                new IterableStream<>(sentenceSentiments),
+                new IterableStream<>(warnings)));
     }
 
     /**
@@ -199,14 +210,15 @@ private AnalyzeSentimentResult convertToAnalyzeSentimentResult(DocumentSentiment
      */
     private Mono<TextAnalyticsPagedResponse<AnalyzeSentimentResult>> getAnalyzedSentimentResponseInPage(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        return service.sentimentWithRestResponseAsync(
+        return service.sentimentWithResponseAsync(
             new MultiLanguageBatchInput().setDocuments(Transforms.toMultiLanguageInput(documents)),
+            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE),
             options == null ? null : options.getModelVersion(),
-            options == null ? null : options.isIncludeStatistics(),
-            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
+            options == null ? null : options.isIncludeStatistics())
             .doOnSubscribe(ignoredValue -> logger.info("A batch of documents - {}", documents.toString()))
             .doOnSuccess(response -> logger.info("Analyzed sentiment for a batch of documents - {}", response))
             .doOnError(error -> logger.warning("Failed to analyze sentiment - {}", error))
-            .map(this::toTextAnalyticsPagedResponse);
+            .map(this::toTextAnalyticsPagedResponse)
+            .onErrorMap(throwable -> mapToHttpResponseExceptionIfExist(throwable));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/DetectLanguageAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/DetectLanguageAsyncClient.java
index c197323947e2..112345eef2a0 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/DetectLanguageAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/DetectLanguageAsyncClient.java
@@ -12,22 +12,28 @@
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsWarning;
+import com.azure.ai.textanalytics.models.WarningCode;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
+import com.azure.core.util.IterableStream;
 import com.azure.core.util.logging.ClientLogger;
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static com.azure.ai.textanalytics.TextAnalyticsAsyncClient.COGNITIVE_TRACING_NAMESPACE_VALUE;
 import static com.azure.ai.textanalytics.Transforms.toBatchStatistics;
 import static com.azure.ai.textanalytics.Transforms.toLanguageInput;
+import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsError;
+import static com.azure.ai.textanalytics.implementation.Utility.getEmptyErrorIdHttpResponse;
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExist;
 import static com.azure.core.util.FluxUtil.fluxError;
 import static com.azure.core.util.FluxUtil.withContext;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
@@ -60,13 +66,8 @@ class DetectLanguageAsyncClient {
      */
     TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatch(Iterable<DetectLanguageInput> documents,
         TextAnalyticsRequestOptions options) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<DetectLanguageInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
-        }
-
         try {
+            inputDocumentsValidation(documents);
             return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> withContext(context ->
                 getDetectedLanguageResponseInPage(documents, options, context)).flux());
         } catch (RuntimeException ex) {
@@ -86,14 +87,13 @@ TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatch(Iterable<Detect
      */
     TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatchWithContext(
         Iterable<DetectLanguageInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<DetectLanguageInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
+        try {
+            inputDocumentsValidation(documents);
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
+                getDetectedLanguageResponseInPage(documents, options, context).flux());
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
-
-        return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
-            getDetectedLanguageResponseInPage(documents, options, context).flux());
     }
 
     /**
@@ -106,37 +106,42 @@ TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatchWithContext(
      */
     private TextAnalyticsPagedResponse<DetectLanguageResult> toTextAnalyticsPagedResponse(
         SimpleResponse<LanguageResult> response) {
-
         final LanguageResult languageResult = response.getValue();
-
         final List<DetectLanguageResult> detectLanguageResults = new ArrayList<>();
         for (DocumentLanguage documentLanguage : languageResult.getDocuments()) {
-            DetectedLanguage primaryLanguage = null;
-            List<com.azure.ai.textanalytics.implementation.models.DetectedLanguage> detectedLanguages =
-                documentLanguage.getDetectedLanguages();
-            if (detectedLanguages.size() >= 1) {
-                detectedLanguages.sort(
-                    Comparator.comparing(com.azure.ai.textanalytics.implementation.models.DetectedLanguage::getScore));
-                com.azure.ai.textanalytics.implementation.models.DetectedLanguage detectedLanguageResult =
-                    detectedLanguages.get(0);
-                primaryLanguage = new DetectedLanguage(detectedLanguageResult.getName(),
-                    detectedLanguageResult.getIso6391Name(), detectedLanguageResult.getScore());
-            }
+            com.azure.ai.textanalytics.implementation.models.DetectedLanguage detectedLanguage =
+                documentLanguage.getDetectedLanguage();
+
+            // warnings
+            final List<TextAnalyticsWarning> warnings = documentLanguage.getWarnings().stream().map(warning ->
+                new TextAnalyticsWarning(WarningCode.fromString(warning.getCode().toString()),
+                    warning.getMessage())).collect(Collectors.toList());
+
 
-            detectLanguageResults.add(new DetectLanguageResult(documentLanguage.getId(),
+            detectLanguageResults.add(new DetectLanguageResult(
+                documentLanguage.getId(),
                 documentLanguage.getStatistics() == null
                     ? null : Transforms.toTextDocumentStatistics(documentLanguage.getStatistics()),
                 null,
-                primaryLanguage));
+                new DetectedLanguage(detectedLanguage.getName(),
+                    detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore(),
+                    new IterableStream<>(warnings))));
         }
-
+        // Document errors
         for (DocumentError documentError : languageResult.getErrors()) {
-            com.azure.ai.textanalytics.models.TextAnalyticsError error =
-                Transforms.toTextAnalyticsError(documentError.getError());
-            final String documentId = documentError.getId();
+            /*
+             *  TODO: Remove this after service update to throw exception.
+             *  Currently, service sets max limit of document size to 5, if the input documents size > 5, it will
+             *  have an id = "", empty id. In the future, they will remove this and throw HttpResponseException.
+             */
+            if (documentError.getId().isEmpty()) {
+                throw logger.logExceptionAsError(
+                    new HttpResponseException(documentError.getError().getInnererror().getMessage(),
+                    getEmptyErrorIdHttpResponse(response), documentError.getError().getInnererror().getCode()));
+            }
 
-            detectLanguageResults.add(
-                new DetectLanguageResult(documentId, null, error, null));
+            detectLanguageResults.add(new DetectLanguageResult(documentError.getId(), null,
+                toTextAnalyticsError(documentError.getError()), null));
         }
 
         return new TextAnalyticsPagedResponse<>(
@@ -161,15 +166,17 @@ private TextAnalyticsPagedResponse<DetectLanguageResult> toTextAnalyticsPagedRes
      */
     private Mono<TextAnalyticsPagedResponse<DetectLanguageResult>> getDetectedLanguageResponseInPage(
         Iterable<DetectLanguageInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        return service.languagesWithRestResponseAsync(
-            new LanguageBatchInput().setDocuments(toLanguageInput(documents)),
-            options == null ? null : options.getModelVersion(),
-            options == null ? null : options.isIncludeStatistics(),
-            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
-            .doOnSubscribe(ignoredValue -> logger.info("A batch of documents - {}", documents.toString()))
-            .doOnSuccess(response -> logger.info("Detected languages for a batch of documents - {}",
-                response.getValue()))
-            .doOnError(error -> logger.warning("Failed to detect language - {}", error))
-            .map(this::toTextAnalyticsPagedResponse);
+        return service.languagesWithResponseAsync(
+                new LanguageBatchInput().setDocuments(toLanguageInput(documents)),
+                context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE),
+                options == null ? null : options.getModelVersion(),
+                options == null ? null : options.isIncludeStatistics())
+                .doOnSubscribe(ignoredValue -> logger.info("A batch of documents - {}", documents.toString()))
+                .doOnSuccess(response -> logger.info("Detected languages for a batch of documents - {}",
+                    response.getValue()))
+                .doOnError(error -> logger.warning("Failed to detect language - {}", error))
+                .map(this::toTextAnalyticsPagedResponse)
+                .onErrorMap(throwable -> mapToHttpResponseExceptionIfExist(throwable));
+
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/ExtractKeyPhraseAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/ExtractKeyPhraseAsyncClient.java
index 2837e1af13a0..fd0c18cadd4b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/ExtractKeyPhraseAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/ExtractKeyPhraseAsyncClient.java
@@ -9,10 +9,15 @@
 import com.azure.ai.textanalytics.implementation.models.KeyPhraseResult;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
+import com.azure.ai.textanalytics.models.KeyPhrasesCollection;
+import com.azure.ai.textanalytics.models.TextAnalyticsError;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsWarning;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
+import com.azure.ai.textanalytics.models.WarningCode;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.IterableStream;
@@ -21,7 +26,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -30,8 +34,13 @@
 import static com.azure.ai.textanalytics.Transforms.toBatchStatistics;
 import static com.azure.ai.textanalytics.Transforms.toMultiLanguageInput;
 import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsError;
+import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsException;
 import static com.azure.ai.textanalytics.Transforms.toTextDocumentStatistics;
+import static com.azure.ai.textanalytics.implementation.Utility.getEmptyErrorIdHttpResponse;
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExist;
 import static com.azure.core.util.FluxUtil.fluxError;
+import static com.azure.core.util.FluxUtil.monoError;
 import static com.azure.core.util.FluxUtil.withContext;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
 
@@ -43,7 +52,7 @@ class ExtractKeyPhraseAsyncClient {
     private final TextAnalyticsClientImpl service;
 
     /**
-     * Create a {@link ExtractKeyPhraseAsyncClient} that sends requests to the Text Analytics services's extract
+     * Create an {@link ExtractKeyPhraseAsyncClient} that sends requests to the Text Analytics services's extract
      * keyphrase endpoint.
      *
      * @param service The proxy service used to perform REST calls.
@@ -53,38 +62,29 @@ class ExtractKeyPhraseAsyncClient {
     }
 
     /**
-     * Helper function for calling service with max overloaded parameters that a returns {@link TextAnalyticsPagedFlux}
-     * which is a paged flux that contains extracted key phrases.
+     * Helper function for calling service with max overloaded parameters that a returns {@link KeyPhrasesCollection}.
      *
      * @param document A document.
      * @param language The language code.
      *
-     * @return The {@link TextAnalyticsPagedFlux} of extracted key phrases strings.
+     * @return The {@link Mono} of {@link KeyPhrasesCollection} extracted key phrases strings.
      */
-    TextAnalyticsPagedFlux<String> extractKeyPhrasesSingleText(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
-        return new TextAnalyticsPagedFlux<>(() ->
-            (continuationToken, pageSize) -> extractKeyPhrases(
-                Collections.singletonList(new TextDocumentInput("0", document, language)), null).byPage()
-                .map(resOfResult -> {
-                    Iterator<ExtractKeyPhraseResult> iterator = resOfResult.getValue().iterator();
-                    // Collection will never empty
-                    if (!iterator.hasNext()) {
-                        throw logger.logExceptionAsError(new IllegalStateException(
-                            "An empty collection returned which is an unexpected error."));
-                    }
-
-                    final ExtractKeyPhraseResult keyPhraseResult = iterator.next();
-                    if (keyPhraseResult.isError()) {
-                        throw logger.logExceptionAsError(
-                            Transforms.toTextAnalyticsException(keyPhraseResult.getError()));
-                    }
-
-                    return new TextAnalyticsPagedResponse<>(
-                        resOfResult.getRequest(), resOfResult.getStatusCode(), resOfResult.getHeaders(),
-                        keyPhraseResult.getKeyPhrases().stream().collect(Collectors.toList()),
-                        null, resOfResult.getModelVersion(), resOfResult.getStatistics());
-                }));
+    Mono<KeyPhrasesCollection> extractKeyPhrasesSingleText(String document, String language) {
+        try {
+            Objects.requireNonNull(document, "'document' cannot be null.");
+            final TextDocumentInput textDocumentInput = new TextDocumentInput("0", document);
+            textDocumentInput.setLanguage(language);
+            return extractKeyPhrases(Collections.singletonList(textDocumentInput), null)
+                    .map(keyPhraseResult -> {
+                        if (keyPhraseResult.isError()) {
+                            throw logger.logExceptionAsError(toTextAnalyticsException(keyPhraseResult.getError()));
+                        }
+                        return new KeyPhrasesCollection(keyPhraseResult.getKeyPhrases(),
+                            keyPhraseResult.getKeyPhrases().getWarnings());
+                    }).last();
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
     }
 
     /**
@@ -98,18 +98,12 @@ TextAnalyticsPagedFlux<String> extractKeyPhrasesSingleText(String document, Stri
      */
     TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrases(Iterable<TextDocumentInput> documents,
         TextAnalyticsRequestOptions options) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
-        }
-
         try {
+            inputDocumentsValidation(documents);
             return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> withContext(context ->
                 getExtractedKeyPhrasesResponseInPage(documents, options, context)).flux());
         } catch (RuntimeException ex) {
-            return new TextAnalyticsPagedFlux<>(() ->
-                (continuationToken, pageSize) -> fluxError(logger, ex));
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
     }
 
@@ -125,14 +119,13 @@ TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrases(Iterable<TextDo
      */
     TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrasesBatchWithContext(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
+        try {
+            inputDocumentsValidation(documents);
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
+                getExtractedKeyPhrasesResponseInPage(documents, options, context).flux());
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
-
-        return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
-            getExtractedKeyPhrasesResponseInPage(documents, options, context).flux());
     }
 
     /**
@@ -155,15 +148,28 @@ private TextAnalyticsPagedResponse<ExtractKeyPhraseResult> toTextAnalyticsPagedR
                 documentId,
                 documentKeyPhrases.getStatistics() == null ? null
                     : toTextDocumentStatistics(documentKeyPhrases.getStatistics()), null,
-                new IterableStream<>(documentKeyPhrases.getKeyPhrases())));
+                new KeyPhrasesCollection(
+                    new IterableStream<>(documentKeyPhrases.getKeyPhrases()),
+                    new IterableStream<>(documentKeyPhrases.getWarnings().stream().map(warning ->
+                        new TextAnalyticsWarning(WarningCode.fromString(warning.getCode().toString()),
+                            warning.getMessage()))
+                        .collect(Collectors.toList())))));
         }
-
+        // Document errors
         for (DocumentError documentError : keyPhraseResult.getErrors()) {
-            final com.azure.ai.textanalytics.models.TextAnalyticsError error =
-                toTextAnalyticsError(documentError.getError());
-
+            /*
+             *  TODO: Remove this after service update to throw exception.
+             *  Currently, service sets max limit of document size to 5, if the input documents size > 5, it will
+             *  have an id = "", empty id. In the future, they will remove this and throw HttpResponseException.
+             */
+            if (documentError.getId().isEmpty()) {
+                throw logger.logExceptionAsError(
+                    new HttpResponseException(documentError.getError().getInnererror().getMessage(),
+                    getEmptyErrorIdHttpResponse(response), documentError.getError().getInnererror().getCode()));
+            }
+
+            final TextAnalyticsError error = toTextAnalyticsError(documentError.getError());
             final String documentId = documentError.getId();
-
             keyPhraseResultList.add(new ExtractKeyPhraseResult(
                 documentId, null, error, null));
         }
@@ -190,14 +196,15 @@ private TextAnalyticsPagedResponse<ExtractKeyPhraseResult> toTextAnalyticsPagedR
      */
     private Mono<TextAnalyticsPagedResponse<ExtractKeyPhraseResult>> getExtractedKeyPhrasesResponseInPage(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        return service.keyPhrasesWithRestResponseAsync(
+        return service.keyPhrasesWithResponseAsync(
             new MultiLanguageBatchInput().setDocuments(toMultiLanguageInput(documents)),
+            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE),
             options == null ? null : options.getModelVersion(),
-            options == null ? null : options.isIncludeStatistics(),
-            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
+            options == null ? null : options.isIncludeStatistics())
             .doOnSubscribe(ignoredValue -> logger.info("A batch of document - {}", documents.toString()))
             .doOnSuccess(response -> logger.info("A batch of key phrases output - {}", response.getValue()))
             .doOnError(error -> logger.warning("Failed to extract key phrases - {}", error))
-            .map(this::toTextAnalyticsPagedResponse);
+            .map(this::toTextAnalyticsPagedResponse)
+            .onErrorMap(throwable -> mapToHttpResponseExceptionIfExist(throwable));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeEntityAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeEntityAsyncClient.java
index 2705e4aa2c8d..11ebb469ccb7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeEntityAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeEntityAsyncClient.java
@@ -7,12 +7,16 @@
 import com.azure.ai.textanalytics.implementation.models.EntitiesResult;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
 import com.azure.ai.textanalytics.models.CategorizedEntity;
+import com.azure.ai.textanalytics.models.CategorizedEntityCollection;
 import com.azure.ai.textanalytics.models.EntityCategory;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsWarning;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
+import com.azure.ai.textanalytics.models.WarningCode;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.IterableStream;
@@ -21,7 +25,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -30,8 +33,13 @@
 import static com.azure.ai.textanalytics.Transforms.toBatchStatistics;
 import static com.azure.ai.textanalytics.Transforms.toMultiLanguageInput;
 import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsError;
+import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsException;
 import static com.azure.ai.textanalytics.Transforms.toTextDocumentStatistics;
+import static com.azure.ai.textanalytics.implementation.Utility.getEmptyErrorIdHttpResponse;
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExist;
 import static com.azure.core.util.FluxUtil.fluxError;
+import static com.azure.core.util.FluxUtil.monoError;
 import static com.azure.core.util.FluxUtil.withContext;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
 
@@ -53,146 +61,150 @@ class RecognizeEntityAsyncClient {
     }
 
     /**
-     * Helper function for calling service with max overloaded parameters that a returns {@link TextAnalyticsPagedFlux}
-     * which is a paged flux that contains {@link CategorizedEntity}.
+     * Helper function for calling service with max overloaded parameters that a returns {@link Mono}
+     * which is a paged flux that contains {@link CategorizedEntityCollection}.
      *
      * @param document A single document.
      * @param language The language code.
      *
-     * @return The {@link TextAnalyticsPagedFlux} of {@link CategorizedEntity}.
+     * @return The {@link Mono} of {@link CategorizedEntityCollection}.
      */
-    TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
-        return new TextAnalyticsPagedFlux<>(() ->
-            (continuationToken, pageSize) -> recognizeEntitiesBatch(
-                Collections.singletonList(new TextDocumentInput("0", document, language)), null)
-                .byPage()
-                .map(resOfResult -> {
-                    Iterator<RecognizeCategorizedEntitiesResult> iterator = resOfResult.getValue().iterator();
-                    // Collection will never empty
-                    if (!iterator.hasNext()) {
-                        throw logger.logExceptionAsError(new IllegalStateException(
-                            "An empty collection returned which is an unexpected error."));
-                    }
-
-                    final RecognizeCategorizedEntitiesResult entitiesResult = iterator.next();
-                    if (entitiesResult.isError()) {
-                        throw logger.logExceptionAsError(
-                            Transforms.toTextAnalyticsException(entitiesResult.getError()));
-                    }
-
-                    return new TextAnalyticsPagedResponse<>(
-                        resOfResult.getRequest(), resOfResult.getStatusCode(), resOfResult.getHeaders(),
-                        entitiesResult.getEntities().stream().collect(Collectors.toList()), null,
-                        resOfResult.getModelVersion(), resOfResult.getStatistics());
-                }));
+    Mono<CategorizedEntityCollection> recognizeEntities(String document, String language) {
+        try {
+            Objects.requireNonNull(document, "'document' cannot be null.");
+            final TextDocumentInput textDocumentInput = new TextDocumentInput("0", document);
+            textDocumentInput.setLanguage(language);
+            return recognizeEntitiesBatch(Collections.singletonList(textDocumentInput), null)
+                    .map(entitiesResult -> {
+                        if (entitiesResult.isError()) {
+                            throw logger.logExceptionAsError(toTextAnalyticsException(entitiesResult.getError()));
+                        }
+                        return new CategorizedEntityCollection(entitiesResult.getEntities(),
+                            entitiesResult.getEntities().getWarnings());
+                    }).last();
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
     }
 
     /**
      * Helper function for calling service with max overloaded parameters that a returns {@link TextAnalyticsPagedFlux}
-     * which is a paged flux that contains {@link RecognizeCategorizedEntitiesResult}.
+     * which is a paged flux that contains {@link RecognizeEntitiesResult}.
      *
      * @param documents The list of documents to recognize entities for.
      * @param options The {@link TextAnalyticsRequestOptions} request options.
      *
-     * @return The {@link TextAnalyticsPagedFlux} of {@link RecognizeCategorizedEntitiesResult}.
+     * @return The {@link TextAnalyticsPagedFlux} of {@link RecognizeEntitiesResult}.
      */
-    TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
-        }
-
         try {
+            inputDocumentsValidation(documents);
             return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> withContext(context ->
                 getRecognizedEntitiesResponseInPage(documents, options, context)).flux());
         } catch (RuntimeException ex) {
-            return new TextAnalyticsPagedFlux<>(() ->
-                (continuationToken, pageSize) -> fluxError(logger, ex));
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
     }
 
     /**
      * Helper function for calling service with max overloaded parameters that a returns {@link TextAnalyticsPagedFlux}
-     * which is a paged flux that contains {@link RecognizeCategorizedEntitiesResult}.
+     * which is a paged flux that contains {@link RecognizeEntitiesResult}.
      *
      * @param documents The list of documents to recognize entities for.
      * @param options The {@link TextAnalyticsRequestOptions} request options.
      * @param context Additional context that is passed through the Http pipeline during the service call.
      *
-     * @return the {@link TextAnalyticsPagedFlux} of {@link RecognizeCategorizedEntitiesResult} to be returned by
+     * @return the {@link TextAnalyticsPagedFlux} of {@link RecognizeEntitiesResult} to be returned by
      * the SDK.
      */
-    TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatchWithContext(
+    TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatchWithContext(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
+        try {
+            inputDocumentsValidation(documents);
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
+                getRecognizedEntitiesResponseInPage(documents, options, context).flux());
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
-
-        return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
-            getRecognizedEntitiesResponseInPage(documents, options, context).flux());
     }
 
     /**
      * Helper method to convert the service response of {@link EntitiesResult} to {@link TextAnalyticsPagedResponse}.
-     * of {@link RecognizeCategorizedEntitiesResult}}
+     * of {@link RecognizeEntitiesResult}}
      *
      * @param response the {@link SimpleResponse} of {@link EntitiesResult} returned by the service.
      *
-     * @return the {@link TextAnalyticsPagedResponse} of {@link RecognizeCategorizedEntitiesResult} to be returned
+     * @return the {@link TextAnalyticsPagedResponse} of {@link RecognizeEntitiesResult} to be returned
      * by the SDK.
      */
-    private TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult> toTextAnalyticsPagedResponse(
+    private TextAnalyticsPagedResponse<RecognizeEntitiesResult> toTextAnalyticsPagedResponse(
         final SimpleResponse<EntitiesResult> response) {
         EntitiesResult entitiesResult = response.getValue();
         // List of documents results
-        List<RecognizeCategorizedEntitiesResult> recognizeCategorizedEntitiesResults = new ArrayList<>();
+        List<RecognizeEntitiesResult> recognizeEntitiesResults = new ArrayList<>();
         entitiesResult.getDocuments().forEach(documentEntities ->
-            recognizeCategorizedEntitiesResults.add(new RecognizeCategorizedEntitiesResult(
+            recognizeEntitiesResults.add(new RecognizeEntitiesResult(
                 documentEntities.getId(),
                 documentEntities.getStatistics() == null ? null
                     : toTextDocumentStatistics(documentEntities.getStatistics()),
                 null,
-                new IterableStream<>(documentEntities.getEntities().stream().map(entity ->
-                    new CategorizedEntity(entity.getText(), EntityCategory.fromString(entity.getType()),
-                        entity.getSubtype(), entity.getOffset(), entity.getLength(), entity.getScore()))
-                    .collect(Collectors.toList())))));
+                new CategorizedEntityCollection(
+                    new IterableStream<>(documentEntities.getEntities().stream().map(entity ->
+                        new CategorizedEntity(entity.getText(), EntityCategory.fromString(entity.getCategory()),
+                            entity.getSubcategory(), entity.getConfidenceScore()))
+                        .collect(Collectors.toList())),
+                    new IterableStream<>(documentEntities.getWarnings().stream().map(warning ->
+                        new TextAnalyticsWarning(WarningCode.fromString(warning.getCode().toString()),
+                            warning.getMessage()))
+                        .collect(Collectors.toList())))
+            )));
         // Document errors
-        entitiesResult.getErrors().forEach(documentError -> recognizeCategorizedEntitiesResults.add(
-            new RecognizeCategorizedEntitiesResult(documentError.getId(), null,
-                toTextAnalyticsError(documentError.getError()), null)));
+        entitiesResult.getErrors().forEach(documentError -> {
+            /*
+             *  TODO: Remove this after service update to throw exception.
+             *  Currently, service sets max limit of document size to 5, if the input documents size > 5, it will
+             *  have an id = "", empty id. In the future, they will remove this and throw HttpResponseException.
+             */
+            if (documentError.getId().isEmpty()) {
+                throw logger.logExceptionAsError(
+                    new HttpResponseException(documentError.getError().getInnererror().getMessage(),
+                    getEmptyErrorIdHttpResponse(response), documentError.getError().getInnererror().getCode()));
+            }
+
+            recognizeEntitiesResults.add(
+                new RecognizeEntitiesResult(documentError.getId(), null,
+                    toTextAnalyticsError(documentError.getError()), null));
+        });
 
         return new TextAnalyticsPagedResponse<>(
             response.getRequest(), response.getStatusCode(), response.getHeaders(),
-            recognizeCategorizedEntitiesResults, null, entitiesResult.getModelVersion(),
+            recognizeEntitiesResults, null, entitiesResult.getModelVersion(),
             entitiesResult.getStatistics() == null ? null : toBatchStatistics(entitiesResult.getStatistics()));
     }
 
     /**
      * Call the service with REST response, convert to a {@link Mono} of {@link TextAnalyticsPagedResponse} of
-     * {@link RecognizeCategorizedEntitiesResult} from a {@link SimpleResponse} of {@link EntitiesResult}.
+     * {@link RecognizeEntitiesResult} from a {@link SimpleResponse} of {@link EntitiesResult}.
      *
      * @param documents The list of documents to recognize entities for.
      * @param options The {@link TextAnalyticsRequestOptions} request options.
      * @param context Additional context that is passed through the Http pipeline during the service call.
      *
-     * @return A {@link Mono} of {@link TextAnalyticsPagedResponse} of {@link RecognizeCategorizedEntitiesResult}.
+     * @return A {@link Mono} of {@link TextAnalyticsPagedResponse} of {@link RecognizeEntitiesResult}.
      */
-    private Mono<TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult>> getRecognizedEntitiesResponseInPage(
+    private Mono<TextAnalyticsPagedResponse<RecognizeEntitiesResult>> getRecognizedEntitiesResponseInPage(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        return service.entitiesRecognitionGeneralWithRestResponseAsync(
+        return service.entitiesRecognitionGeneralWithResponseAsync(
             new MultiLanguageBatchInput().setDocuments(toMultiLanguageInput(documents)),
+            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE),
             options == null ? null : options.getModelVersion(),
-            options == null ? null : options.isIncludeStatistics(),
-            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
+            options == null ? null : options.isIncludeStatistics())
             .doOnSubscribe(ignoredValue -> logger.info("A batch of documents - {}", documents.toString()))
             .doOnSuccess(response -> logger.info("Recognized entities for a batch of documents- {}",
                 response.getValue()))
             .doOnError(error -> logger.warning("Failed to recognize entities - {}", error))
-            .map(this::toTextAnalyticsPagedResponse);
+            .map(this::toTextAnalyticsPagedResponse)
+            .onErrorMap(throwable -> mapToHttpResponseExceptionIfExist(throwable));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeLinkedEntityAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeLinkedEntityAsyncClient.java
index bef176d77740..4f4b44ba0028 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeLinkedEntityAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeLinkedEntityAsyncClient.java
@@ -7,12 +7,16 @@
 import com.azure.ai.textanalytics.implementation.models.EntityLinkingResult;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
 import com.azure.ai.textanalytics.models.LinkedEntity;
+import com.azure.ai.textanalytics.models.LinkedEntityCollection;
 import com.azure.ai.textanalytics.models.LinkedEntityMatch;
 import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsWarning;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
+import com.azure.ai.textanalytics.models.WarningCode;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.IterableStream;
@@ -21,7 +25,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -31,7 +34,11 @@
 import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsError;
 import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsException;
 import static com.azure.ai.textanalytics.Transforms.toTextDocumentStatistics;
+import static com.azure.ai.textanalytics.implementation.Utility.getEmptyErrorIdHttpResponse;
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExist;
 import static com.azure.core.util.FluxUtil.fluxError;
+import static com.azure.core.util.FluxUtil.monoError;
 import static com.azure.core.util.FluxUtil.withContext;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
 
@@ -53,38 +60,29 @@ class RecognizeLinkedEntityAsyncClient {
     }
 
     /**
-     * Helper function for calling service with max overloaded parameters that a returns {@link TextAnalyticsPagedFlux}
-     * which is a paged flux that contains {@link LinkedEntity}.
+     * Helper function for calling service with max overloaded parameters that a returns {@link LinkedEntityCollection}.
      *
      * @param document A single document.
      * @param language The language code.
      *
-     * @return The {@link TextAnalyticsPagedFlux} of {@link LinkedEntity}.
+     * @return The {@link Mono} of {@link LinkedEntityCollection}.
      */
-    TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
-        return new TextAnalyticsPagedFlux<>(() ->
-            (continuationToken, pageSize) -> recognizeLinkedEntitiesBatch(
-                Collections.singletonList(new TextDocumentInput("0", document, language)), null)
-                .byPage()
-                .map(resOfResult -> {
-                    final Iterator<RecognizeLinkedEntitiesResult> iterator = resOfResult.getValue().iterator();
-                    // Collection will never empty
-                    if (!iterator.hasNext()) {
-                        throw logger.logExceptionAsError(new IllegalStateException(
-                            "An empty collection returned which is an unexpected error."));
-                    }
-
-                    final RecognizeLinkedEntitiesResult entitiesResult = iterator.next();
-                    if (entitiesResult.isError()) {
-                        throw logger.logExceptionAsError(toTextAnalyticsException(entitiesResult.getError()));
-                    }
-
-                    return new TextAnalyticsPagedResponse<>(
-                        resOfResult.getRequest(), resOfResult.getStatusCode(), resOfResult.getHeaders(),
-                        entitiesResult.getEntities().stream().collect(Collectors.toList()),
-                        null, resOfResult.getModelVersion(), resOfResult.getStatistics());
-                }));
+    Mono<LinkedEntityCollection> recognizeLinkedEntities(String document, String language) {
+        try {
+            Objects.requireNonNull(document, "'document' cannot be null.");
+            final TextDocumentInput textDocumentInput = new TextDocumentInput("0", document);
+            textDocumentInput.setLanguage(language);
+            return recognizeLinkedEntitiesBatch(Collections.singletonList(textDocumentInput), null)
+                    .map(entitiesResult -> {
+                        if (entitiesResult.isError()) {
+                            throw logger.logExceptionAsError(toTextAnalyticsException(entitiesResult.getError()));
+                        }
+                        return new LinkedEntityCollection(entitiesResult.getEntities(),
+                            entitiesResult.getEntities().getWarnings());
+                    }).last();
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
     }
 
     /**
@@ -98,13 +96,8 @@ TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String document, St
      */
     TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
-        }
-
         try {
+            inputDocumentsValidation(documents);
             return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> withContext(context ->
                 getRecognizedLinkedEntitiesResponseInPage(documents, options, context)).flux());
         } catch (RuntimeException ex) {
@@ -125,14 +118,13 @@ TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBat
      */
     TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatchWithContext(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        Objects.requireNonNull(documents, "'documents' cannot be null.");
-        final Iterator<TextDocumentInput> iterator = documents.iterator();
-        if (!iterator.hasNext()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'documents' cannot be empty."));
+        try {
+            inputDocumentsValidation(documents);
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
+                getRecognizedLinkedEntitiesResponseInPage(documents, options, context).flux());
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
         }
-
-        return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) ->
-            getRecognizedLinkedEntitiesResponseInPage(documents, options, context).flux());
     }
 
     /**
@@ -155,11 +147,30 @@ private TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult> toTextAnalytic
                 documentLinkedEntities.getStatistics() == null ? null
                     : toTextDocumentStatistics(documentLinkedEntities.getStatistics()),
                 null,
-                mapLinkedEntity(documentLinkedEntities.getEntities()))));
+                new LinkedEntityCollection(
+                    mapLinkedEntity(documentLinkedEntities.getEntities()),
+                    new IterableStream<>(documentLinkedEntities.getWarnings().stream().map(warning ->
+                        new TextAnalyticsWarning(WarningCode.fromString(warning.getCode().toString()),
+                            warning.getMessage()))
+                        .collect(Collectors.toList())))
+            )));
         // Document errors
-        entityLinkingResult.getErrors().forEach(documentError -> linkedEntitiesResults.add(
-            new RecognizeLinkedEntitiesResult(documentError.getId(), null,
-                toTextAnalyticsError(documentError.getError()), null)));
+        entityLinkingResult.getErrors().forEach(documentError -> {
+            /*
+             *  TODO: Remove this after service update to throw exception.
+             *  Currently, service sets max limit of document size to 5, if the input documents size > 5, it will
+             *  have an id = "", empty id. In the future, they will remove this and throw HttpResponseException.
+             */
+            if (documentError.getId().isEmpty()) {
+                throw logger.logExceptionAsError(
+                    new HttpResponseException(documentError.getError().getInnererror().getMessage(),
+                    getEmptyErrorIdHttpResponse(response), documentError.getError().getInnererror().getCode()));
+            }
+
+            linkedEntitiesResults.add(
+                new RecognizeLinkedEntitiesResult(documentError.getId(), null,
+                    toTextAnalyticsError(documentError.getError()), null));
+        });
 
         return new TextAnalyticsPagedResponse<>(
             response.getRequest(), response.getStatusCode(), response.getHeaders(),
@@ -175,7 +186,7 @@ private IterableStream<LinkedEntity> mapLinkedEntity(
             linkedEntitiesList.add(new LinkedEntity(
                 linkedEntity.getName(),
                 new IterableStream<>(linkedEntity.getMatches().stream().map(match -> new LinkedEntityMatch(
-                    match.getText(), match.getScore(), match.getLength(), match.getOffset()))
+                    match.getText(), match.getConfidenceScore()))
                     .collect(Collectors.toList())),
                 linkedEntity.getLanguage(),
                 linkedEntity.getId(), linkedEntity.getUrl(), linkedEntity.getDataSource()));
@@ -194,15 +205,16 @@ private IterableStream<LinkedEntity> mapLinkedEntity(
      */
     private Mono<TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult>> getRecognizedLinkedEntitiesResponseInPage(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
-        return service.entitiesLinkingWithRestResponseAsync(
+        return service.entitiesLinkingWithResponseAsync(
             new MultiLanguageBatchInput().setDocuments(Transforms.toMultiLanguageInput(documents)),
+            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE),
             options == null ? null : options.getModelVersion(),
-            options == null ? null : options.isIncludeStatistics(),
-            context.addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
+            options == null ? null : options.isIncludeStatistics())
             .doOnSubscribe(ignoredValue -> logger.info("A batch of documents - {}", documents.toString()))
             .doOnSuccess(response -> logger.info("Recognized linked entities for a batch of documents - {}",
                 response.getValue()))
             .doOnError(error -> logger.warning("Failed to recognize linked entities - {}", error))
-            .map(this::toTextAnalyticsPagedResponse);
+            .map(this::toTextAnalyticsPagedResponse)
+            .onErrorMap(throwable -> mapToHttpResponseExceptionIfExist(throwable));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClient.java
index f52b20bcd072..e9e24d4f9dda 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClient.java
@@ -6,13 +6,16 @@
 import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
 import com.azure.ai.textanalytics.models.AnalyzeSentimentResult;
 import com.azure.ai.textanalytics.models.CategorizedEntity;
+import com.azure.ai.textanalytics.models.CategorizedEntityCollection;
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
+import com.azure.ai.textanalytics.models.KeyPhrasesCollection;
 import com.azure.ai.textanalytics.models.LinkedEntity;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.LinkedEntityCollection;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsError;
 import com.azure.ai.textanalytics.models.TextAnalyticsException;
@@ -30,6 +33,8 @@
 import java.util.Objects;
 
 import static com.azure.ai.textanalytics.Transforms.mapByIndex;
+import static com.azure.ai.textanalytics.Transforms.toTextAnalyticsException;
+import static com.azure.core.util.FluxUtil.fluxError;
 import static com.azure.core.util.FluxUtil.monoError;
 
 /**
@@ -101,15 +106,6 @@ public String getDefaultLanguage() {
         return defaultLanguage;
     }
 
-    /**
-     * Gets the service version the client is using.
-     *
-     * @return the service version the client is using.
-     */
-    public TextAnalyticsServiceVersion getServiceVersion() {
-        return serviceVersion;
-    }
-
     /**
      * Returns the detected language and a confidence score between zero and one. Scores close to one indicate 100%
      * certainty that the identified language is true.
@@ -162,15 +158,18 @@ public Mono<DetectedLanguage> detectLanguage(String document) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<DetectedLanguage> detectLanguage(String document, String countryHint) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
-        return detectLanguageBatch(Collections.singletonList(document), countryHint, null)
-            .map(detectLanguageResult -> {
-                if (detectLanguageResult.isError()) {
-                    throw logger.logExceptionAsError(
-                        Transforms.toTextAnalyticsException(detectLanguageResult.getError()));
-                }
-                return detectLanguageResult.getPrimaryLanguage();
-            }).last();
+        try {
+            Objects.requireNonNull(document, "'document' cannot be null.");
+            return detectLanguageBatch(Collections.singletonList(document), countryHint, null)
+                .map(detectLanguageResult -> {
+                    if (detectLanguageResult.isError()) {
+                        throw logger.logExceptionAsError(toTextAnalyticsException(detectLanguageResult.getError()));
+                    }
+                    return detectLanguageResult.getPrimaryLanguage();
+                }).last();
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
     }
 
     /**
@@ -254,12 +253,18 @@ public TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatch(
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatch(
         Iterable<String> documents, String countryHint, TextAnalyticsRequestOptions options) {
+
         if (countryHint != null && countryHint.equalsIgnoreCase("none")) {
             countryHint = "";
         }
         final String finalCountryHint = countryHint;
-        return detectLanguageBatch(
-            mapByIndex(documents, (index, value) -> new DetectLanguageInput(index, value, finalCountryHint)), options);
+        try {
+            return detectLanguageBatch(
+                mapByIndex(documents, (index, value) -> new DetectLanguageInput(index, value, finalCountryHint)),
+                options);
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
+        }
     }
 
     /**
@@ -315,8 +320,8 @@ public TextAnalyticsPagedFlux<DetectLanguageResult> detectLanguageBatch(
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<CategorizedEntityCollection> recognizeEntities(String document) {
         return recognizeEntities(document, defaultLanguage);
     }
 
@@ -344,9 +349,8 @@ public TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String docume
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<CategorizedEntityCollection> recognizeEntities(String document, String language) {
         return recognizeEntityAsyncClient.recognizeEntities(document, language);
     }
 
@@ -368,12 +372,12 @@ public TextAnalyticsPagedFlux<CategorizedEntity> recognizeEntities(String docume
      * <a href="https://docs.microsoft.com/azure/cognitive-services/text-analytics/overview#data-limits">data limits</a>.
      *
      * @return A {@link TextAnalyticsPagedFlux} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<String> documents) {
         return recognizeEntitiesBatch(documents, defaultLanguage, null);
     }
@@ -394,12 +398,12 @@ public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntit
      * default.
      *
      * @return A {@link TextAnalyticsPagedFlux} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<String> documents, String language) {
         return recognizeEntitiesBatch(documents, language, null);
     }
@@ -423,15 +427,23 @@ public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntit
      * and show statistics.
      *
      * @return A {@link TextAnalyticsPagedFlux} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
-        return recognizeEntitiesBatch(
-            mapByIndex(documents, (index, value) -> new TextDocumentInput(index, value, language)), options);
+        try {
+            return recognizeEntitiesBatch(
+                mapByIndex(documents, (index, value) -> {
+                    final TextDocumentInput textDocumentInput = new TextDocumentInput(index, value);
+                    textDocumentInput.setLanguage(language);
+                    return textDocumentInput;
+                }), options);
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
+        }
     }
 
     /**
@@ -451,12 +463,12 @@ public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntit
      * and show statistics.
      *
      * @return A {@link TextAnalyticsPagedFlux} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedFlux<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options) {
         return recognizeEntityAsyncClient.recognizeEntitiesBatch(documents, options);
     }
@@ -485,8 +497,8 @@ public TextAnalyticsPagedFlux<RecognizeCategorizedEntitiesResult> recognizeEntit
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<LinkedEntityCollection> recognizeLinkedEntities(String document) {
         return recognizeLinkedEntities(document, defaultLanguage);
     }
 
@@ -510,9 +522,8 @@ public TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String docum
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<LinkedEntity> recognizeLinkedEntities(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<LinkedEntityCollection> recognizeLinkedEntities(String document, String language) {
         return recognizeLinkedEntityAsyncClient.recognizeLinkedEntities(document, language);
     }
 
@@ -599,8 +610,15 @@ public TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEnti
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
-        return recognizeLinkedEntitiesBatch(
-            mapByIndex(documents, (index, value) -> new TextDocumentInput(index, value, language)), options);
+        try {
+            return recognizeLinkedEntitiesBatch(mapByIndex(documents, (index, value) -> {
+                final TextDocumentInput textDocumentInput = new TextDocumentInput(index, value);
+                textDocumentInput.setLanguage(language);
+                return textDocumentInput;
+            }), options);
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
+        }
     }
 
     /**
@@ -655,8 +673,8 @@ public TextAnalyticsPagedFlux<RecognizeLinkedEntitiesResult> recognizeLinkedEnti
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<String> extractKeyPhrases(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<KeyPhrasesCollection> extractKeyPhrases(String document) {
         return extractKeyPhrases(document, defaultLanguage);
     }
 
@@ -681,9 +699,8 @@ public TextAnalyticsPagedFlux<String> extractKeyPhrases(String document) {
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedFlux<String> extractKeyPhrases(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<KeyPhrasesCollection> extractKeyPhrases(String document, String language) {
         return extractKeyPhraseAsyncClient.extractKeyPhrasesSingleText(document, language);
     }
 
@@ -767,8 +784,16 @@ public TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
-        return extractKeyPhrasesBatch(
-            mapByIndex(documents, (index, value) -> new TextDocumentInput(index, value, language)), options);
+        try {
+            return extractKeyPhrasesBatch(
+                mapByIndex(documents, (index, value) -> {
+                    final TextDocumentInput textDocumentInput = new TextDocumentInput(index, value);
+                    textDocumentInput.setLanguage(language);
+                    return textDocumentInput;
+                }), options);
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
+        }
     }
 
     /**
@@ -824,11 +849,7 @@ public TextAnalyticsPagedFlux<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<DocumentSentiment> analyzeSentiment(String document) {
-        try {
-            return analyzeSentiment(document, defaultLanguage);
-        } catch (RuntimeException ex) {
-            return monoError(logger, ex);
-        }
+        return analyzeSentiment(document, defaultLanguage);
     }
 
     /**
@@ -853,15 +874,18 @@ public Mono<DocumentSentiment> analyzeSentiment(String document) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<DocumentSentiment> analyzeSentiment(String document, String language) {
-        Objects.requireNonNull(document, "'document' cannot be null.");
-        return analyzeSentimentBatch(Collections.singletonList(document), language, null)
-            .map(sentimentResult -> {
-                if (sentimentResult.isError()) {
-                    throw logger.logExceptionAsError(Transforms.toTextAnalyticsException(sentimentResult.getError()));
-                }
-
-                return sentimentResult.getDocumentSentiment();
-            }).last();
+        try {
+            Objects.requireNonNull(document, "'document' cannot be null.");
+            return analyzeSentimentBatch(Collections.singletonList(document), language, null)
+                .map(sentimentResult -> {
+                    if (sentimentResult.isError()) {
+                        throw logger.logExceptionAsError(toTextAnalyticsException(sentimentResult.getError()));
+                    }
+                    return sentimentResult.getDocumentSentiment();
+                }).last();
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
     }
 
     /**
@@ -942,8 +966,16 @@ public TextAnalyticsPagedFlux<AnalyzeSentimentResult> analyzeSentimentBatch(
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedFlux<AnalyzeSentimentResult> analyzeSentimentBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
-        return analyzeSentimentBatch(
-            mapByIndex(documents, (index, value) -> new TextDocumentInput(index, value, language)), options);
+        try {
+            return analyzeSentimentBatch(
+                mapByIndex(documents, (index, value) -> {
+                    final TextDocumentInput textDocumentInput = new TextDocumentInput(index, value);
+                    textDocumentInput.setLanguage(language);
+                    return textDocumentInput;
+                }), options);
+        } catch (RuntimeException ex) {
+            return new TextAnalyticsPagedFlux<>(() -> (continuationToken, pageSize) -> fluxError(logger, ex));
+        }
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClient.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClient.java
index b22949a496c0..0856a72f4bd8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClient.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClient.java
@@ -5,13 +5,16 @@
 
 import com.azure.ai.textanalytics.models.AnalyzeSentimentResult;
 import com.azure.ai.textanalytics.models.CategorizedEntity;
+import com.azure.ai.textanalytics.models.CategorizedEntityCollection;
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
+import com.azure.ai.textanalytics.models.KeyPhrasesCollection;
 import com.azure.ai.textanalytics.models.LinkedEntity;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.LinkedEntityCollection;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsError;
 import com.azure.ai.textanalytics.models.TextAnalyticsException;
@@ -23,6 +26,10 @@
 import com.azure.core.annotation.ServiceMethod;
 import com.azure.core.util.Context;
 
+import java.util.Objects;
+
+import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+
 /**
  * This class provides a synchronous client that contains all the operations that apply to Azure Text Analytics.
  * Operations allowed by the client are language detection, entities recognition, linked entities recognition,
@@ -67,15 +74,6 @@ public String getDefaultLanguage() {
         return client.getDefaultLanguage();
     }
 
-    /**
-     * Gets the service version the client is using.
-     *
-     * @return The service version the client is using.
-     */
-    public TextAnalyticsServiceVersion getServiceVersion() {
-        return client.getServiceVersion();
-    }
-
     /**
      * Returns the detected language and a confidence score between zero and one. Scores close to one indicate 100%
      * certainty that the identified language is true.
@@ -144,9 +142,11 @@ public DetectedLanguage detectLanguage(String document, String countryHint) {
      * {@link DetectLanguageResult detected language document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(Iterable<String> documents) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.detectLanguageBatch(documents));
     }
 
@@ -168,10 +168,12 @@ public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(Iter
      * {@link DetectLanguageResult detected language document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
         Iterable<String> documents, String countryHint) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.detectLanguageBatch(documents, countryHint));
     }
 
@@ -195,10 +197,12 @@ public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
      * {@link DetectLanguageResult detected language document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
         Iterable<String> documents, String countryHint, TextAnalyticsRequestOptions options) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.detectLanguageBatch(documents, countryHint, options));
     }
 
@@ -221,10 +225,12 @@ public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
      * {@link DetectLanguageResult detected language document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
         Iterable<DetectLanguageInput> documents, TextAnalyticsRequestOptions options, Context context) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(
             client.detectLanguageAsyncClient.detectLanguageBatchWithContext(documents, options, context));
     }
@@ -247,14 +253,14 @@ public TextAnalyticsPagedIterable<DetectLanguageResult> detectLanguageBatch(
      * For text length limits, maximum batch size, and supported text encoding, see
      * <a href="https://docs.microsoft.com/azure/cognitive-services/text-analytics/overview#data-limits">data limits</a>.
      *
-     * @return A {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link CategorizedEntity recognized categorized entities}.
+     * @return A {@link CategorizedEntityCollection} contains a list of
+     * {@link CategorizedEntity recognized categorized entities} and warnings.
      *
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntities(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public CategorizedEntityCollection recognizeEntities(String document) {
         return recognizeEntities(document, client.getDefaultLanguage());
     }
 
@@ -273,15 +279,16 @@ public TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntities(String do
      * <a href="https://docs.microsoft.com/azure/cognitive-services/text-analytics/overview#data-limits">data limits</a>.
      * @param language The 2 letter ISO 639-1 representation of language. If not set, uses "en" for English as default.
      *
-     * @return The {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link CategorizedEntity recognized categorized entities}.
+     * @return The {@link CategorizedEntityCollection} contains a list of
+     * {@link CategorizedEntity recognized categorized entities} and warnings.
      *
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntities(String document, String language) {
-        return new TextAnalyticsPagedIterable<>(client.recognizeEntities(document, language));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public CategorizedEntityCollection recognizeEntities(String document, String language) {
+        Objects.requireNonNull(document, "'document' cannot be null.");
+        return client.recognizeEntities(document, language).block();
     }
 
     /**
@@ -300,13 +307,14 @@ public TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntities(String do
      * <a href="https://docs.microsoft.com/azure/cognitive-services/text-analytics/overview#data-limits">data limits</a>.
      *
      * @return The {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
-        Iterable<String> documents) {
+    public TextAnalyticsPagedIterable<RecognizeEntitiesResult> recognizeEntitiesBatch(Iterable<String> documents) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.recognizeEntitiesBatch(documents));
     }
 
@@ -323,13 +331,15 @@ public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeE
      * @param language The 2 letter ISO 639-1 representation of language. If not set, uses "en" for English as default.
      *
      * @return The {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedIterable<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<String> documents, String language) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.recognizeEntitiesBatch(documents, language));
     }
 
@@ -349,15 +359,16 @@ public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeE
      * and show statistics.
      *
      * @return The {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedIterable<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
-        return new TextAnalyticsPagedIterable<>(
-            client.recognizeEntitiesBatch(documents, language, options));
+        inputDocumentsValidation(documents);
+        return new TextAnalyticsPagedIterable<>(client.recognizeEntitiesBatch(documents, language, options));
     }
 
     /**
@@ -377,16 +388,17 @@ public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeE
      * @param context Additional context that is passed through the Http pipeline during the service call.
      *
      * @return The {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link RecognizeCategorizedEntitiesResult recognized categorized entities document result}.
+     * {@link RecognizeEntitiesResult recognized categorized entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeEntitiesBatch(
+    public TextAnalyticsPagedIterable<RecognizeEntitiesResult> recognizeEntitiesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(
-            client.recognizeEntityAsyncClient.recognizeEntitiesBatchWithContext(documents, options,
-                context));
+            client.recognizeEntityAsyncClient.recognizeEntitiesBatchWithContext(documents, options, context));
     }
 
     // Linked Entities
@@ -406,14 +418,13 @@ public TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> recognizeE
      * For text length limits, maximum batch size, and supported text encoding, see
      * <a href="https://docs.microsoft.com/azure/cognitive-services/text-analytics/overview#data-limits">data limits</a>.
      *
-     * @return A {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link LinkedEntity recognized linked entities}.
+     * @return A {@link LinkedEntityCollection} contains a list of {@link LinkedEntity recognized linked entities}.
      *
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<LinkedEntity> recognizeLinkedEntities(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public LinkedEntityCollection recognizeLinkedEntities(String document) {
         return recognizeLinkedEntities(document, client.getDefaultLanguage());
     }
 
@@ -433,15 +444,15 @@ public TextAnalyticsPagedIterable<LinkedEntity> recognizeLinkedEntities(String d
      * @param language The 2 letter ISO 639-1 representation of language for the document. If not set, uses "en" for
      * English as default.
      *
-     * @return A {@link TextAnalyticsPagedIterable} contains a list of
-     * {@link LinkedEntity recognized linked entities}.
+     * @return A {@link LinkedEntityCollection} contains a list of {@link LinkedEntity recognized linked entities}.
      *
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<LinkedEntity> recognizeLinkedEntities(String document, String language) {
-        return new TextAnalyticsPagedIterable<>(client.recognizeLinkedEntities(document, language));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public LinkedEntityCollection recognizeLinkedEntities(String document, String language) {
+        Objects.requireNonNull(document, "'document' cannot be null.");
+        return client.recognizeLinkedEntities(document, language).block();
     }
 
     /**
@@ -464,10 +475,12 @@ public TextAnalyticsPagedIterable<LinkedEntity> recognizeLinkedEntities(String d
      * {@link LinkedEntity recognized linked entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<String> documents) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.recognizeLinkedEntitiesBatch(documents));
     }
 
@@ -492,10 +505,12 @@ public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinked
      * {@link LinkedEntity recognized linked entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<String> documents, String language) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.recognizeLinkedEntitiesBatch(documents, language));
     }
 
@@ -522,10 +537,12 @@ public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinked
      * {@link LinkedEntity recognized linked entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.recognizeLinkedEntitiesBatch(documents, language, options));
     }
 
@@ -551,10 +568,12 @@ public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinked
      * {@link LinkedEntity recognized linked entities document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(
             client.recognizeLinkedEntityAsyncClient.recognizeLinkedEntitiesBatchWithContext(
                 documents, options, context));
@@ -581,8 +600,8 @@ public TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> recognizeLinked
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<String> extractKeyPhrases(String document) {
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public KeyPhrasesCollection extractKeyPhrases(String document) {
         return extractKeyPhrases(document, client.getDefaultLanguage());
     }
 
@@ -605,9 +624,10 @@ public TextAnalyticsPagedIterable<String> extractKeyPhrases(String document) {
      * @throws NullPointerException if {@code document} is {@code null}.
      * @throws TextAnalyticsException if the response returned with an {@link TextAnalyticsError error}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public TextAnalyticsPagedIterable<String> extractKeyPhrases(String document, String language) {
-        return new TextAnalyticsPagedIterable<>(client.extractKeyPhrases(document, language));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public KeyPhrasesCollection extractKeyPhrases(String document, String language) {
+        Objects.requireNonNull(document, "'document' cannot be null.");
+        return client.extractKeyPhrases(document, language).block();
     }
 
     /**
@@ -629,9 +649,11 @@ public TextAnalyticsPagedIterable<String> extractKeyPhrases(String document, Str
      * {@link ExtractKeyPhraseResult extracted key phrases document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch(Iterable<String> documents) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.extractKeyPhrasesBatch(documents));
     }
 
@@ -654,10 +676,12 @@ public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch
      * {@link ExtractKeyPhraseResult extracted key phrases document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
         Iterable<String> documents, String language) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.extractKeyPhrasesBatch(documents, language));
     }
 
@@ -683,10 +707,12 @@ public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch
      * {@link ExtractKeyPhraseResult extracted key phrases document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.extractKeyPhrasesBatch(documents, language, options));
     }
 
@@ -711,10 +737,12 @@ public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch
      * {@link ExtractKeyPhraseResult extracted key phrases document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<ExtractKeyPhraseResult> extractKeyPhrasesBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(
             client.extractKeyPhraseAsyncClient.extractKeyPhrasesBatchWithContext(documents, options, context));
     }
@@ -767,6 +795,7 @@ public DocumentSentiment analyzeSentiment(String document) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public DocumentSentiment analyzeSentiment(String document, String language) {
+        Objects.requireNonNull(document, "'document' cannot be null.");
         return client.analyzeSentiment(document, language).block();
     }
 
@@ -790,9 +819,11 @@ public DocumentSentiment analyzeSentiment(String document, String language) {
      * {@link AnalyzeSentimentResult analyzed sentiment document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(Iterable<String> documents) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.analyzeSentimentBatch(documents));
     }
 
@@ -814,10 +845,12 @@ public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
      * {@link AnalyzeSentimentResult analyzed sentiment document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
         Iterable<String> documents, String language) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.analyzeSentimentBatch(documents, language));
     }
 
@@ -841,10 +874,12 @@ public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
      * {@link AnalyzeSentimentResult analyzed sentiment document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
         Iterable<String> documents, String language, TextAnalyticsRequestOptions options) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(client.analyzeSentimentBatch(documents, language, options));
     }
 
@@ -868,10 +903,12 @@ public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
      * {@link AnalyzeSentimentResult analyzed sentiment document result}.
      *
      * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public TextAnalyticsPagedIterable<AnalyzeSentimentResult> analyzeSentimentBatch(
         Iterable<TextDocumentInput> documents, TextAnalyticsRequestOptions options, Context context) {
+        inputDocumentsValidation(documents);
         return new TextAnalyticsPagedIterable<>(
             client.analyzeSentimentAsyncClient.analyzeSentimentBatchWithContext(documents, options, context));
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsServiceVersion.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsServiceVersion.java
index bb7b1a516842..0dff36a6128a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsServiceVersion.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsServiceVersion.java
@@ -9,7 +9,7 @@
  * The versions of Azure Text Analytics supported by this client library.
  */
 public enum TextAnalyticsServiceVersion implements ServiceVersion {
-    V3_0_preview_1("v3.0-preview.1");
+    V3_0("v3.0");
 
     private final String version;
 
@@ -31,7 +31,7 @@ public String getVersion() {
      * @return the latest {@link TextAnalyticsServiceVersion}
      */
     public static TextAnalyticsServiceVersion getLatest() {
-        return V3_0_preview_1;
+        return V3_0;
     }
 
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/Transforms.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/Transforms.java
index b88f1ab682c9..b611df351982 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/Transforms.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/Transforms.java
@@ -8,13 +8,12 @@
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageInput;
 import com.azure.ai.textanalytics.implementation.models.RequestStatistics;
 import com.azure.ai.textanalytics.implementation.models.TextAnalyticsError;
+import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
+import com.azure.ai.textanalytics.models.TextDocumentStatistics;
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.TextAnalyticsErrorCode;
 import com.azure.ai.textanalytics.models.TextAnalyticsException;
-import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
-import com.azure.ai.textanalytics.models.TextDocumentStatistics;
-import com.azure.core.util.logging.ClientLogger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +25,6 @@
  * Helper class to convert service level models to SDK exposes models.
  */
 final class Transforms {
-    private static final ClientLogger LOGGER = new ClientLogger(Transforms.class);
-
     private Transforms() {
     }
 
@@ -80,16 +77,16 @@ static TextDocumentBatchStatistics toBatchStatistics(RequestStatistics statistic
      */
     static com.azure.ai.textanalytics.models.TextAnalyticsError toTextAnalyticsError(
         TextAnalyticsError textAnalyticsError) {
-        if (textAnalyticsError.getInnerError() == null) {
+        if (textAnalyticsError.getInnererror() == null) {
             return new com.azure.ai.textanalytics.models.TextAnalyticsError(
                 TextAnalyticsErrorCode.fromString(textAnalyticsError.getCode().toString()),
                 textAnalyticsError.getMessage(),
                 textAnalyticsError.getTarget());
         }
         return new com.azure.ai.textanalytics.models.TextAnalyticsError(
-            TextAnalyticsErrorCode.fromString(textAnalyticsError.getInnerError().getCode().toString()),
-            textAnalyticsError.getInnerError().getMessage(),
-            textAnalyticsError.getInnerError().getTarget());
+            TextAnalyticsErrorCode.fromString(textAnalyticsError.getInnererror().getCode().toString()),
+            textAnalyticsError.getInnererror().getMessage(),
+            textAnalyticsError.getInnererror().getTarget());
     }
 
     /**
@@ -116,7 +113,7 @@ static List<MultiLanguageInput> toMultiLanguageInput(Iterable<TextDocumentInput>
      */
     static TextAnalyticsException toTextAnalyticsException(
         com.azure.ai.textanalytics.models.TextAnalyticsError error) {
-        return new TextAnalyticsException(error.getMessage(), error.getCode().toString(), error.getTarget());
+        return new TextAnalyticsException(error.getMessage(), error.getErrorCode().toString(), error.getTarget());
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/TextAnalyticsClientImpl.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/TextAnalyticsClientImpl.java
index 357d1f180e49..858589603bdc 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/TextAnalyticsClientImpl.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/TextAnalyticsClientImpl.java
@@ -11,6 +11,7 @@
 import com.azure.ai.textanalytics.implementation.models.LanguageResult;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
 import com.azure.ai.textanalytics.implementation.models.SentimentResponse;
+import com.azure.ai.textanalytics.implementation.models.TextAnalyticsErrorException;
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.ExpectedResponses;
 import com.azure.core.annotation.Host;
@@ -21,7 +22,6 @@
 import com.azure.core.annotation.ServiceInterface;
 import com.azure.core.annotation.ServiceMethod;
 import com.azure.core.annotation.UnexpectedResponseExceptionType;
-import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.CookiePolicy;
@@ -30,6 +30,7 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
 import reactor.core.publisher.Mono;
 
 /**
@@ -39,7 +40,7 @@ public final class TextAnalyticsClientImpl {
     /**
      * The proxy service used to perform REST calls.
      */
-    private TextAnalyticsClientService service;
+    private final TextAnalyticsClientService service;
 
     /**
      * Supported Cognitive Services endpoints (protocol and hostname, for example: https://westus.api.cognitive.microsoft.com).
@@ -48,7 +49,7 @@ public final class TextAnalyticsClientImpl {
 
     /**
      * Gets Supported Cognitive Services endpoints (protocol and hostname, for example: https://westus.api.cognitive.microsoft.com).
-     *
+     * 
      * @return the endpoint value.
      */
     public String getEndpoint() {
@@ -57,10 +58,11 @@ public String getEndpoint() {
 
     /**
      * Sets Supported Cognitive Services endpoints (protocol and hostname, for example: https://westus.api.cognitive.microsoft.com).
-     *
+     * 
      * @param endpoint the endpoint value.
+     * @return the service client itself.
      */
-    TextAnalyticsClientImpl setEndpoint(String endpoint) {
+    public TextAnalyticsClientImpl setEndpoint(String endpoint) {
         this.endpoint = endpoint;
         return this;
     }
@@ -68,11 +70,11 @@ TextAnalyticsClientImpl setEndpoint(String endpoint) {
     /**
      * The HTTP pipeline to send requests through.
      */
-    private HttpPipeline httpPipeline;
+    private final HttpPipeline httpPipeline;
 
     /**
      * Gets The HTTP pipeline to send requests through.
-     *
+     * 
      * @return the httpPipeline value.
      */
     public HttpPipeline getHttpPipeline() {
@@ -83,12 +85,12 @@ public HttpPipeline getHttpPipeline() {
      * Initializes an instance of TextAnalyticsClient client.
      */
     public TextAnalyticsClientImpl() {
-        new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build();
+        this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build());
     }
 
     /**
      * Initializes an instance of TextAnalyticsClient client.
-     *
+     * 
      * @param httpPipeline The HTTP pipeline to send requests through.
      */
     public TextAnalyticsClientImpl(HttpPipeline httpPipeline) {
@@ -100,229 +102,197 @@ public TextAnalyticsClientImpl(HttpPipeline httpPipeline) {
      * The interface defining all the services for TextAnalyticsClient to be
      * used by the proxy service to perform REST calls.
      */
-    @Host("{Endpoint}/text/analytics/v3.0-preview.1")
+    @Host("{Endpoint}/text/analytics/v3.0")
     @ServiceInterface(name = "TextAnalyticsClient")
     private interface TextAnalyticsClientService {
-        @Post("entities/recognition/general")
+        @Post("/entities/recognition/general")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneral(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput input, Context context);
+        @UnexpectedResponseExceptionType(TextAnalyticsErrorException.class)
+        Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneral(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json") MultiLanguageBatchInput input, Context context);
 
-        @Post("entities/recognition/pii")
+        @Post("/entities/linking")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionPii(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput input, Context context);
+        @UnexpectedResponseExceptionType(TextAnalyticsErrorException.class)
+        Mono<SimpleResponse<EntityLinkingResult>> entitiesLinking(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json") MultiLanguageBatchInput input, Context context);
 
-        @Post("entities/linking")
+        @Post("/keyPhrases")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<EntityLinkingResult>> entitiesLinking(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput input, Context context);
+        @UnexpectedResponseExceptionType(TextAnalyticsErrorException.class)
+        Mono<SimpleResponse<KeyPhraseResult>> keyPhrases(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json") MultiLanguageBatchInput input, Context context);
 
-        @Post("keyPhrases")
+        @Post("/languages")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<KeyPhraseResult>> keyPhrases(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput input, Context context);
+        @UnexpectedResponseExceptionType(TextAnalyticsErrorException.class)
+        Mono<SimpleResponse<LanguageResult>> languages(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json") LanguageBatchInput input, Context context);
 
-        @Post("languages")
+        @Post("/sentiment")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<LanguageResult>> languages(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") LanguageBatchInput input, Context context);
-
-        @Post("sentiment")
-        @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<SimpleResponse<SentimentResponse>> sentiment(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput input, Context context);
+        @UnexpectedResponseExceptionType(TextAnalyticsErrorException.class)
+        Mono<SimpleResponse<SentimentResponse>> sentiment(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json") MultiLanguageBatchInput input, Context context);
     }
 
     /**
-     * Named Entity Recognition
      * The API returns a list of general named entities in a given document. For the list of supported entity types, check &lt;a href="https://aka.ms/taner"&gt;Supported Entity Types in Text Analytics API&lt;/a&gt;. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
-     * @param context The context to associate with this operation.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
+     * @param showStats (Optional) if set to true, response will contain input and document level statistics.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneralWithRestResponseAsync(MultiLanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.entitiesRecognitionGeneral(this.getEndpoint(), modelVersion, showStats, input, context);
+    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneralWithResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats) {
+        return FluxUtil.withContext(context -> service.entitiesRecognitionGeneral(this.getEndpoint(), modelVersion, showStats, input, context));
     }
 
     /**
-     * Named Entity Recognition
      * The API returns a list of general named entities in a given document. For the list of supported entity types, check &lt;a href="https://aka.ms/taner"&gt;Supported Entity Types in Text Analytics API&lt;/a&gt;. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param context The context to associate with this operation.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneralWithRestResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
+    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionGeneralWithResponseAsync(MultiLanguageBatchInput input, Context context, String modelVersion, Boolean showStats) {
         return service.entitiesRecognitionGeneral(this.getEndpoint(), modelVersion, showStats, input, context);
     }
 
     /**
-     * Entities containing personal information
-     * The API returns a list of entities with personal information (\"SSN\", \"Bank Account\" etc) in the document. For the list of supported entity types, check &lt;a href="https://aka.ms/tanerpii"&gt;Supported Entity Types in Text Analytics API&lt;/a&gt;. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionPiiWithRestResponseAsync(MultiLanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.entitiesRecognitionPii(this.getEndpoint(), modelVersion, showStats, input, context);
-    }
-
-    /**
-     * Entities containing personal information
-     * The API returns a list of entities with personal information (\"SSN\", \"Bank Account\" etc) in the document. For the list of supported entity types, check &lt;a href="https://aka.ms/tanerpii"&gt;Supported Entity Types in Text Analytics API&lt;/a&gt;. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
+     * The API returns a list of recognized entities with links to a well-known knowledge base. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntitiesResult>> entitiesRecognitionPiiWithRestResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
-        return service.entitiesRecognitionPii(this.getEndpoint(), modelVersion, showStats, input, context);
+    public Mono<SimpleResponse<EntityLinkingResult>> entitiesLinkingWithResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats) {
+        return FluxUtil.withContext(context -> service.entitiesLinking(this.getEndpoint(), modelVersion, showStats, input, context));
     }
 
     /**
-     * Linked entities from a well-known knowledge base
      * The API returns a list of recognized entities with links to a well-known knowledge base. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
      * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntityLinkingResult>> entitiesLinkingWithRestResponseAsync(MultiLanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.entitiesLinking(this.getEndpoint(), modelVersion, showStats, input, context);
-    }
-
-    /**
-     * Linked entities from a well-known knowledge base
-     * The API returns a list of recognized entities with links to a well-known knowledge base. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<EntityLinkingResult>> entitiesLinkingWithRestResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
+    public Mono<SimpleResponse<EntityLinkingResult>> entitiesLinkingWithResponseAsync(MultiLanguageBatchInput input, Context context, String modelVersion, Boolean showStats) {
         return service.entitiesLinking(this.getEndpoint(), modelVersion, showStats, input, context);
     }
 
     /**
-     * Key Phrases
      * The API returns a list of strings denoting the key phrases in the input text. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze. Documents can now contain a language field to indicate the text language.
-     * @param context The context to associate with this operation.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
+     * @param showStats (Optional) if set to true, response will contain input and document level statistics.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<KeyPhraseResult>> keyPhrasesWithRestResponseAsync(MultiLanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.keyPhrases(this.getEndpoint(), modelVersion, showStats, input, context);
+    public Mono<SimpleResponse<KeyPhraseResult>> keyPhrasesWithResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats) {
+        return FluxUtil.withContext(context -> service.keyPhrases(this.getEndpoint(), modelVersion, showStats, input, context));
     }
 
     /**
-     * Key Phrases
      * The API returns a list of strings denoting the key phrases in the input text. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze. Documents can now contain a language field to indicate the text language.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param context The context to associate with this operation.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<KeyPhraseResult>> keyPhrasesWithRestResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
+    public Mono<SimpleResponse<KeyPhraseResult>> keyPhrasesWithResponseAsync(MultiLanguageBatchInput input, Context context, String modelVersion, Boolean showStats) {
         return service.keyPhrases(this.getEndpoint(), modelVersion, showStats, input, context);
     }
 
     /**
-     * Detect Language
      * The API returns the detected language and a numeric score between 0 and 1. Scores close to 1 indicate 100% certainty that the identified language is true. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
+     * 
      * @param input Collection of documents to analyze.
-     * @param context The context to associate with this operation.
+     * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
+     * @param showStats (Optional) if set to true, response will contain input and document level statistics.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<LanguageResult>> languagesWithRestResponseAsync(LanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.languages(this.getEndpoint(), modelVersion, showStats, input, context);
+    public Mono<SimpleResponse<LanguageResult>> languagesWithResponseAsync(LanguageBatchInput input, String modelVersion, Boolean showStats) {
+        return FluxUtil.withContext(context -> service.languages(this.getEndpoint(), modelVersion, showStats, input, context));
     }
 
     /**
-     * Detect Language
      * The API returns the detected language and a numeric score between 0 and 1. Scores close to 1 indicate 100% certainty that the identified language is true. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
+     * 
      * @param input Collection of documents to analyze.
+     * @param context The context to associate with this operation.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<LanguageResult>> languagesWithRestResponseAsync(LanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
+    public Mono<SimpleResponse<LanguageResult>> languagesWithResponseAsync(LanguageBatchInput input, Context context, String modelVersion, Boolean showStats) {
         return service.languages(this.getEndpoint(), modelVersion, showStats, input, context);
     }
 
     /**
-     * Sentiment
      * The API returns a sentiment prediction, as well as sentiment scores for each sentiment class (Positive, Negative, and Neutral) for the document and each sentence within it. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
-     * @param context The context to associate with this operation.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
+     * @param showStats (Optional) if set to true, response will contain input and document level statistics.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<SentimentResponse>> sentimentWithRestResponseAsync(MultiLanguageBatchInput input, Context context) {
-        final String modelVersion = null;
-        final Boolean showStats = null;
-        return service.sentiment(this.getEndpoint(), modelVersion, showStats, input, context);
+    public Mono<SimpleResponse<SentimentResponse>> sentimentWithResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats) {
+        return FluxUtil.withContext(context -> service.sentiment(this.getEndpoint(), modelVersion, showStats, input, context));
     }
 
     /**
-     * Sentiment
      * The API returns a sentiment prediction, as well as sentiment scores for each sentiment class (Positive, Negative, and Neutral) for the document and each sentence within it. See the &lt;a href="https://aka.ms/talangs"&gt;Supported languages in Text Analytics API&lt;/a&gt; for the list of enabled languages.
-     *
-     * @param input Collection of documents to analyze.
+     * 
+     * @param input Contains a set of input documents to be analyzed by the service.
+     * @param context The context to associate with this operation.
      * @param modelVersion (Optional) This value indicates which model will be used for scoring. If a model-version is not specified, the API should default to the latest, non-preview version.
      * @param showStats (Optional) if set to true, response will contain input and document level statistics.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @return a Mono which performs the network request upon subscription.
+     * @throws TextAnalyticsErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SimpleResponse<SentimentResponse>> sentimentWithRestResponseAsync(MultiLanguageBatchInput input, String modelVersion, Boolean showStats, Context context) {
+    public Mono<SimpleResponse<SentimentResponse>> sentimentWithResponseAsync(MultiLanguageBatchInput input, Context context, String modelVersion, Boolean showStats) {
         return service.sentiment(this.getEndpoint(), modelVersion, showStats, input, context);
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
new file mode 100644
index 000000000000..2714e03582d0
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.implementation;
+
+import com.azure.ai.textanalytics.implementation.models.TextAnalyticsErrorException;
+import com.azure.core.exception.HttpResponseException;
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpResponse;
+import com.azure.core.http.rest.SimpleResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.Objects;
+
+/**
+ * Utility method class.
+ */
+public final class Utility {
+    private Utility() {
+    }
+
+    /**
+     * Verify that list of documents are not null or empty. Otherwise, throw exception.
+     *
+     * @param documents A list of documents.
+     *
+     * @throws NullPointerException if {@code documents} is {@code null}.
+     * @throws IllegalArgumentException if {@code documents} is empty.
+     */
+    public static void inputDocumentsValidation(Iterable<?> documents) {
+        Objects.requireNonNull(documents, "'documents' cannot be null.");
+        final Iterator<?> iterator = documents.iterator();
+        if (!iterator.hasNext()) {
+            throw new IllegalArgumentException("'documents' cannot be empty.");
+        }
+    }
+
+    /**
+     * Get a mock {@link HttpResponse} that only return status code 400.
+     *
+     * @param response A {@link SimpleResponse} with any type
+     * @return A mock {@link HttpResponse} that only return status code 400.
+     */
+    public static HttpResponse getEmptyErrorIdHttpResponse(SimpleResponse<?> response) {
+        return new HttpResponse(response.getRequest()) {
+            @Override
+            public int getStatusCode() {
+                return 400;
+            }
+
+            @Override
+            public String getHeaderValue(String s) {
+                return null;
+            }
+
+            @Override
+            public HttpHeaders getHeaders() {
+                return null;
+            }
+
+            @Override
+            public Flux<ByteBuffer> getBody() {
+                return null;
+            }
+
+            @Override
+            public Mono<byte[]> getBodyAsByteArray() {
+                return null;
+            }
+
+            @Override
+            public Mono<String> getBodyAsString() {
+                return null;
+            }
+
+            @Override
+            public Mono<String> getBodyAsString(Charset charset) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Mapping a {@link TextAnalyticsErrorException} to {@link HttpResponseException} if exist. Otherwise, return
+     * original {@link Throwable}.
+     *
+     * @param throwable A {@link Throwable}.
+     * @return A {@link HttpResponseException} or the original throwable type.
+     */
+    public static Throwable mapToHttpResponseExceptionIfExist(Throwable throwable) {
+        if (throwable instanceof TextAnalyticsErrorException) {
+            TextAnalyticsErrorException errorException = (TextAnalyticsErrorException) throwable;
+            return new HttpResponseException(errorException.getMessage(), errorException.getResponse());
+        }
+        return throwable;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DetectedLanguage.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DetectedLanguage.java
index 5eec388b2d15..bd031227091f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DetectedLanguage.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DetectedLanguage.java
@@ -29,13 +29,13 @@ public final class DetectedLanguage {
      * A confidence score between 0 and 1. Scores close to 1 indicate 100%
      * certainty that the identified language is true.
      */
-    @JsonProperty(value = "score", required = true)
-    private double score;
+    @JsonProperty(value = "confidenceScore", required = true)
+    private double confidenceScore;
 
     /**
      * Get the name property: Long name of a detected language (e.g. English,
      * French).
-     *
+     * 
      * @return the name value.
      */
     public String getName() {
@@ -45,7 +45,7 @@ public String getName() {
     /**
      * Set the name property: Long name of a detected language (e.g. English,
      * French).
-     *
+     * 
      * @param name the name value to set.
      * @return the DetectedLanguage object itself.
      */
@@ -57,7 +57,7 @@ public DetectedLanguage setName(String name) {
     /**
      * Get the iso6391Name property: A two letter representation of the
      * detected language according to the ISO 639-1 standard (e.g. en, fr).
-     *
+     * 
      * @return the iso6391Name value.
      */
     public String getIso6391Name() {
@@ -67,7 +67,7 @@ public String getIso6391Name() {
     /**
      * Set the iso6391Name property: A two letter representation of the
      * detected language according to the ISO 639-1 standard (e.g. en, fr).
-     *
+     * 
      * @param iso6391Name the iso6391Name value to set.
      * @return the DetectedLanguage object itself.
      */
@@ -77,24 +77,26 @@ public DetectedLanguage setIso6391Name(String iso6391Name) {
     }
 
     /**
-     * Get the score property: A confidence score between 0 and 1. Scores close
-     * to 1 indicate 100% certainty that the identified language is true.
-     *
-     * @return the score value.
+     * Get the confidenceScore property: A confidence score between 0 and 1.
+     * Scores close to 1 indicate 100% certainty that the identified language
+     * is true.
+     * 
+     * @return the confidenceScore value.
      */
-    public double getScore() {
-        return this.score;
+    public double getConfidenceScore() {
+        return this.confidenceScore;
     }
 
     /**
-     * Set the score property: A confidence score between 0 and 1. Scores close
-     * to 1 indicate 100% certainty that the identified language is true.
-     *
-     * @param score the score value to set.
+     * Set the confidenceScore property: A confidence score between 0 and 1.
+     * Scores close to 1 indicate 100% certainty that the identified language
+     * is true.
+     * 
+     * @param confidenceScore the confidenceScore value to set.
      * @return the DetectedLanguage object itself.
      */
-    public DetectedLanguage setScore(double score) {
-        this.score = score;
+    public DetectedLanguage setConfidenceScore(double confidenceScore) {
+        this.confidenceScore = confidenceScore;
         return this;
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentEntities.java
index dffd817a1919..dd1637927928 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentEntities.java
@@ -25,6 +25,12 @@ public final class DocumentEntities {
     @JsonProperty(value = "entities", required = true)
     private List<Entity> entities;
 
+    /*
+     * Warnings encountered while processing document.
+     */
+    @JsonProperty(value = "warnings", required = true)
+    private List<TextAnalyticsWarning> warnings;
+
     /*
      * if showStats=true was specified in the request this field will contain
      * information about the document payload.
@@ -34,7 +40,7 @@ public final class DocumentEntities {
 
     /**
      * Get the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -43,7 +49,7 @@ public String getId() {
 
     /**
      * Set the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the DocumentEntities object itself.
      */
@@ -54,7 +60,7 @@ public DocumentEntities setId(String id) {
 
     /**
      * Get the entities property: Recognized entities in the document.
-     *
+     * 
      * @return the entities value.
      */
     public List<Entity> getEntities() {
@@ -63,7 +69,7 @@ public List<Entity> getEntities() {
 
     /**
      * Set the entities property: Recognized entities in the document.
-     *
+     * 
      * @param entities the entities value to set.
      * @return the DocumentEntities object itself.
      */
@@ -72,10 +78,32 @@ public DocumentEntities setEntities(List<Entity> entities) {
         return this;
     }
 
+    /**
+     * Get the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @return the warnings value.
+     */
+    public List<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+
+    /**
+     * Set the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @param warnings the warnings value to set.
+     * @return the DocumentEntities object itself.
+     */
+    public DocumentEntities setWarnings(List<TextAnalyticsWarning> warnings) {
+        this.warnings = warnings;
+        return this;
+    }
+
     /**
      * Get the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @return the statistics value.
      */
     public DocumentStatistics getStatistics() {
@@ -85,7 +113,7 @@ public DocumentStatistics getStatistics() {
     /**
      * Set the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @param statistics the statistics value to set.
      * @return the DocumentEntities object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentError.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentError.java
index 7813edbe60a9..7d1ac563e085 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentError.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentError.java
@@ -26,7 +26,7 @@ public final class DocumentError {
 
     /**
      * Get the id property: Document Id.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -35,7 +35,7 @@ public String getId() {
 
     /**
      * Set the id property: Document Id.
-     *
+     * 
      * @param id the id value to set.
      * @return the DocumentError object itself.
      */
@@ -46,7 +46,7 @@ public DocumentError setId(String id) {
 
     /**
      * Get the error property: Document Error.
-     *
+     * 
      * @return the error value.
      */
     public TextAnalyticsError getError() {
@@ -55,7 +55,7 @@ public TextAnalyticsError getError() {
 
     /**
      * Set the error property: Document Error.
-     *
+     * 
      * @param error the error value to set.
      * @return the DocumentError object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentKeyPhrases.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentKeyPhrases.java
index e7def8e817f2..98c442b0fe7d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentKeyPhrases.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentKeyPhrases.java
@@ -26,6 +26,12 @@ public final class DocumentKeyPhrases {
     @JsonProperty(value = "keyPhrases", required = true)
     private List<String> keyPhrases;
 
+    /*
+     * Warnings encountered while processing document.
+     */
+    @JsonProperty(value = "warnings", required = true)
+    private List<TextAnalyticsWarning> warnings;
+
     /*
      * if showStats=true was specified in the request this field will contain
      * information about the document payload.
@@ -35,7 +41,7 @@ public final class DocumentKeyPhrases {
 
     /**
      * Get the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -44,7 +50,7 @@ public String getId() {
 
     /**
      * Set the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the DocumentKeyPhrases object itself.
      */
@@ -57,7 +63,7 @@ public DocumentKeyPhrases setId(String id) {
      * Get the keyPhrases property: A list of representative words or phrases.
      * The number of key phrases returned is proportional to the number of
      * words in the input document.
-     *
+     * 
      * @return the keyPhrases value.
      */
     public List<String> getKeyPhrases() {
@@ -68,7 +74,7 @@ public List<String> getKeyPhrases() {
      * Set the keyPhrases property: A list of representative words or phrases.
      * The number of key phrases returned is proportional to the number of
      * words in the input document.
-     *
+     * 
      * @param keyPhrases the keyPhrases value to set.
      * @return the DocumentKeyPhrases object itself.
      */
@@ -77,10 +83,32 @@ public DocumentKeyPhrases setKeyPhrases(List<String> keyPhrases) {
         return this;
     }
 
+    /**
+     * Get the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @return the warnings value.
+     */
+    public List<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+
+    /**
+     * Set the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @param warnings the warnings value to set.
+     * @return the DocumentKeyPhrases object itself.
+     */
+    public DocumentKeyPhrases setWarnings(List<TextAnalyticsWarning> warnings) {
+        this.warnings = warnings;
+        return this;
+    }
+
     /**
      * Get the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @return the statistics value.
      */
     public DocumentStatistics getStatistics() {
@@ -90,7 +118,7 @@ public DocumentStatistics getStatistics() {
     /**
      * Set the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @param statistics the statistics value to set.
      * @return the DocumentKeyPhrases object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLanguage.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLanguage.java
index 588292564911..80fa6fb3efab 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLanguage.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLanguage.java
@@ -20,10 +20,16 @@ public final class DocumentLanguage {
     private String id;
 
     /*
-     * A list of extracted languages.
+     * Detected Language.
      */
-    @JsonProperty(value = "detectedLanguages", required = true)
-    private List<DetectedLanguage> detectedLanguages;
+    @JsonProperty(value = "detectedLanguage", required = true)
+    private DetectedLanguage detectedLanguage;
+
+    /*
+     * Warnings encountered while processing document.
+     */
+    @JsonProperty(value = "warnings", required = true)
+    private List<TextAnalyticsWarning> warnings;
 
     /*
      * if showStats=true was specified in the request this field will contain
@@ -53,22 +59,44 @@ public DocumentLanguage setId(String id) {
     }
 
     /**
-     * Get the detectedLanguages property: A list of extracted languages.
+     * Get the detectedLanguage property: Detected Language.
+     *
+     * @return the detectedLanguage value.
+     */
+    public DetectedLanguage getDetectedLanguage() {
+        return this.detectedLanguage;
+    }
+
+    /**
+     * Set the detectedLanguage property: Detected Language.
+     *
+     * @param detectedLanguage the detectedLanguage value to set.
+     * @return the DocumentLanguage object itself.
+     */
+    public DocumentLanguage setDetectedLanguage(DetectedLanguage detectedLanguage) {
+        this.detectedLanguage = detectedLanguage;
+        return this;
+    }
+
+    /**
+     * Get the warnings property: Warnings encountered while processing
+     * document.
      *
-     * @return the detectedLanguages value.
+     * @return the warnings value.
      */
-    public List<DetectedLanguage> getDetectedLanguages() {
-        return this.detectedLanguages;
+    public List<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
     }
 
     /**
-     * Set the detectedLanguages property: A list of extracted languages.
+     * Set the warnings property: Warnings encountered while processing
+     * document.
      *
-     * @param detectedLanguages the detectedLanguages value to set.
+     * @param warnings the warnings value to set.
      * @return the DocumentLanguage object itself.
      */
-    public DocumentLanguage setDetectedLanguages(List<DetectedLanguage> detectedLanguages) {
-        this.detectedLanguages = detectedLanguages;
+    public DocumentLanguage setWarnings(List<TextAnalyticsWarning> warnings) {
+        this.warnings = warnings;
         return this;
     }
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLinkedEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLinkedEntities.java
index f3345e8d3cc9..c6c548e484b8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLinkedEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentLinkedEntities.java
@@ -25,6 +25,12 @@ public final class DocumentLinkedEntities {
     @JsonProperty(value = "entities", required = true)
     private List<LinkedEntity> entities;
 
+    /*
+     * Warnings encountered while processing document.
+     */
+    @JsonProperty(value = "warnings", required = true)
+    private List<TextAnalyticsWarning> warnings;
+
     /*
      * if showStats=true was specified in the request this field will contain
      * information about the document payload.
@@ -34,7 +40,7 @@ public final class DocumentLinkedEntities {
 
     /**
      * Get the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -43,7 +49,7 @@ public String getId() {
 
     /**
      * Set the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the DocumentLinkedEntities object itself.
      */
@@ -55,7 +61,7 @@ public DocumentLinkedEntities setId(String id) {
     /**
      * Get the entities property: Recognized well-known entities in the
      * document.
-     *
+     * 
      * @return the entities value.
      */
     public List<LinkedEntity> getEntities() {
@@ -65,7 +71,7 @@ public List<LinkedEntity> getEntities() {
     /**
      * Set the entities property: Recognized well-known entities in the
      * document.
-     *
+     * 
      * @param entities the entities value to set.
      * @return the DocumentLinkedEntities object itself.
      */
@@ -74,10 +80,32 @@ public DocumentLinkedEntities setEntities(List<LinkedEntity> entities) {
         return this;
     }
 
+    /**
+     * Get the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @return the warnings value.
+     */
+    public List<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+
+    /**
+     * Set the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @param warnings the warnings value to set.
+     * @return the DocumentLinkedEntities object itself.
+     */
+    public DocumentLinkedEntities setWarnings(List<TextAnalyticsWarning> warnings) {
+        this.warnings = warnings;
+        return this;
+    }
+
     /**
      * Get the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @return the statistics value.
      */
     public DocumentStatistics getStatistics() {
@@ -87,7 +115,7 @@ public DocumentStatistics getStatistics() {
     /**
      * Set the statistics property: if showStats=true was specified in the
      * request this field will contain information about the document payload.
-     *
+     * 
      * @param statistics the statistics value to set.
      * @return the DocumentLinkedEntities object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentiment.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentiment.java
index a02c8fabadc3..80d62cfe0082 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentiment.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentiment.java
@@ -21,14 +21,14 @@ public final class DocumentSentiment {
 
     /*
      * Predicted sentiment for document (Negative, Neutral, Positive, or
-     * Mixed). Possible values include: 'positive', 'neutral', 'negative',
-     * 'mixed'
+     * Mixed).
      */
     @JsonProperty(value = "sentiment", required = true)
     private DocumentSentimentValue sentiment;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the document payload.
      */
     @JsonProperty(value = "statistics")
     private DocumentStatistics statistics;
@@ -37,8 +37,8 @@ public final class DocumentSentiment {
      * Document level sentiment confidence scores between 0 and 1 for each
      * sentiment class.
      */
-    @JsonProperty(value = "documentScores", required = true)
-    private SentimentConfidenceScorePerLabel documentScores;
+    @JsonProperty(value = "confidenceScores", required = true)
+    private SentimentConfidenceScorePerLabel confidenceScores;
 
     /*
      * Sentence level sentiment analysis.
@@ -46,9 +46,15 @@ public final class DocumentSentiment {
     @JsonProperty(value = "sentences", required = true)
     private List<SentenceSentiment> sentences;
 
+    /*
+     * Warnings encountered while processing document.
+     */
+    @JsonProperty(value = "warnings", required = true)
+    private List<TextAnalyticsWarning> warnings;
+
     /**
      * Get the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -57,7 +63,7 @@ public String getId() {
 
     /**
      * Set the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the DocumentSentiment object itself.
      */
@@ -68,9 +74,8 @@ public DocumentSentiment setId(String id) {
 
     /**
      * Get the sentiment property: Predicted sentiment for document (Negative,
-     * Neutral, Positive, or Mixed). Possible values include: 'positive',
-     * 'neutral', 'negative', 'mixed'.
-     *
+     * Neutral, Positive, or Mixed).
+     * 
      * @return the sentiment value.
      */
     public DocumentSentimentValue getSentiment() {
@@ -79,9 +84,8 @@ public DocumentSentimentValue getSentiment() {
 
     /**
      * Set the sentiment property: Predicted sentiment for document (Negative,
-     * Neutral, Positive, or Mixed). Possible values include: 'positive',
-     * 'neutral', 'negative', 'mixed'.
-     *
+     * Neutral, Positive, or Mixed).
+     * 
      * @param sentiment the sentiment value to set.
      * @return the DocumentSentiment object itself.
      */
@@ -91,8 +95,9 @@ public DocumentSentiment setSentiment(DocumentSentimentValue sentiment) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the document payload.
+     * 
      * @return the statistics value.
      */
     public DocumentStatistics getStatistics() {
@@ -100,8 +105,9 @@ public DocumentStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the document payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the DocumentSentiment object itself.
      */
@@ -111,30 +117,30 @@ public DocumentSentiment setStatistics(DocumentStatistics statistics) {
     }
 
     /**
-     * Get the documentScores property: Document level sentiment confidence
+     * Get the confidenceScores property: Document level sentiment confidence
      * scores between 0 and 1 for each sentiment class.
-     *
-     * @return the documentScores value.
+     * 
+     * @return the confidenceScores value.
      */
-    public SentimentConfidenceScorePerLabel getDocumentScores() {
-        return this.documentScores;
+    public SentimentConfidenceScorePerLabel getConfidenceScores() {
+        return this.confidenceScores;
     }
 
     /**
-     * Set the documentScores property: Document level sentiment confidence
+     * Set the confidenceScores property: Document level sentiment confidence
      * scores between 0 and 1 for each sentiment class.
-     *
-     * @param documentScores the documentScores value to set.
+     * 
+     * @param confidenceScores the confidenceScores value to set.
      * @return the DocumentSentiment object itself.
      */
-    public DocumentSentiment setDocumentScores(SentimentConfidenceScorePerLabel documentScores) {
-        this.documentScores = documentScores;
+    public DocumentSentiment setConfidenceScores(SentimentConfidenceScorePerLabel confidenceScores) {
+        this.confidenceScores = confidenceScores;
         return this;
     }
 
     /**
      * Get the sentences property: Sentence level sentiment analysis.
-     *
+     * 
      * @return the sentences value.
      */
     public List<SentenceSentiment> getSentences() {
@@ -143,7 +149,7 @@ public List<SentenceSentiment> getSentences() {
 
     /**
      * Set the sentences property: Sentence level sentiment analysis.
-     *
+     * 
      * @param sentences the sentences value to set.
      * @return the DocumentSentiment object itself.
      */
@@ -151,4 +157,26 @@ public DocumentSentiment setSentences(List<SentenceSentiment> sentences) {
         this.sentences = sentences;
         return this;
     }
+
+    /**
+     * Get the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @return the warnings value.
+     */
+    public List<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+
+    /**
+     * Set the warnings property: Warnings encountered while processing
+     * document.
+     * 
+     * @param warnings the warnings value to set.
+     * @return the DocumentSentiment object itself.
+     */
+    public DocumentSentiment setWarnings(List<TextAnalyticsWarning> warnings) {
+        this.warnings = warnings;
+        return this;
+    }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentimentValue.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentimentValue.java
index 96af38b7ab1a..3348780b91a9 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentimentValue.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentSentimentValue.java
@@ -42,7 +42,7 @@ public enum DocumentSentimentValue {
 
     /**
      * Parses a serialized value to a DocumentSentimentValue instance.
-     *
+     * 
      * @param value the serialized value to parse.
      * @return the parsed DocumentSentimentValue object, or null if unable to parse.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentStatistics.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentStatistics.java
index 6dac964785f1..ef73e3f47e57 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentStatistics.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/DocumentStatistics.java
@@ -8,8 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * if showStats=true was specified in the request this field will contain
- * information about the document payload.
+ * The DocumentStatistics model.
  */
 @Fluent
 public final class DocumentStatistics {
@@ -28,7 +27,7 @@ public final class DocumentStatistics {
     /**
      * Get the charactersCount property: Number of text elements recognized in
      * the document.
-     *
+     * 
      * @return the charactersCount value.
      */
     public int getCharactersCount() {
@@ -38,7 +37,7 @@ public int getCharactersCount() {
     /**
      * Set the charactersCount property: Number of text elements recognized in
      * the document.
-     *
+     * 
      * @param charactersCount the charactersCount value to set.
      * @return the DocumentStatistics object itself.
      */
@@ -50,7 +49,7 @@ public DocumentStatistics setCharactersCount(int charactersCount) {
     /**
      * Get the transactionsCount property: Number of transactions for the
      * document.
-     *
+     * 
      * @return the transactionsCount value.
      */
     public int getTransactionsCount() {
@@ -60,7 +59,7 @@ public int getTransactionsCount() {
     /**
      * Set the transactionsCount property: Number of transactions for the
      * document.
-     *
+     * 
      * @param transactionsCount the transactionsCount value to set.
      * @return the DocumentStatistics object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntitiesResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntitiesResult.java
index e80597e11c8e..e103245b3c99 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntitiesResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntitiesResult.java
@@ -26,7 +26,8 @@ public final class EntitiesResult {
     private List<DocumentError> errors;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the request payload.
      */
     @JsonProperty(value = "statistics")
     private RequestStatistics statistics;
@@ -39,7 +40,7 @@ public final class EntitiesResult {
 
     /**
      * Get the documents property: Response by document.
-     *
+     * 
      * @return the documents value.
      */
     public List<DocumentEntities> getDocuments() {
@@ -48,7 +49,7 @@ public List<DocumentEntities> getDocuments() {
 
     /**
      * Set the documents property: Response by document.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the EntitiesResult object itself.
      */
@@ -59,7 +60,7 @@ public EntitiesResult setDocuments(List<DocumentEntities> documents) {
 
     /**
      * Get the errors property: Errors by document id.
-     *
+     * 
      * @return the errors value.
      */
     public List<DocumentError> getErrors() {
@@ -68,7 +69,7 @@ public List<DocumentError> getErrors() {
 
     /**
      * Set the errors property: Errors by document id.
-     *
+     * 
      * @param errors the errors value to set.
      * @return the EntitiesResult object itself.
      */
@@ -78,8 +79,9 @@ public EntitiesResult setErrors(List<DocumentError> errors) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @return the statistics value.
      */
     public RequestStatistics getStatistics() {
@@ -87,8 +89,9 @@ public RequestStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the EntitiesResult object itself.
      */
@@ -100,7 +103,7 @@ public EntitiesResult setStatistics(RequestStatistics statistics) {
     /**
      * Get the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @return the modelVersion value.
      */
     public String getModelVersion() {
@@ -110,7 +113,7 @@ public String getModelVersion() {
     /**
      * Set the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @param modelVersion the modelVersion value to set.
      * @return the EntitiesResult object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Entity.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Entity.java
index 1c781826bd9b..afb9da844ae3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Entity.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Entity.java
@@ -21,14 +21,14 @@ public final class Entity {
     /*
      * Entity type, such as Person/Location/Org/SSN etc
      */
-    @JsonProperty(value = "type", required = true)
-    private String type;
+    @JsonProperty(value = "category", required = true)
+    private String category;
 
     /*
      * Entity sub type, such as Age/Year/TimeRange etc
      */
-    @JsonProperty(value = "subtype")
-    private String subtype;
+    @JsonProperty(value = "subcategory")
+    private String subcategory;
 
     /*
      * Start position (in Unicode characters) for the entity text.
@@ -45,12 +45,12 @@ public final class Entity {
     /*
      * Confidence score between 0 and 1 of the extracted entity.
      */
-    @JsonProperty(value = "score", required = true)
-    private double score;
+    @JsonProperty(value = "confidenceScore", required = true)
+    private double confidenceScore;
 
     /**
      * Get the text property: Entity text as appears in the request.
-     *
+     * 
      * @return the text value.
      */
     public String getText() {
@@ -59,7 +59,7 @@ public String getText() {
 
     /**
      * Set the text property: Entity text as appears in the request.
-     *
+     * 
      * @param text the text value to set.
      * @return the Entity object itself.
      */
@@ -69,51 +69,53 @@ public Entity setText(String text) {
     }
 
     /**
-     * Get the type property: Entity type, such as Person/Location/Org/SSN etc.
-     *
-     * @return the type value.
+     * Get the category property: Entity type, such as Person/Location/Org/SSN
+     * etc.
+     * 
+     * @return the category value.
      */
-    public String getType() {
-        return this.type;
+    public String getCategory() {
+        return this.category;
     }
 
     /**
-     * Set the type property: Entity type, such as Person/Location/Org/SSN etc.
-     *
-     * @param type the type value to set.
+     * Set the category property: Entity type, such as Person/Location/Org/SSN
+     * etc.
+     * 
+     * @param category the category value to set.
      * @return the Entity object itself.
      */
-    public Entity setType(String type) {
-        this.type = type;
+    public Entity setCategory(String category) {
+        this.category = category;
         return this;
     }
 
     /**
-     * Get the subtype property: Entity sub type, such as Age/Year/TimeRange
-     * etc.
-     *
-     * @return the subtype value.
+     * Get the subcategory property: Entity sub type, such as
+     * Age/Year/TimeRange etc.
+     * 
+     * @return the subcategory value.
      */
-    public String getSubtype() {
-        return this.subtype;
+    public String getSubcategory() {
+        return this.subcategory;
     }
 
     /**
-     * Set the subtype property: Entity sub type, such as Age/Year/TimeRange
-     * etc.
-     *
-     * @param subtype the subtype value to set.
+     * Set the subcategory property: Entity sub type, such as
+     * Age/Year/TimeRange etc.
+     * 
+     * @param subcategory the subcategory value to set.
      * @return the Entity object itself.
      */
-    public Entity setSubtype(String subtype) {
-        this.subtype = subtype;
+    public Entity setSubcategory(String subcategory) {
+        this.subcategory = subcategory;
         return this;
     }
 
     /**
      * Get the offset property: Start position (in Unicode characters) for the
      * entity text.
-     *
+     * 
      * @return the offset value.
      */
     public int getOffset() {
@@ -123,7 +125,7 @@ public int getOffset() {
     /**
      * Set the offset property: Start position (in Unicode characters) for the
      * entity text.
-     *
+     * 
      * @param offset the offset value to set.
      * @return the Entity object itself.
      */
@@ -135,7 +137,7 @@ public Entity setOffset(int offset) {
     /**
      * Get the length property: Length (in Unicode characters) for the entity
      * text.
-     *
+     * 
      * @return the length value.
      */
     public int getLength() {
@@ -145,7 +147,7 @@ public int getLength() {
     /**
      * Set the length property: Length (in Unicode characters) for the entity
      * text.
-     *
+     * 
      * @param length the length value to set.
      * @return the Entity object itself.
      */
@@ -155,24 +157,24 @@ public Entity setLength(int length) {
     }
 
     /**
-     * Get the score property: Confidence score between 0 and 1 of the
-     * extracted entity.
-     *
-     * @return the score value.
+     * Get the confidenceScore property: Confidence score between 0 and 1 of
+     * the extracted entity.
+     * 
+     * @return the confidenceScore value.
      */
-    public double getScore() {
-        return this.score;
+    public double getConfidenceScore() {
+        return this.confidenceScore;
     }
 
     /**
-     * Set the score property: Confidence score between 0 and 1 of the
-     * extracted entity.
-     *
-     * @param score the score value to set.
+     * Set the confidenceScore property: Confidence score between 0 and 1 of
+     * the extracted entity.
+     * 
+     * @param confidenceScore the confidenceScore value to set.
      * @return the Entity object itself.
      */
-    public Entity setScore(double score) {
-        this.score = score;
+    public Entity setConfidenceScore(double confidenceScore) {
+        this.confidenceScore = confidenceScore;
         return this;
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntityLinkingResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntityLinkingResult.java
index 8c0d733e4b67..ffadfa03a118 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntityLinkingResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/EntityLinkingResult.java
@@ -26,7 +26,8 @@ public final class EntityLinkingResult {
     private List<DocumentError> errors;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the request payload.
      */
     @JsonProperty(value = "statistics")
     private RequestStatistics statistics;
@@ -39,7 +40,7 @@ public final class EntityLinkingResult {
 
     /**
      * Get the documents property: Response by document.
-     *
+     * 
      * @return the documents value.
      */
     public List<DocumentLinkedEntities> getDocuments() {
@@ -48,7 +49,7 @@ public List<DocumentLinkedEntities> getDocuments() {
 
     /**
      * Set the documents property: Response by document.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the EntityLinkingResult object itself.
      */
@@ -59,7 +60,7 @@ public EntityLinkingResult setDocuments(List<DocumentLinkedEntities> documents)
 
     /**
      * Get the errors property: Errors by document id.
-     *
+     * 
      * @return the errors value.
      */
     public List<DocumentError> getErrors() {
@@ -68,7 +69,7 @@ public List<DocumentError> getErrors() {
 
     /**
      * Set the errors property: Errors by document id.
-     *
+     * 
      * @param errors the errors value to set.
      * @return the EntityLinkingResult object itself.
      */
@@ -78,8 +79,9 @@ public EntityLinkingResult setErrors(List<DocumentError> errors) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @return the statistics value.
      */
     public RequestStatistics getStatistics() {
@@ -87,8 +89,9 @@ public RequestStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the EntityLinkingResult object itself.
      */
@@ -100,7 +103,7 @@ public EntityLinkingResult setStatistics(RequestStatistics statistics) {
     /**
      * Get the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @return the modelVersion value.
      */
     public String getModelVersion() {
@@ -110,7 +113,7 @@ public String getModelVersion() {
     /**
      * Set the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @param modelVersion the modelVersion value to set.
      * @return the EntityLinkingResult object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/ErrorCodeValue.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/ErrorCodeValue.java
index 2a00a654b655..3431f8803c63 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/ErrorCodeValue.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/ErrorCodeValue.java
@@ -42,7 +42,7 @@ public enum ErrorCodeValue {
 
     /**
      * Parses a serialized value to a ErrorCodeValue instance.
-     *
+     * 
      * @param value the serialized value to parse.
      * @return the parsed ErrorCodeValue object, or null if unable to parse.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerError.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerError.java
index ea1339baed9e..e2a97c1c062e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerError.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerError.java
@@ -14,10 +14,7 @@
 @Fluent
 public final class InnerError {
     /*
-     * Error code. Possible values include: 'invalidParameterValue',
-     * 'invalidRequestBodyFormat', 'emptyRequest', 'missingInputRecords',
-     * 'invalidDocument', 'modelVersionIncorrect', 'invalidDocumentBatch',
-     * 'unsupportedLanguageCode', 'invalidCountryHint'
+     * Error code.
      */
     @JsonProperty(value = "code", required = true)
     private InnerErrorCodeValue code;
@@ -43,15 +40,12 @@ public final class InnerError {
     /*
      * Inner error contains more specific information.
      */
-    @JsonProperty(value = "innerError")
-    private InnerError innerError;
+    @JsonProperty(value = "innererror")
+    private InnerError innererror;
 
     /**
-     * Get the code property: Error code. Possible values include:
-     * 'invalidParameterValue', 'invalidRequestBodyFormat', 'emptyRequest',
-     * 'missingInputRecords', 'invalidDocument', 'modelVersionIncorrect',
-     * 'invalidDocumentBatch', 'unsupportedLanguageCode', 'invalidCountryHint'.
-     *
+     * Get the code property: Error code.
+     * 
      * @return the code value.
      */
     public InnerErrorCodeValue getCode() {
@@ -59,11 +53,8 @@ public InnerErrorCodeValue getCode() {
     }
 
     /**
-     * Set the code property: Error code. Possible values include:
-     * 'invalidParameterValue', 'invalidRequestBodyFormat', 'emptyRequest',
-     * 'missingInputRecords', 'invalidDocument', 'modelVersionIncorrect',
-     * 'invalidDocumentBatch', 'unsupportedLanguageCode', 'invalidCountryHint'.
-     *
+     * Set the code property: Error code.
+     * 
      * @param code the code value to set.
      * @return the InnerError object itself.
      */
@@ -74,7 +65,7 @@ public InnerError setCode(InnerErrorCodeValue code) {
 
     /**
      * Get the message property: Error message.
-     *
+     * 
      * @return the message value.
      */
     public String getMessage() {
@@ -83,7 +74,7 @@ public String getMessage() {
 
     /**
      * Set the message property: Error message.
-     *
+     * 
      * @param message the message value to set.
      * @return the InnerError object itself.
      */
@@ -94,7 +85,7 @@ public InnerError setMessage(String message) {
 
     /**
      * Get the details property: Error details.
-     *
+     * 
      * @return the details value.
      */
     public Map<String, String> getDetails() {
@@ -103,7 +94,7 @@ public Map<String, String> getDetails() {
 
     /**
      * Set the details property: Error details.
-     *
+     * 
      * @param details the details value to set.
      * @return the InnerError object itself.
      */
@@ -114,7 +105,7 @@ public InnerError setDetails(Map<String, String> details) {
 
     /**
      * Get the target property: Error target.
-     *
+     * 
      * @return the target value.
      */
     public String getTarget() {
@@ -123,7 +114,7 @@ public String getTarget() {
 
     /**
      * Set the target property: Error target.
-     *
+     * 
      * @param target the target value to set.
      * @return the InnerError object itself.
      */
@@ -133,24 +124,24 @@ public InnerError setTarget(String target) {
     }
 
     /**
-     * Get the innerError property: Inner error contains more specific
+     * Get the innererror property: Inner error contains more specific
      * information.
-     *
-     * @return the innerError value.
+     * 
+     * @return the innererror value.
      */
-    public InnerError getInnerError() {
-        return this.innerError;
+    public InnerError getInnererror() {
+        return this.innererror;
     }
 
     /**
-     * Set the innerError property: Inner error contains more specific
+     * Set the innererror property: Inner error contains more specific
      * information.
-     *
-     * @param innerError the innerError value to set.
+     * 
+     * @param innererror the innererror value to set.
      * @return the InnerError object itself.
      */
-    public InnerError setInnerError(InnerError innerError) {
-        this.innerError = innerError;
+    public InnerError setInnererror(InnerError innererror) {
+        this.innererror = innererror;
         return this;
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerErrorCodeValue.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerErrorCodeValue.java
index caec203e43b7..4294b1b886a1 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerErrorCodeValue.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/InnerErrorCodeValue.java
@@ -67,7 +67,7 @@ public enum InnerErrorCodeValue {
 
     /**
      * Parses a serialized value to a InnerErrorCodeValue instance.
-     *
+     * 
      * @param value the serialized value to parse.
      * @return the parsed InnerErrorCodeValue object, or null if unable to parse.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/KeyPhraseResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/KeyPhraseResult.java
index 7c19d60a2e5c..bd7223494fd2 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/KeyPhraseResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/KeyPhraseResult.java
@@ -26,7 +26,8 @@ public final class KeyPhraseResult {
     private List<DocumentError> errors;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the request payload.
      */
     @JsonProperty(value = "statistics")
     private RequestStatistics statistics;
@@ -39,7 +40,7 @@ public final class KeyPhraseResult {
 
     /**
      * Get the documents property: Response by document.
-     *
+     * 
      * @return the documents value.
      */
     public List<DocumentKeyPhrases> getDocuments() {
@@ -48,7 +49,7 @@ public List<DocumentKeyPhrases> getDocuments() {
 
     /**
      * Set the documents property: Response by document.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the KeyPhraseResult object itself.
      */
@@ -59,7 +60,7 @@ public KeyPhraseResult setDocuments(List<DocumentKeyPhrases> documents) {
 
     /**
      * Get the errors property: Errors by document id.
-     *
+     * 
      * @return the errors value.
      */
     public List<DocumentError> getErrors() {
@@ -68,7 +69,7 @@ public List<DocumentError> getErrors() {
 
     /**
      * Set the errors property: Errors by document id.
-     *
+     * 
      * @param errors the errors value to set.
      * @return the KeyPhraseResult object itself.
      */
@@ -78,8 +79,9 @@ public KeyPhraseResult setErrors(List<DocumentError> errors) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @return the statistics value.
      */
     public RequestStatistics getStatistics() {
@@ -87,8 +89,9 @@ public RequestStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the KeyPhraseResult object itself.
      */
@@ -100,7 +103,7 @@ public KeyPhraseResult setStatistics(RequestStatistics statistics) {
     /**
      * Get the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @return the modelVersion value.
      */
     public String getModelVersion() {
@@ -110,7 +113,7 @@ public String getModelVersion() {
     /**
      * Set the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @param modelVersion the modelVersion value to set.
      * @return the KeyPhraseResult object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageBatchInput.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageBatchInput.java
index dff194489582..4ff3423367c4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageBatchInput.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageBatchInput.java
@@ -21,7 +21,7 @@ public final class LanguageBatchInput {
 
     /**
      * Get the documents property: The documents property.
-     *
+     * 
      * @return the documents value.
      */
     public List<LanguageInput> getDocuments() {
@@ -30,7 +30,7 @@ public List<LanguageInput> getDocuments() {
 
     /**
      * Set the documents property: The documents property.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the LanguageBatchInput object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageInput.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageInput.java
index da18b248fa8a..2a9d7d3f91b5 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageInput.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageInput.java
@@ -32,7 +32,7 @@ public final class LanguageInput {
 
     /**
      * Get the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -41,7 +41,7 @@ public String getId() {
 
     /**
      * Set the id property: Unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the LanguageInput object itself.
      */
@@ -52,7 +52,7 @@ public LanguageInput setId(String id) {
 
     /**
      * Get the text property: The text property.
-     *
+     * 
      * @return the text value.
      */
     public String getText() {
@@ -61,7 +61,7 @@ public String getText() {
 
     /**
      * Set the text property: The text property.
-     *
+     * 
      * @param text the text value to set.
      * @return the LanguageInput object itself.
      */
@@ -72,7 +72,7 @@ public LanguageInput setText(String text) {
 
     /**
      * Get the countryHint property: The countryHint property.
-     *
+     * 
      * @return the countryHint value.
      */
     public String getCountryHint() {
@@ -81,7 +81,7 @@ public String getCountryHint() {
 
     /**
      * Set the countryHint property: The countryHint property.
-     *
+     * 
      * @param countryHint the countryHint value to set.
      * @return the LanguageInput object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageResult.java
index 82e11308d49c..46515f53c93b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LanguageResult.java
@@ -26,7 +26,8 @@ public final class LanguageResult {
     private List<DocumentError> errors;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the request payload.
      */
     @JsonProperty(value = "statistics")
     private RequestStatistics statistics;
@@ -39,7 +40,7 @@ public final class LanguageResult {
 
     /**
      * Get the documents property: Response by document.
-     *
+     * 
      * @return the documents value.
      */
     public List<DocumentLanguage> getDocuments() {
@@ -48,7 +49,7 @@ public List<DocumentLanguage> getDocuments() {
 
     /**
      * Set the documents property: Response by document.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the LanguageResult object itself.
      */
@@ -59,7 +60,7 @@ public LanguageResult setDocuments(List<DocumentLanguage> documents) {
 
     /**
      * Get the errors property: Errors by document id.
-     *
+     * 
      * @return the errors value.
      */
     public List<DocumentError> getErrors() {
@@ -68,7 +69,7 @@ public List<DocumentError> getErrors() {
 
     /**
      * Set the errors property: Errors by document id.
-     *
+     * 
      * @param errors the errors value to set.
      * @return the LanguageResult object itself.
      */
@@ -78,8 +79,9 @@ public LanguageResult setErrors(List<DocumentError> errors) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @return the statistics value.
      */
     public RequestStatistics getStatistics() {
@@ -87,8 +89,9 @@ public RequestStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the LanguageResult object itself.
      */
@@ -100,7 +103,7 @@ public LanguageResult setStatistics(RequestStatistics statistics) {
     /**
      * Get the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @return the modelVersion value.
      */
     public String getModelVersion() {
@@ -110,7 +113,7 @@ public String getModelVersion() {
     /**
      * Set the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @param modelVersion the modelVersion value to set.
      * @return the LanguageResult object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LinkedEntity.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LinkedEntity.java
index 0c3b2fd9f859..18df75ef5daf 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LinkedEntity.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/LinkedEntity.java
@@ -51,7 +51,7 @@ public final class LinkedEntity {
 
     /**
      * Get the name property: Entity Linking formal name.
-     *
+     * 
      * @return the name value.
      */
     public String getName() {
@@ -60,7 +60,7 @@ public String getName() {
 
     /**
      * Set the name property: Entity Linking formal name.
-     *
+     * 
      * @param name the name value to set.
      * @return the LinkedEntity object itself.
      */
@@ -72,7 +72,7 @@ public LinkedEntity setName(String name) {
     /**
      * Get the matches property: List of instances this entity appears in the
      * text.
-     *
+     * 
      * @return the matches value.
      */
     public List<Match> getMatches() {
@@ -82,7 +82,7 @@ public List<Match> getMatches() {
     /**
      * Set the matches property: List of instances this entity appears in the
      * text.
-     *
+     * 
      * @param matches the matches value to set.
      * @return the LinkedEntity object itself.
      */
@@ -93,7 +93,7 @@ public LinkedEntity setMatches(List<Match> matches) {
 
     /**
      * Get the language property: Language used in the data source.
-     *
+     * 
      * @return the language value.
      */
     public String getLanguage() {
@@ -102,7 +102,7 @@ public String getLanguage() {
 
     /**
      * Set the language property: Language used in the data source.
-     *
+     * 
      * @param language the language value to set.
      * @return the LinkedEntity object itself.
      */
@@ -114,7 +114,7 @@ public LinkedEntity setLanguage(String language) {
     /**
      * Get the id property: Unique identifier of the recognized entity from the
      * data source.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -124,7 +124,7 @@ public String getId() {
     /**
      * Set the id property: Unique identifier of the recognized entity from the
      * data source.
-     *
+     * 
      * @param id the id value to set.
      * @return the LinkedEntity object itself.
      */
@@ -135,7 +135,7 @@ public LinkedEntity setId(String id) {
 
     /**
      * Get the url property: URL for the entity's page from the data source.
-     *
+     * 
      * @return the url value.
      */
     public String getUrl() {
@@ -144,7 +144,7 @@ public String getUrl() {
 
     /**
      * Set the url property: URL for the entity's page from the data source.
-     *
+     * 
      * @param url the url value to set.
      * @return the LinkedEntity object itself.
      */
@@ -156,7 +156,7 @@ public LinkedEntity setUrl(String url) {
     /**
      * Get the dataSource property: Data source used to extract entity linking,
      * such as Wiki/Bing etc.
-     *
+     * 
      * @return the dataSource value.
      */
     public String getDataSource() {
@@ -166,7 +166,7 @@ public String getDataSource() {
     /**
      * Set the dataSource property: Data source used to extract entity linking,
      * such as Wiki/Bing etc.
-     *
+     * 
      * @param dataSource the dataSource value to set.
      * @return the LinkedEntity object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Match.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Match.java
index cdd4e4a6fa18..19b4a45c097b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Match.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/Match.java
@@ -16,8 +16,8 @@ public final class Match {
      * If a well-known item is recognized, a decimal number denoting the
      * confidence level between 0 and 1 will be returned.
      */
-    @JsonProperty(value = "score", required = true)
-    private double score;
+    @JsonProperty(value = "confidenceScore", required = true)
+    private double confidenceScore;
 
     /*
      * Entity text as appears in the request.
@@ -38,30 +38,32 @@ public final class Match {
     private int length;
 
     /**
-     * Get the score property: If a well-known item is recognized, a decimal
-     * number denoting the confidence level between 0 and 1 will be returned.
-     *
-     * @return the score value.
+     * Get the confidenceScore property: If a well-known item is recognized, a
+     * decimal number denoting the confidence level between 0 and 1 will be
+     * returned.
+     * 
+     * @return the confidenceScore value.
      */
-    public double getScore() {
-        return this.score;
+    public double getConfidenceScore() {
+        return this.confidenceScore;
     }
 
     /**
-     * Set the score property: If a well-known item is recognized, a decimal
-     * number denoting the confidence level between 0 and 1 will be returned.
-     *
-     * @param score the score value to set.
+     * Set the confidenceScore property: If a well-known item is recognized, a
+     * decimal number denoting the confidence level between 0 and 1 will be
+     * returned.
+     * 
+     * @param confidenceScore the confidenceScore value to set.
      * @return the Match object itself.
      */
-    public Match setScore(double score) {
-        this.score = score;
+    public Match setConfidenceScore(double confidenceScore) {
+        this.confidenceScore = confidenceScore;
         return this;
     }
 
     /**
      * Get the text property: Entity text as appears in the request.
-     *
+     * 
      * @return the text value.
      */
     public String getText() {
@@ -70,7 +72,7 @@ public String getText() {
 
     /**
      * Set the text property: Entity text as appears in the request.
-     *
+     * 
      * @param text the text value to set.
      * @return the Match object itself.
      */
@@ -82,7 +84,7 @@ public Match setText(String text) {
     /**
      * Get the offset property: Start position (in Unicode characters) for the
      * entity match text.
-     *
+     * 
      * @return the offset value.
      */
     public int getOffset() {
@@ -92,7 +94,7 @@ public int getOffset() {
     /**
      * Set the offset property: Start position (in Unicode characters) for the
      * entity match text.
-     *
+     * 
      * @param offset the offset value to set.
      * @return the Match object itself.
      */
@@ -104,7 +106,7 @@ public Match setOffset(int offset) {
     /**
      * Get the length property: Length (in Unicode characters) for the entity
      * match text.
-     *
+     * 
      * @return the length value.
      */
     public int getLength() {
@@ -114,7 +116,7 @@ public int getLength() {
     /**
      * Set the length property: Length (in Unicode characters) for the entity
      * match text.
-     *
+     * 
      * @param length the length value to set.
      * @return the Match object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageBatchInput.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageBatchInput.java
index 15e031e8696e..285b47ab9b3c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageBatchInput.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageBatchInput.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- * Contains a set of input documents to be analyzed by the service.
+ * The MultiLanguageBatchInput model.
  */
 @Fluent
 public final class MultiLanguageBatchInput {
@@ -22,7 +22,7 @@ public final class MultiLanguageBatchInput {
     /**
      * Get the documents property: The set of documents to process as part of
      * this batch.
-     *
+     * 
      * @return the documents value.
      */
     public List<MultiLanguageInput> getDocuments() {
@@ -32,7 +32,7 @@ public List<MultiLanguageInput> getDocuments() {
     /**
      * Set the documents property: The set of documents to process as part of
      * this batch.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the MultiLanguageBatchInput object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageInput.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageInput.java
index 3760d680181e..f2ba9a418036 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageInput.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/MultiLanguageInput.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Contains an input document to be analyzed by the service.
+ * The MultiLanguageInput model.
  */
 @Fluent
 public final class MultiLanguageInput {
@@ -34,7 +34,7 @@ public final class MultiLanguageInput {
 
     /**
      * Get the id property: A unique, non-empty document identifier.
-     *
+     * 
      * @return the id value.
      */
     public String getId() {
@@ -43,7 +43,7 @@ public String getId() {
 
     /**
      * Set the id property: A unique, non-empty document identifier.
-     *
+     * 
      * @param id the id value to set.
      * @return the MultiLanguageInput object itself.
      */
@@ -54,7 +54,7 @@ public MultiLanguageInput setId(String id) {
 
     /**
      * Get the text property: The input text to process.
-     *
+     * 
      * @return the text value.
      */
     public String getText() {
@@ -63,7 +63,7 @@ public String getText() {
 
     /**
      * Set the text property: The input text to process.
-     *
+     * 
      * @param text the text value to set.
      * @return the MultiLanguageInput object itself.
      */
@@ -76,7 +76,7 @@ public MultiLanguageInput setText(String text) {
      * Get the language property: (Optional) This is the 2 letter ISO 639-1
      * representation of a language. For example, use "en" for English; "es"
      * for Spanish etc. If not set, use "en" for English as default.
-     *
+     * 
      * @return the language value.
      */
     public String getLanguage() {
@@ -87,7 +87,7 @@ public String getLanguage() {
      * Set the language property: (Optional) This is the 2 letter ISO 639-1
      * representation of a language. For example, use "en" for English; "es"
      * for Spanish etc. If not set, use "en" for English as default.
-     *
+     * 
      * @param language the language value to set.
      * @return the MultiLanguageInput object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/RequestStatistics.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/RequestStatistics.java
index b0934b055ab5..ceb0be002998 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/RequestStatistics.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/RequestStatistics.java
@@ -8,8 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * if showStats=true was specified in the request this field will contain
- * information about the request payload.
+ * The RequestStatistics model.
  */
 @Fluent
 public final class RequestStatistics {
@@ -42,7 +41,7 @@ public final class RequestStatistics {
     /**
      * Get the documentsCount property: Number of documents submitted in the
      * request.
-     *
+     * 
      * @return the documentsCount value.
      */
     public int getDocumentsCount() {
@@ -52,7 +51,7 @@ public int getDocumentsCount() {
     /**
      * Set the documentsCount property: Number of documents submitted in the
      * request.
-     *
+     * 
      * @param documentsCount the documentsCount value to set.
      * @return the RequestStatistics object itself.
      */
@@ -64,7 +63,7 @@ public RequestStatistics setDocumentsCount(int documentsCount) {
     /**
      * Get the validDocumentsCount property: Number of valid documents. This
      * excludes empty, over-size limit or non-supported languages documents.
-     *
+     * 
      * @return the validDocumentsCount value.
      */
     public int getValidDocumentsCount() {
@@ -74,7 +73,7 @@ public int getValidDocumentsCount() {
     /**
      * Set the validDocumentsCount property: Number of valid documents. This
      * excludes empty, over-size limit or non-supported languages documents.
-     *
+     * 
      * @param validDocumentsCount the validDocumentsCount value to set.
      * @return the RequestStatistics object itself.
      */
@@ -87,7 +86,7 @@ public RequestStatistics setValidDocumentsCount(int validDocumentsCount) {
      * Get the erroneousDocumentsCount property: Number of invalid documents.
      * This includes empty, over-size limit or non-supported languages
      * documents.
-     *
+     * 
      * @return the erroneousDocumentsCount value.
      */
     public int getErroneousDocumentsCount() {
@@ -98,7 +97,7 @@ public int getErroneousDocumentsCount() {
      * Set the erroneousDocumentsCount property: Number of invalid documents.
      * This includes empty, over-size limit or non-supported languages
      * documents.
-     *
+     * 
      * @param erroneousDocumentsCount the erroneousDocumentsCount value to set.
      * @return the RequestStatistics object itself.
      */
@@ -110,7 +109,7 @@ public RequestStatistics setErroneousDocumentsCount(int erroneousDocumentsCount)
     /**
      * Get the transactionsCount property: Number of transactions for the
      * request.
-     *
+     * 
      * @return the transactionsCount value.
      */
     public long getTransactionsCount() {
@@ -120,7 +119,7 @@ public long getTransactionsCount() {
     /**
      * Set the transactionsCount property: Number of transactions for the
      * request.
-     *
+     * 
      * @param transactionsCount the transactionsCount value to set.
      * @return the RequestStatistics object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentiment.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentiment.java
index 47a29eb1e207..600f1e838c8c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentiment.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentiment.java
@@ -6,7 +6,6 @@
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
 
 /**
  * The SentenceSentiment model.
@@ -14,8 +13,13 @@
 @Fluent
 public final class SentenceSentiment {
     /*
-     * The predicted Sentiment for the sentence. Possible values include:
-     * 'positive', 'neutral', 'negative'
+     * The sentence text.
+     */
+    @JsonProperty(value = "text")
+    private String text;
+
+    /*
+     * The predicted Sentiment for the sentence.
      */
     @JsonProperty(value = "sentiment", required = true)
     private SentenceSentimentValue sentiment;
@@ -24,8 +28,8 @@ public final class SentenceSentiment {
      * The sentiment confidence score between 0 and 1 for the sentence for all
      * classes.
      */
-    @JsonProperty(value = "sentenceScores", required = true)
-    private SentimentConfidenceScorePerLabel sentenceScores;
+    @JsonProperty(value = "confidenceScores", required = true)
+    private SentimentConfidenceScorePerLabel confidenceScores;
 
     /*
      * The sentence offset from the start of the document.
@@ -39,16 +43,29 @@ public final class SentenceSentiment {
     @JsonProperty(value = "length", required = true)
     private int length;
 
-    /*
-     * The warnings generated for the sentence.
+    /**
+     * Get the text property: The sentence text.
+     * 
+     * @return the text value.
      */
-    @JsonProperty(value = "warnings")
-    private List<String> warnings;
+    public String getText() {
+        return this.text;
+    }
+
+    /**
+     * Set the text property: The sentence text.
+     * 
+     * @param text the text value to set.
+     * @return the SentenceSentiment object itself.
+     */
+    public SentenceSentiment setText(String text) {
+        this.text = text;
+        return this;
+    }
 
     /**
      * Get the sentiment property: The predicted Sentiment for the sentence.
-     * Possible values include: 'positive', 'neutral', 'negative'.
-     *
+     * 
      * @return the sentiment value.
      */
     public SentenceSentimentValue getSentiment() {
@@ -57,8 +74,7 @@ public SentenceSentimentValue getSentiment() {
 
     /**
      * Set the sentiment property: The predicted Sentiment for the sentence.
-     * Possible values include: 'positive', 'neutral', 'negative'.
-     *
+     * 
      * @param sentiment the sentiment value to set.
      * @return the SentenceSentiment object itself.
      */
@@ -68,31 +84,31 @@ public SentenceSentiment setSentiment(SentenceSentimentValue sentiment) {
     }
 
     /**
-     * Get the sentenceScores property: The sentiment confidence score between
-     * 0 and 1 for the sentence for all classes.
-     *
-     * @return the sentenceScores value.
+     * Get the confidenceScores property: The sentiment confidence score
+     * between 0 and 1 for the sentence for all classes.
+     * 
+     * @return the confidenceScores value.
      */
-    public SentimentConfidenceScorePerLabel getSentenceScores() {
-        return this.sentenceScores;
+    public SentimentConfidenceScorePerLabel getConfidenceScores() {
+        return this.confidenceScores;
     }
 
     /**
-     * Set the sentenceScores property: The sentiment confidence score between
-     * 0 and 1 for the sentence for all classes.
-     *
-     * @param sentenceScores the sentenceScores value to set.
+     * Set the confidenceScores property: The sentiment confidence score
+     * between 0 and 1 for the sentence for all classes.
+     * 
+     * @param confidenceScores the confidenceScores value to set.
      * @return the SentenceSentiment object itself.
      */
-    public SentenceSentiment setSentenceScores(SentimentConfidenceScorePerLabel sentenceScores) {
-        this.sentenceScores = sentenceScores;
+    public SentenceSentiment setConfidenceScores(SentimentConfidenceScorePerLabel confidenceScores) {
+        this.confidenceScores = confidenceScores;
         return this;
     }
 
     /**
      * Get the offset property: The sentence offset from the start of the
      * document.
-     *
+     * 
      * @return the offset value.
      */
     public int getOffset() {
@@ -102,7 +118,7 @@ public int getOffset() {
     /**
      * Set the offset property: The sentence offset from the start of the
      * document.
-     *
+     * 
      * @param offset the offset value to set.
      * @return the SentenceSentiment object itself.
      */
@@ -113,7 +129,7 @@ public SentenceSentiment setOffset(int offset) {
 
     /**
      * Get the length property: The length of the sentence by Unicode standard.
-     *
+     * 
      * @return the length value.
      */
     public int getLength() {
@@ -122,7 +138,7 @@ public int getLength() {
 
     /**
      * Set the length property: The length of the sentence by Unicode standard.
-     *
+     * 
      * @param length the length value to set.
      * @return the SentenceSentiment object itself.
      */
@@ -130,24 +146,4 @@ public SentenceSentiment setLength(int length) {
         this.length = length;
         return this;
     }
-
-    /**
-     * Get the warnings property: The warnings generated for the sentence.
-     *
-     * @return the warnings value.
-     */
-    public List<String> getWarnings() {
-        return this.warnings;
-    }
-
-    /**
-     * Set the warnings property: The warnings generated for the sentence.
-     *
-     * @param warnings the warnings value to set.
-     * @return the SentenceSentiment object itself.
-     */
-    public SentenceSentiment setWarnings(List<String> warnings) {
-        this.warnings = warnings;
-        return this;
-    }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentimentValue.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentimentValue.java
index 3a1d6dcb5fee..c80b516477d5 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentimentValue.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentenceSentimentValue.java
@@ -37,7 +37,7 @@ public enum SentenceSentimentValue {
 
     /**
      * Parses a serialized value to a SentenceSentimentValue instance.
-     *
+     * 
      * @param value the serialized value to parse.
      * @return the parsed SentenceSentimentValue object, or null if unable to parse.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentConfidenceScorePerLabel.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentConfidenceScorePerLabel.java
index 23fc4ec6562b..9c7561cf86b6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentConfidenceScorePerLabel.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentConfidenceScorePerLabel.java
@@ -8,8 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Represents the confidence scores between 0 and 1 across all sentiment
- * classes: positive, neutral, negative.
+ * The SentimentConfidenceScorePerLabel model.
  */
 @Fluent
 public final class SentimentConfidenceScorePerLabel {
@@ -33,7 +32,7 @@ public final class SentimentConfidenceScorePerLabel {
 
     /**
      * Get the positive property: The positive property.
-     *
+     * 
      * @return the positive value.
      */
     public double getPositive() {
@@ -42,9 +41,9 @@ public double getPositive() {
 
     /**
      * Set the positive property: The positive property.
-     *
+     * 
      * @param positive the positive value to set.
-     * @return the SentimentConfidenceScores object itself.
+     * @return the SentimentConfidenceScorePerLabel object itself.
      */
     public SentimentConfidenceScorePerLabel setPositive(double positive) {
         this.positive = positive;
@@ -53,7 +52,7 @@ public SentimentConfidenceScorePerLabel setPositive(double positive) {
 
     /**
      * Get the neutral property: The neutral property.
-     *
+     * 
      * @return the neutral value.
      */
     public double getNeutral() {
@@ -62,9 +61,9 @@ public double getNeutral() {
 
     /**
      * Set the neutral property: The neutral property.
-     *
+     * 
      * @param neutral the neutral value to set.
-     * @return the SentimentConfidenceScores object itself.
+     * @return the SentimentConfidenceScorePerLabel object itself.
      */
     public SentimentConfidenceScorePerLabel setNeutral(double neutral) {
         this.neutral = neutral;
@@ -73,7 +72,7 @@ public SentimentConfidenceScorePerLabel setNeutral(double neutral) {
 
     /**
      * Get the negative property: The negative property.
-     *
+     * 
      * @return the negative value.
      */
     public double getNegative() {
@@ -82,9 +81,9 @@ public double getNegative() {
 
     /**
      * Set the negative property: The negative property.
-     *
+     * 
      * @param negative the negative value to set.
-     * @return the SentimentConfidenceScores object itself.
+     * @return the SentimentConfidenceScorePerLabel object itself.
      */
     public SentimentConfidenceScorePerLabel setNegative(double negative) {
         this.negative = negative;
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentResponse.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentResponse.java
index 95a683f7cbb8..b9175434c720 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentResponse.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/SentimentResponse.java
@@ -26,7 +26,8 @@ public final class SentimentResponse {
     private List<DocumentError> errors;
 
     /*
-     * The statistics property.
+     * if showStats=true was specified in the request this field will contain
+     * information about the request payload.
      */
     @JsonProperty(value = "statistics")
     private RequestStatistics statistics;
@@ -39,7 +40,7 @@ public final class SentimentResponse {
 
     /**
      * Get the documents property: Sentiment analysis per document.
-     *
+     * 
      * @return the documents value.
      */
     public List<DocumentSentiment> getDocuments() {
@@ -48,7 +49,7 @@ public List<DocumentSentiment> getDocuments() {
 
     /**
      * Set the documents property: Sentiment analysis per document.
-     *
+     * 
      * @param documents the documents value to set.
      * @return the SentimentResponse object itself.
      */
@@ -59,7 +60,7 @@ public SentimentResponse setDocuments(List<DocumentSentiment> documents) {
 
     /**
      * Get the errors property: Errors by document id.
-     *
+     * 
      * @return the errors value.
      */
     public List<DocumentError> getErrors() {
@@ -68,7 +69,7 @@ public List<DocumentError> getErrors() {
 
     /**
      * Set the errors property: Errors by document id.
-     *
+     * 
      * @param errors the errors value to set.
      * @return the SentimentResponse object itself.
      */
@@ -78,8 +79,9 @@ public SentimentResponse setErrors(List<DocumentError> errors) {
     }
 
     /**
-     * Get the statistics property: The statistics property.
-     *
+     * Get the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @return the statistics value.
      */
     public RequestStatistics getStatistics() {
@@ -87,8 +89,9 @@ public RequestStatistics getStatistics() {
     }
 
     /**
-     * Set the statistics property: The statistics property.
-     *
+     * Set the statistics property: if showStats=true was specified in the
+     * request this field will contain information about the request payload.
+     * 
      * @param statistics the statistics value to set.
      * @return the SentimentResponse object itself.
      */
@@ -100,7 +103,7 @@ public SentimentResponse setStatistics(RequestStatistics statistics) {
     /**
      * Get the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @return the modelVersion value.
      */
     public String getModelVersion() {
@@ -110,7 +113,7 @@ public String getModelVersion() {
     /**
      * Set the modelVersion property: This field indicates which model is used
      * for scoring.
-     *
+     * 
      * @param modelVersion the modelVersion value to set.
      * @return the SentimentResponse object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsError.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsError.java
index 95cb995ac216..5e5d1a837d60 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsError.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsError.java
@@ -14,8 +14,7 @@
 @Fluent
 public final class TextAnalyticsError {
     /*
-     * Error code. Possible values include: 'invalidRequest',
-     * 'invalidArgument', 'internalServerError', 'serviceUnavailable'
+     * Error code.
      */
     @JsonProperty(value = "code", required = true)
     private ErrorCodeValue code;
@@ -35,8 +34,8 @@ public final class TextAnalyticsError {
     /*
      * Inner error contains more specific information.
      */
-    @JsonProperty(value = "innerError")
-    private InnerError innerError;
+    @JsonProperty(value = "innererror")
+    private InnerError innererror;
 
     /*
      * Details about specific errors that led to this reported error.
@@ -45,10 +44,8 @@ public final class TextAnalyticsError {
     private List<TextAnalyticsError> details;
 
     /**
-     * Get the code property: Error code. Possible values include:
-     * 'invalidRequest', 'invalidArgument', 'internalServerError',
-     * 'serviceUnavailable'.
-     *
+     * Get the code property: Error code.
+     * 
      * @return the code value.
      */
     public ErrorCodeValue getCode() {
@@ -56,10 +53,8 @@ public ErrorCodeValue getCode() {
     }
 
     /**
-     * Set the code property: Error code. Possible values include:
-     * 'invalidRequest', 'invalidArgument', 'internalServerError',
-     * 'serviceUnavailable'.
-     *
+     * Set the code property: Error code.
+     * 
      * @param code the code value to set.
      * @return the TextAnalyticsError object itself.
      */
@@ -70,7 +65,7 @@ public TextAnalyticsError setCode(ErrorCodeValue code) {
 
     /**
      * Get the message property: Error message.
-     *
+     * 
      * @return the message value.
      */
     public String getMessage() {
@@ -79,7 +74,7 @@ public String getMessage() {
 
     /**
      * Set the message property: Error message.
-     *
+     * 
      * @param message the message value to set.
      * @return the TextAnalyticsError object itself.
      */
@@ -90,7 +85,7 @@ public TextAnalyticsError setMessage(String message) {
 
     /**
      * Get the target property: Error target.
-     *
+     * 
      * @return the target value.
      */
     public String getTarget() {
@@ -99,7 +94,7 @@ public String getTarget() {
 
     /**
      * Set the target property: Error target.
-     *
+     * 
      * @param target the target value to set.
      * @return the TextAnalyticsError object itself.
      */
@@ -109,31 +104,31 @@ public TextAnalyticsError setTarget(String target) {
     }
 
     /**
-     * Get the innerError property: Inner error contains more specific
+     * Get the innererror property: Inner error contains more specific
      * information.
-     *
-     * @return the innerError value.
+     * 
+     * @return the innererror value.
      */
-    public InnerError getInnerError() {
-        return this.innerError;
+    public InnerError getInnererror() {
+        return this.innererror;
     }
 
     /**
-     * Set the innerError property: Inner error contains more specific
+     * Set the innererror property: Inner error contains more specific
      * information.
-     *
-     * @param innerError the innerError value to set.
+     * 
+     * @param innererror the innererror value to set.
      * @return the TextAnalyticsError object itself.
      */
-    public TextAnalyticsError setInnerError(InnerError innerError) {
-        this.innerError = innerError;
+    public TextAnalyticsError setInnererror(InnerError innererror) {
+        this.innererror = innererror;
         return this;
     }
 
     /**
      * Get the details property: Details about specific errors that led to this
      * reported error.
-     *
+     * 
      * @return the details value.
      */
     public List<TextAnalyticsError> getDetails() {
@@ -143,7 +138,7 @@ public List<TextAnalyticsError> getDetails() {
     /**
      * Set the details property: Details about specific errors that led to this
      * reported error.
-     *
+     * 
      * @param details the details value to set.
      * @return the TextAnalyticsError object itself.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsErrorException.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsErrorException.java
index 25898ef8f43e..64537e34050e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsErrorException.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsErrorException.java
@@ -13,7 +13,7 @@
 public final class TextAnalyticsErrorException extends HttpResponseException {
     /**
      * Initializes a new instance of the TextAnalyticsErrorException class.
-     *
+     * 
      * @param message the exception message or the response content if a message is not available.
      * @param response the HTTP response.
      */
@@ -23,7 +23,7 @@ public TextAnalyticsErrorException(String message, HttpResponse response) {
 
     /**
      * Initializes a new instance of the TextAnalyticsErrorException class.
-     *
+     * 
      * @param message the exception message or the response content if a message is not available.
      * @param response the HTTP response.
      * @param value the deserialized response value.
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsWarning.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsWarning.java
new file mode 100644
index 000000000000..50318f1fbc3a
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/TextAnalyticsWarning.java
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.ai.textanalytics.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The TextAnalyticsWarning model.
+ */
+@Fluent
+public final class TextAnalyticsWarning {
+    /*
+     * Error code.
+     */
+    @JsonProperty(value = "code", required = true)
+    private WarningCodeValue code;
+
+    /*
+     * Warning message.
+     */
+    @JsonProperty(value = "message", required = true)
+    private String message;
+
+    /*
+     * A JSON pointer reference indicating the target object.
+     */
+    @JsonProperty(value = "targetRef")
+    private String targetRef;
+
+    /**
+     * Get the code property: Error code.
+     * 
+     * @return the code value.
+     */
+    public WarningCodeValue getCode() {
+        return this.code;
+    }
+
+    /**
+     * Set the code property: Error code.
+     * 
+     * @param code the code value to set.
+     * @return the TextAnalyticsWarning object itself.
+     */
+    public TextAnalyticsWarning setCode(WarningCodeValue code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get the message property: Warning message.
+     * 
+     * @return the message value.
+     */
+    public String getMessage() {
+        return this.message;
+    }
+
+    /**
+     * Set the message property: Warning message.
+     * 
+     * @param message the message value to set.
+     * @return the TextAnalyticsWarning object itself.
+     */
+    public TextAnalyticsWarning setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Get the targetRef property: A JSON pointer reference indicating the
+     * target object.
+     * 
+     * @return the targetRef value.
+     */
+    public String getTargetRef() {
+        return this.targetRef;
+    }
+
+    /**
+     * Set the targetRef property: A JSON pointer reference indicating the
+     * target object.
+     * 
+     * @param targetRef the targetRef value to set.
+     * @return the TextAnalyticsWarning object itself.
+     */
+    public TextAnalyticsWarning setTargetRef(String targetRef) {
+        this.targetRef = targetRef;
+        return this;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/WarningCodeValue.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/WarningCodeValue.java
new file mode 100644
index 000000000000..d620e009cacf
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/models/WarningCodeValue.java
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.ai.textanalytics.implementation.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for WarningCodeValue.
+ */
+public enum WarningCodeValue {
+    /**
+     * Enum value LongWordsInDocument.
+     */
+    LONG_WORDS_IN_DOCUMENT("LongWordsInDocument"),
+
+    /**
+     * Enum value DocumentTruncated.
+     */
+    DOCUMENT_TRUNCATED("DocumentTruncated");
+
+    /**
+     * The actual serialized value for a WarningCodeValue instance.
+     */
+    private final String value;
+
+    WarningCodeValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a WarningCodeValue instance.
+     * 
+     * @param value the serialized value to parse.
+     * @return the parsed WarningCodeValue object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static WarningCodeValue fromString(String value) {
+        WarningCodeValue[] items = WarningCodeValue.values();
+        for (WarningCodeValue item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/AnalyzeSentimentResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/AnalyzeSentimentResult.java
index 6fb9926fed65..82fe9ac988d0 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/AnalyzeSentimentResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/AnalyzeSentimentResult.java
@@ -9,7 +9,7 @@
  * The {@link AnalyzeSentimentResult} model.
  */
 @Immutable
-public final class AnalyzeSentimentResult extends DocumentResult {
+public final class AnalyzeSentimentResult extends TextAnalyticsResult {
     private final DocumentSentiment documentSentiment;
 
     /**
@@ -21,7 +21,7 @@ public final class AnalyzeSentimentResult extends DocumentResult {
      * @param documentSentiment The document sentiment.
      */
     public AnalyzeSentimentResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error, DocumentSentiment documentSentiment) {
+                                  TextAnalyticsError error, DocumentSentiment documentSentiment) {
         super(id, textDocumentStatistics, error);
         this.documentSentiment = documentSentiment;
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntity.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntity.java
index 28ce1db371c8..fd666be4127f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntity.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntity.java
@@ -23,17 +23,7 @@ public final class CategorizedEntity {
     /*
      * CategorizedEntity sub category, such as Age/Year/TimeRange etc
      */
-    private final String subCategory;
-
-    /*
-     * Start position for the entity text.
-     */
-    private final int offset;
-
-    /*
-     * Length for the entity text.
-     */
-    private final int length;
+    private final String subcategory;
 
     /*
      * Confidence score between 0 and 1 of the extracted entity.
@@ -45,18 +35,13 @@ public final class CategorizedEntity {
      *
      * @param text The entity text as appears in the request.
      * @param category The entity category, such as Person/Location/Org/SSN etc.
-     * @param subCategory The entity subcategory, such as Age/Year/TimeRange etc.
-     * @param offset The grapheme start position for the entity text.
-     * @param length The grapheme length for the entity text.
+     * @param subcategory The entity subcategory, such as Age/Year/TimeRange etc.
      * @param confidenceScore A confidence score between 0 and 1 of the extracted entity.
      */
-    public CategorizedEntity(String text, EntityCategory category, String subCategory,
-        int offset, int length, double confidenceScore) {
+    public CategorizedEntity(String text, EntityCategory category, String subcategory, double confidenceScore) {
         this.text = text;
         this.category = category;
-        this.subCategory = subCategory;
-        this.offset = offset;
-        this.length = length;
+        this.subcategory = subcategory;
         this.confidenceScore = confidenceScore;
     }
 
@@ -83,26 +68,8 @@ public EntityCategory getCategory() {
      *
      * @return The subcategory value.
      */
-    public String getSubCategory() {
-        return this.subCategory;
-    }
-
-    /**
-     * Get the offset property: Grapheme start position for the entity text.
-     *
-     * @return The offset value.
-     */
-    public int getGraphemeOffset() {
-        return this.offset;
-    }
-
-    /**
-     * Get the length property: Grapheme length for the entity text.
-     *
-     * @return The length value.
-     */
-    public int getGraphemeLength() {
-        return this.length;
+    public String getSubcategory() {
+        return this.subcategory;
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntityCollection.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntityCollection.java
new file mode 100644
index 000000000000..5c1218ba3414
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/CategorizedEntityCollection.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.IterableStream;
+
+/**
+ * The {@link CategorizedEntityCollection} model.
+ */
+@Immutable
+public final class CategorizedEntityCollection extends IterableStream<CategorizedEntity> {
+    private final IterableStream<TextAnalyticsWarning> warnings;
+
+    /**
+     * Creates a {@link CategorizedEntityCollection} model that describes a entities collection including warnings.
+     *
+     * @param entities An {@link IterableStream} of {@link CategorizedEntity categorized entities}.
+     * @param warnings An {@link IterableStream} of {@link TextAnalyticsWarning warnings}.
+     */
+    public CategorizedEntityCollection(IterableStream<CategorizedEntity> entities,
+                                       IterableStream<TextAnalyticsWarning> warnings) {
+        super(entities);
+        this.warnings = warnings;
+    }
+
+    /**
+     * Get the {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
+     *
+     * @return {@link IterableStream} of {@link TextAnalyticsWarning}.
+     */
+    public IterableStream<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectLanguageResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectLanguageResult.java
index 67b4951cc9cf..1636b1093230 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectLanguageResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectLanguageResult.java
@@ -8,7 +8,7 @@
  * The {@link DetectLanguageResult} model.
  */
 @Immutable
-public final class DetectLanguageResult extends DocumentResult {
+public final class DetectLanguageResult extends TextAnalyticsResult {
     private final DetectedLanguage primaryLanguage;
 
     /**
@@ -20,7 +20,7 @@ public final class DetectLanguageResult extends DocumentResult {
      * @param primaryLanguage The detected primary language.
      */
     public DetectLanguageResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error, DetectedLanguage primaryLanguage) {
+                                TextAnalyticsError error, DetectedLanguage primaryLanguage) {
         super(id, textDocumentStatistics, error);
         this.primaryLanguage = primaryLanguage;
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectedLanguage.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectedLanguage.java
index bb6e54063d53..9a1aa6f2384f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectedLanguage.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DetectedLanguage.java
@@ -4,46 +4,56 @@
 package com.azure.ai.textanalytics.models;
 
 import com.azure.core.annotation.Immutable;
+import com.azure.core.util.IterableStream;
 
 /**
  * The {@link DetectedLanguage} model.
  */
 @Immutable
 public final class DetectedLanguage {
-    /*
+    /**
      * Long name of a detected language (e.g. English, French).
      */
     private final String name;
 
-    /*
+    /**
      * A two letter representation of the detected language according to the
      * ISO 639-1 standard (e.g. en, fr).
      */
     private final String iso6391Name;
 
-    /*
+    /**
      * A confidence score between 0 and 1. Scores close to 1 indicate 100%
      * certainty that the identified language is true.
      */
-    private final double score;
+    private final double confidenceScore;
+
+    /**
+     * An {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
+     */
+    private final IterableStream<TextAnalyticsWarning> warnings;
 
     /**
      * Creates a {@link DetectedLanguage} model that describes detected language content.
      *
      * @param name The name of a detected language.
      * @param iso6391Name A two letter representation of the detected language according to the ISO 639-1 standard.
-     * @param score A confidence score between 0 and 1.
+     * @param confidenceScore A confidence score between 0 and 1.
+     * @param warnings An {@link IterableStream} of {@link TextAnalyticsWarning warnings}.
      */
-    public DetectedLanguage(String name, String iso6391Name, double score) {
+    public DetectedLanguage(String name, String iso6391Name, double confidenceScore,
+                            IterableStream<TextAnalyticsWarning> warnings) {
         this.name = name;
         this.iso6391Name = iso6391Name;
-        this.score = score;
+        this.confidenceScore = confidenceScore;
+        this.warnings = warnings;
     }
 
     /**
-     * Get the name property: Long name of a detected language (e.g. English, French).
+     * Get the name property: Long name of a detected language (e.g. English,
+     * French).
      *
-     * @return The name value.
+     * @return the name value.
      */
     public String getName() {
         return this.name;
@@ -53,19 +63,29 @@ public String getName() {
      * Get the iso6391Name property: A two letter representation of the
      * detected language according to the ISO 639-1 standard (e.g. en, fr).
      *
-     * @return The iso6391Name value.
+     * @return the iso6391Name value.
      */
     public String getIso6391Name() {
         return this.iso6391Name;
     }
 
     /**
-     * Get the score property: A confidence score between 0 and 1. Scores close
-     * to 1 indicate 100% certainty that the identified language is true.
+     * Get the confidenceScore property: A confidence score between 0 and 1.
+     * Scores close to 1 indicate 100% certainty that the identified language
+     * is true.
+     *
+     * @return the confidenceScore value.
+     */
+    public double getConfidenceScore() {
+        return this.confidenceScore;
+    }
+
+    /**
+     * Get the {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
      *
-     * @return The score value.
+     * @return {@link IterableStream} of {@link TextAnalyticsWarning}.
      */
-    public double getScore() {
-        return this.score;
+    public IterableStream<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentSentiment.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentSentiment.java
index a53653fb052a..39db850edbe8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentSentiment.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentSentiment.java
@@ -7,34 +7,37 @@
 import com.azure.core.util.IterableStream;
 
 /**
- * The {@link DocumentSentiment} model that contains sentiment label of a document, confidence score of the sentiment
- * label, and a list of {@link SentenceSentiment}.
+ * The {@link DocumentSentiment} model that contains sentiment label of a document, confidence score of the
+ * sentiment label, and a list of {@link SentenceSentiment}.
  */
 @Immutable
 public final class DocumentSentiment {
     private final TextSentiment sentiment;
     private final SentimentConfidenceScores confidenceScores;
-    private final IterableStream<SentenceSentiment> sentences;
+    private final IterableStream<com.azure.ai.textanalytics.models.SentenceSentiment> sentences;
+    private final IterableStream<TextAnalyticsWarning> warnings;
 
     /**
      * Creates a {@link DocumentSentiment} model that describes the sentiment of the document.
      *
-     * @param sentiment the sentiment label of the document.
-     * @param confidenceScores the sentiment confidence score (Softmax score) between 0 and 1, for each sentiment label.
+     * @param sentiment The sentiment label of the document.
+     * @param confidenceScores The sentiment confidence score (Softmax score) between 0 and 1, for each sentiment label.
      *   Higher values signify higher confidence.
-     * @param sentences a list of sentence sentiments.
+     * @param sentences An {@link IterableStream} of sentence sentiments.
+     * @param warnings An {@link IterableStream} of {@link TextAnalyticsWarning}.
      */
     public DocumentSentiment(TextSentiment sentiment, SentimentConfidenceScores confidenceScores,
-        IterableStream<SentenceSentiment> sentences) {
+        IterableStream<SentenceSentiment> sentences, IterableStream<TextAnalyticsWarning> warnings) {
         this.sentiment = sentiment;
         this.confidenceScores = confidenceScores;
         this.sentences = sentences;
+        this.warnings = warnings;
     }
 
     /**
      * Get the text sentiment label: POSITIVE, NEGATIVE, NEUTRAL, or MIXED.
      *
-     * @return the {@link TextSentiment}.
+     * @return The {@link TextSentiment}.
      */
     public TextSentiment getSentiment() {
         return sentiment;
@@ -44,7 +47,7 @@ public TextSentiment getSentiment() {
      * Get the sentiment confidence score (Softmax score) between 0 and 1, for each sentiment label.
      * Higher values signify higher confidence.
      *
-     * @return the {@link SentimentConfidenceScores}.
+     * @return The {@link SentimentConfidenceScores}.
      */
     public SentimentConfidenceScores getConfidenceScores() {
         return confidenceScores;
@@ -53,9 +56,18 @@ public SentimentConfidenceScores getConfidenceScores() {
     /**
      * Get a list of sentence sentiments.
      *
-     * @return a list of sentence sentiments.
+     * @return A list of sentence sentiments.
      */
     public IterableStream<SentenceSentiment> getSentences() {
         return sentences;
     }
+
+    /**
+     * Get the {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
+     *
+     * @return An {@link IterableStream} of {@link TextAnalyticsWarning}.
+     */
+    public IterableStream<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/EntityCategory.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/EntityCategory.java
index a3d43aff1b2d..5d412ae6b1af 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/EntityCategory.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/EntityCategory.java
@@ -14,6 +14,10 @@
  */
 @Immutable
 public final class EntityCategory extends ExpandableStringEnum<EntityCategory> {
+    /**
+     * Specifies that the entity corresponds to an address.
+     */
+    public static final EntityCategory ADDRESS = fromString("Address");
 
     /**
      * Specifies that the entity corresponds to a person.
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/ExtractKeyPhraseResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/ExtractKeyPhraseResult.java
index d0da80f5a190..7b472d40764d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/ExtractKeyPhraseResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/ExtractKeyPhraseResult.java
@@ -4,16 +4,13 @@
 package com.azure.ai.textanalytics.models;
 
 import com.azure.core.annotation.Immutable;
-import com.azure.core.util.IterableStream;
-
-import java.util.ArrayList;
 
 /**
  * The {@link ExtractKeyPhraseResult} model.
  */
 @Immutable
-public final class ExtractKeyPhraseResult extends DocumentResult {
-    private final IterableStream<String> keyPhrases;
+public final class ExtractKeyPhraseResult extends TextAnalyticsResult {
+    private final KeyPhrasesCollection keyPhrases;
 
     /**
      * Create a {@link ExtractKeyPhraseResult} model that describes extracted key phrases result.
@@ -21,20 +18,20 @@ public final class ExtractKeyPhraseResult extends DocumentResult {
      * @param id Unique, non-empty document identifier.
      * @param textDocumentStatistics The text document statistics.
      * @param error The document error.
-     * @param keyPhrases A list of key phrases string.
+     * @param keyPhrases A {@link KeyPhrasesCollection} contains a list of key phrases and warnings.
      */
     public ExtractKeyPhraseResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error, IterableStream<String> keyPhrases) {
+                                  TextAnalyticsError error, KeyPhrasesCollection keyPhrases) {
         super(id, textDocumentStatistics, error);
-        this.keyPhrases = keyPhrases == null ? new IterableStream<>(new ArrayList<>()) : keyPhrases;
+        this.keyPhrases = keyPhrases;
     }
 
     /**
-     * Get a list of key phrase string.
+     * Get a {@link KeyPhrasesCollection} contains a list of key phrases and warnings.
      *
-     * @return A list of key phrase string.
+     * @return A {@link KeyPhrasesCollection} contains a list of key phrases and warnings.
      */
-    public IterableStream<String> getKeyPhrases() {
+    public KeyPhrasesCollection getKeyPhrases() {
         throwExceptionIfError();
         return keyPhrases;
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/KeyPhrasesCollection.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/KeyPhrasesCollection.java
new file mode 100644
index 000000000000..c6a3df127411
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/KeyPhrasesCollection.java
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.IterableStream;
+
+/**
+ * The {@link KeyPhrasesCollection} model.
+ */
+@Immutable
+public final class KeyPhrasesCollection extends IterableStream<String> {
+    private final IterableStream<TextAnalyticsWarning> warnings;
+
+    /**
+     * Creates a {@link KeyPhrasesCollection} model that describes a key phrases collection including warnings.
+     *
+     * @param keyPhrases An {@link IterableStream} of key phrases.
+     * @param warnings An {@link IterableStream} of {@link TextAnalyticsWarning warnings}.
+     */
+    public KeyPhrasesCollection(IterableStream<String> keyPhrases, IterableStream<TextAnalyticsWarning> warnings) {
+        super(keyPhrases);
+        this.warnings = warnings;
+    }
+
+    /**
+     * Get the {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
+     *
+     * @return {@link IterableStream} of {@link TextAnalyticsWarning}.
+     */
+    public IterableStream<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntity.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntity.java
index c8bbc9dfed22..de01b414b922 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntity.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntity.java
@@ -19,7 +19,7 @@ public final class LinkedEntity {
     /*
      * List of instances this entity appears in the text.
      */
-    private final IterableStream<LinkedEntityMatch> linkedEntityMatches;
+    private final IterableStream<LinkedEntityMatch> matches;
 
     /*
      * Language used in the data source.
@@ -45,16 +45,16 @@ public final class LinkedEntity {
      * Creates a {@link LinkedEntity} model that describes linked entity.
      *
      * @param name The entity Linking formal name.
-     * @param linkedEntityMatches A list of instances this entity appears in the text.
+     * @param matches A list of instances this entity appears in the text.
      * @param language The language used in the data source.
      * @param dataSourceEntityId Unique identifier of the recognized entity from the data source.
      * @param url URL for the entity's page from the data source.
      * @param dataSource The data source used to extract entity linking, such as Wiki/Bing etc.
      */
-    public LinkedEntity(String name, IterableStream<LinkedEntityMatch> linkedEntityMatches, String language,
-        String dataSourceEntityId, String url, String dataSource) {
+    public LinkedEntity(String name, IterableStream<LinkedEntityMatch> matches, String language,
+                        String dataSourceEntityId, String url, String dataSource) {
         this.name = name;
-        this.linkedEntityMatches = linkedEntityMatches;
+        this.matches = matches;
         this.language = language;
         this.dataSourceEntityId = dataSourceEntityId;
         this.url = url;
@@ -71,12 +71,12 @@ public String getName() {
     }
 
     /**
-     * Get the linkedEntityMatches property: List of instances this entity appears in the text.
+     * Get the linked entities matched property: List of instances this entity appears in the text.
      *
-     * @return The linkedEntityMatches value.
+     * @return The linked entities matched value.
      */
-    public IterableStream<LinkedEntityMatch> getLinkedEntityMatches() {
-        return this.linkedEntityMatches;
+    public IterableStream<LinkedEntityMatch> getMatches() {
+        return this.matches;
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityCollection.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityCollection.java
new file mode 100644
index 000000000000..5009d6340359
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityCollection.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.IterableStream;
+
+/**
+ * The {@link LinkedEntityCollection} model.
+ */
+@Immutable
+public final class LinkedEntityCollection extends IterableStream<LinkedEntity> {
+    private final IterableStream<TextAnalyticsWarning> warnings;
+
+    /**
+     * Creates a {@link LinkedEntityCollection} model that describes a linked entities collection including warnings.
+     *
+     * @param entities An {@link IterableStream} of {@link LinkedEntity linked entities}.
+     * @param warnings An {@link IterableStream} of {@link TextAnalyticsWarning warnings}.
+     */
+    public LinkedEntityCollection(IterableStream<LinkedEntity> entities,
+                                  IterableStream<TextAnalyticsWarning> warnings) {
+        super(entities);
+        this.warnings = warnings;
+    }
+
+    /**
+     * Get the {@link IterableStream} of {@link TextAnalyticsWarning Text Analytics warnings}.
+     *
+     * @return {@link IterableStream} of {@link TextAnalyticsWarning}.
+     */
+    public IterableStream<TextAnalyticsWarning> getWarnings() {
+        return this.warnings;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityMatch.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityMatch.java
index ef5711f37f91..19e69b190c40 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityMatch.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/LinkedEntityMatch.java
@@ -21,30 +21,16 @@ public final class LinkedEntityMatch {
      */
     private final String text;
 
-    /*
-     * Grapheme start position for the entity match text.
-     */
-    private final int graphemeOffset;
-
-    /*
-     * Grapheme length for the entity match text.
-     */
-    private final int graphemeLength;
-
     /**
      * Creates a {@link LinkedEntityMatch} model that describes linked entity match.
      *
      * @param text The entity text as appears in the request.
      * @param confidenceScore If a well-known item is recognized, a decimal number denoting the
      * confidence level between 0 and 1 will be returned.
-     * @param graphemeOffset Grapheme start position for the entity match text.
-     * @param graphemeLength Grapheme length for the entity match text.
      */
-    public LinkedEntityMatch(String text, double confidenceScore, int graphemeOffset, int graphemeLength) {
+    public LinkedEntityMatch(String text, double confidenceScore) {
         this.text = text;
         this.confidenceScore = confidenceScore;
-        this.graphemeOffset = graphemeOffset;
-        this.graphemeLength = graphemeLength;
     }
 
     /**
@@ -65,22 +51,4 @@ public double getConfidenceScore() {
     public String getText() {
         return this.text;
     }
-
-    /**
-     * Get the offset property: Grapheme start position for the entity match text.
-     *
-     * @return The offset value.
-     */
-    public int getGraphemeOffset() {
-        return this.graphemeOffset;
-    }
-
-    /**
-     * Get the length property: Grapheme Length for the entity match text.
-     *
-     * @return The length value.
-     */
-    public int getGraphemeLength() {
-        return this.graphemeLength;
-    }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeCategorizedEntitiesResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeCategorizedEntitiesResult.java
deleted file mode 100644
index 767b1c2fe53e..000000000000
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeCategorizedEntitiesResult.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.ai.textanalytics.models;
-
-import com.azure.core.annotation.Immutable;
-import com.azure.core.util.IterableStream;
-
-import java.util.ArrayList;
-
-/**
- * The {@link RecognizeCategorizedEntitiesResult} model.
- */
-@Immutable
-public final class RecognizeCategorizedEntitiesResult extends DocumentResult {
-    private final IterableStream<CategorizedEntity> entities;
-
-    /**
-     * Creates a {@link RecognizeCategorizedEntitiesResult} model that describes recognized entities result.
-     *
-     * @param id Unique, non-empty document identifier.
-     * @param textDocumentStatistics The text document statistics.
-     * @param error The document error.
-     * @param entities An {@link IterableStream} of {@link CategorizedEntity}.
-     */
-    public RecognizeCategorizedEntitiesResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error, IterableStream<CategorizedEntity> entities) {
-        super(id, textDocumentStatistics, error);
-        this.entities = entities == null ? new IterableStream<>(new ArrayList<>()) : entities;
-    }
-
-    /**
-     * Get an {@link IterableStream} of {@link CategorizedEntity}.
-     *
-     * @return An {@link IterableStream} of {@link CategorizedEntity}.
-     */
-    public IterableStream<CategorizedEntity> getEntities() {
-        throwExceptionIfError();
-        return entities;
-    }
-}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeEntitiesResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeEntitiesResult.java
new file mode 100644
index 000000000000..12e0c94a1318
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeEntitiesResult.java
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.IterableStream;
+
+/**
+ * The {@link RecognizeEntitiesResult} model.
+ */
+@Immutable
+public final class RecognizeEntitiesResult extends TextAnalyticsResult {
+    private final CategorizedEntityCollection entities;
+
+    /**
+     * Creates a {@link RecognizeEntitiesResult} model that describes recognized entities result.
+     *
+     * @param id Unique, non-empty document identifier.
+     * @param textDocumentStatistics The text document statistics.
+     * @param error The document error.
+     * @param entities A {@link CategorizedEntityCollection} contains entities and warnings.
+     */
+    public RecognizeEntitiesResult(String id, TextDocumentStatistics textDocumentStatistics,
+                                   TextAnalyticsError error, CategorizedEntityCollection entities) {
+        super(id, textDocumentStatistics, error);
+        this.entities = entities;
+    }
+
+    /**
+     * Get an {@link IterableStream} of {@link CategorizedEntity}.
+     *
+     * @return An {@link IterableStream} of {@link CategorizedEntity}.
+     */
+    public CategorizedEntityCollection getEntities() {
+        throwExceptionIfError();
+        return entities;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeLinkedEntitiesResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeLinkedEntitiesResult.java
index 6014fd87a844..a6721ef5f018 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeLinkedEntitiesResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/RecognizeLinkedEntitiesResult.java
@@ -6,14 +6,12 @@
 import com.azure.core.annotation.Immutable;
 import com.azure.core.util.IterableStream;
 
-import java.util.ArrayList;
-
 /**
  * The {@link RecognizeLinkedEntitiesResult} model.
  */
 @Immutable
-public final class RecognizeLinkedEntitiesResult extends DocumentResult {
-    private final IterableStream<LinkedEntity> entities;
+public final class RecognizeLinkedEntitiesResult extends TextAnalyticsResult {
+    private final LinkedEntityCollection entities;
 
     /**
      * Creates a {@link RecognizeLinkedEntitiesResult} model that describes recognized linked entities result.
@@ -21,12 +19,12 @@ public final class RecognizeLinkedEntitiesResult extends DocumentResult {
      * @param id Unique, non-empty document identifier.
      * @param textDocumentStatistics The text document statistics.
      * @param error The document error.
-     * @param entities An {@link IterableStream} of {@link LinkedEntity}.
+     * @param entities A {@link LinkedEntityCollection} contains entities and warnings.
      */
     public RecognizeLinkedEntitiesResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error, IterableStream<LinkedEntity> entities) {
+                                         TextAnalyticsError error, LinkedEntityCollection entities) {
         super(id, textDocumentStatistics, error);
-        this.entities = entities == null ? new IterableStream<>(new ArrayList<>()) : entities;
+        this.entities = entities;
     }
 
     /**
@@ -34,7 +32,7 @@ public RecognizeLinkedEntitiesResult(String id, TextDocumentStatistics textDocum
      *
      * @return An {@link IterableStream} of {@link LinkedEntity}.
      */
-    public IterableStream<LinkedEntity> getEntities() {
+    public LinkedEntityCollection getEntities() {
         throwExceptionIfError();
         return entities;
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/SentenceSentiment.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/SentenceSentiment.java
index d8f1394d1961..636739209fe9 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/SentenceSentiment.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/SentenceSentiment.java
@@ -6,49 +6,36 @@
 import com.azure.core.annotation.Immutable;
 
 /**
- * The {@link SentenceSentiment} model that contains a sentiment label of a sentence, confidence score of the sentiment
- * label, length of the sentence and offset of the sentence within a document.
+ * The {@link SentenceSentiment} model that contains a sentiment label of a sentence, confidence score of the
+ * sentiment label, length of the sentence and offset of the sentence within a document.
  */
 @Immutable
 public final class SentenceSentiment {
-    private final int graphemeLength;
-    private final int graphemeOffset;
+    private final String text;
     private final SentimentConfidenceScores confidenceScores;
     private final TextSentiment sentiment;
 
     /**
      * Creates a {@link SentenceSentiment} model that describes the sentiment analysis of sentence.
      *
+     * @param text The sentence text
      * @param sentiment The sentiment label of the sentence.
      * @param confidenceScores The sentiment confidence score (Softmax score) between 0 and 1, for each sentiment label.
      *   Higher values signify higher confidence.
-     * @param graphemeLength The grapheme length of the sentence.
-     * @param graphemeOffset The grapheme offset, start position for the sentence sentiment.
      */
-    public SentenceSentiment(TextSentiment sentiment, SentimentConfidenceScores confidenceScores,
-        int graphemeLength, int graphemeOffset) {
+    public SentenceSentiment(String text, TextSentiment sentiment, SentimentConfidenceScores confidenceScores) {
+        this.text = text;
         this.sentiment = sentiment;
         this.confidenceScores = confidenceScores;
-        this.graphemeLength = graphemeLength;
-        this.graphemeOffset = graphemeOffset;
     }
 
     /**
-     * Get the grapheme length of the sentence.
+     * Get the sentence text property.
      *
-     * @return The grapheme length of the sentence.
+     * @return the text value.
      */
-    public int getGraphemeLength() {
-        return graphemeLength;
-    }
-
-    /**
-     * Get the grapheme offset property: start position for the sentence sentiment.
-     *
-     * @return The grapheme offset of sentence sentiment.
-     */
-    public int getGraphemeOffset() {
-        return graphemeOffset;
+    public String getText() {
+        return this.text;
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsError.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsError.java
index 09cd79d43804..0e805491b510 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsError.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsError.java
@@ -47,7 +47,7 @@ public TextAnalyticsError(TextAnalyticsErrorCode code, String message, String ta
      *
      * @return The code value.
      */
-    public TextAnalyticsErrorCode getCode() {
+    public TextAnalyticsErrorCode getErrorCode() {
         return this.code;
     }
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsException.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsException.java
index 1270c30616a6..1ac570432dab 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsException.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsException.java
@@ -55,7 +55,7 @@ public String getTarget() {
      *
      * @return The {@link TextAnalyticsErrorCode} for this exception.
      */
-    public TextAnalyticsErrorCode getCode() {
+    public TextAnalyticsErrorCode getErrorCode() {
         return TextAnalyticsErrorCode.fromString(code);
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentResult.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsResult.java
similarity index 81%
rename from sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentResult.java
rename to sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsResult.java
index a1e679a095ff..8c6fadfcf97b 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/DocumentResult.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsResult.java
@@ -8,11 +8,11 @@
 import java.util.Locale;
 
 /**
- * The {@link DocumentResult} model.
+ * The {@link TextAnalyticsResult} model.
  */
 @Immutable
-public class DocumentResult {
-    private final ClientLogger logger = new ClientLogger(DocumentResult.class);
+public class TextAnalyticsResult {
+    private final ClientLogger logger = new ClientLogger(TextAnalyticsResult.class);
 
     private final String id;
     private final TextDocumentStatistics textDocumentStatistics;
@@ -20,15 +20,14 @@ public class DocumentResult {
     private final boolean isError;
 
     /**
-     * Create a {@link DocumentResult} model that maintains document id, information about the document payload,
-     * and document error.
+     * Create a {@link TextAnalyticsResult} model that maintains document id, information about the document
+     * payload, and document error.
      *
      * @param id Unique, non-empty document identifier.
      * @param textDocumentStatistics The text document statistics.
      * @param error The document error.
      */
-    DocumentResult(String id, TextDocumentStatistics textDocumentStatistics,
-        TextAnalyticsError error) {
+    TextAnalyticsResult(String id, TextDocumentStatistics textDocumentStatistics, TextAnalyticsError error) {
         this.id = id;
         this.error = error;
         this.isError = error != null;
@@ -81,7 +80,7 @@ void throwExceptionIfError() {
                 String.format(Locale.ROOT,
                     "Error in accessing the property on document id: %s, when %s returned with an error: %s",
                     this.id, this.getClass().getSimpleName(), this.error.getMessage()),
-                this.error.getCode().toString(), null));
+                this.error.getErrorCode().toString(), null));
         }
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsWarning.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsWarning.java
new file mode 100644
index 000000000000..317e89434165
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextAnalyticsWarning.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+
+/**
+ * The {@link TextAnalyticsWarning} model.
+ */
+@Immutable
+public final class TextAnalyticsWarning {
+    /*
+     * Warning error code.
+     */
+    private final WarningCode code;
+
+    /*
+     * Warning message.
+     */
+    private final String message;
+
+    /**
+     * Creates a {@link TextAnalyticsWarning} model that describes text analytics warning.
+     *
+     * @param code The warning code value
+     * @param message The warning message.
+     */
+    public TextAnalyticsWarning(WarningCode code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * Get the warning code property: warning code, such as 'LongWordsInDocument'.
+     *
+     * @return the warning code value.
+     */
+    public WarningCode getWarningCode() {
+        return this.code;
+    }
+
+    /**
+     * Get the message property: Warning message.
+     *
+     * @return the message value.
+     */
+    public String getMessage() {
+        return this.message;
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentBatchStatistics.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentBatchStatistics.java
index 9c115c4caae7..2e0c425a16b4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentBatchStatistics.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentBatchStatistics.java
@@ -44,7 +44,7 @@ public final class TextDocumentBatchStatistics {
      * @param transactionCount The number of transactions for the request.
      */
     public TextDocumentBatchStatistics(int documentCount, int validDocumentCount, int invalidDocumentCount,
-        long transactionCount) {
+                                       long transactionCount) {
         this.documentCount = documentCount;
         this.validDocumentCount = validDocumentCount;
         this.invalidDocumentCount = invalidDocumentCount;
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentInput.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentInput.java
index 26bb677144ad..4c1c134f0842 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentInput.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentInput.java
@@ -3,14 +3,11 @@
 
 package com.azure.ai.textanalytics.models;
 
-import com.azure.core.annotation.Immutable;
-
 import java.util.Locale;
 
 /**
  * Contains an input document to be analyzed by the service.
  */
-@Immutable
 public final class TextDocumentInput {
 
     /*
@@ -28,7 +25,7 @@ public final class TextDocumentInput {
      * For example, use "en" for English; "es" for Spanish etc. If not set, use
      * "en" for English as default.
      */
-    private final String language;
+    private String language;
 
     /**
      * Creates a {@code TextDocumentInput} model that describes the documents.
@@ -37,20 +34,8 @@ public final class TextDocumentInput {
      * @param text The document to process.
      */
     public TextDocumentInput(String id, String text) {
-        this(id, text, null);
-    }
-
-    /**
-     * Creates a {@link TextDocumentInput} model that describes the documents.
-     *
-     * @param id A unique, non-empty document identifier.
-     * @param text The document to process.
-     * @param language Optional. This is the 2 letter ISO 639-1 representation of a language.
-     */
-    public TextDocumentInput(String id, String text, String language) {
         this.id = id;
         this.text = text;
-        this.language = language;
     }
 
     /**
@@ -82,6 +67,20 @@ public String getLanguage() {
         return this.language;
     }
 
+    /**
+     * Set the language property: (Optional) This is the 2 letter ISO 639-1
+     * representation of a language. For example, use "en" for English; "es"
+     * for Spanish etc. If not set, use "en" for English as default.
+     *
+     * @param language Optional. This is the 2 letter ISO 639-1 representation of a language.
+     *
+     * @return The object {@link TextDocumentInput} itself.
+     */
+    public TextDocumentInput setLanguage(String language) {
+        this.language = language;
+        return this;
+    }
+
     @Override
     public String toString() {
         return String.format(Locale.ROOT, "Text = %s, Id = %s, Language = %s",
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentStatistics.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentStatistics.java
index 4aa577557f94..43ab68da1bd8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentStatistics.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/TextDocumentStatistics.java
@@ -14,7 +14,7 @@ public final class TextDocumentStatistics {
     /*
      * Number of text elements recognized in the document.
      */
-    private final int graphemeCount;
+    private final int characterCount;
 
     /*
      * Number of transactions for the document.
@@ -24,21 +24,21 @@ public final class TextDocumentStatistics {
     /**
      * Creates a {@link TextDocumentStatistics} model that describes the statistics of text document.
      *
-     * @param graphemeCount The number of text elements recognized in the document.
+     * @param characterCount The number of text elements recognized in the document.
      * @param transactionCount The number of transactions for the document.
      */
-    public TextDocumentStatistics(int graphemeCount, int transactionCount) {
-        this.graphemeCount = graphemeCount;
+    public TextDocumentStatistics(int characterCount, int transactionCount) {
+        this.characterCount = characterCount;
         this.transactionCount = transactionCount;
     }
 
     /**
-     * Get the {@code graphemeCount} property: Number of text elements recognized in the document.
+     * Get the {@code characterCount} property: Number of text elements recognized in the document.
      *
-     * @return The {@code graphemeCount} value.
+     * @return The {@code characterCount} value.
      */
-    public int getGraphemeCount() {
-        return this.graphemeCount;
+    public int getCharacterCount() {
+        return this.characterCount;
     }
 
     /**
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/WarningCode.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/WarningCode.java
new file mode 100644
index 000000000000..ce3e3e17d26e
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/models/WarningCode.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.ai.textanalytics.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+ * Defines values for {@link WarningCode}.
+ */
+@Immutable
+public final class WarningCode extends ExpandableStringEnum<WarningCode> {
+    /**
+     * Static value LongWordsInDocument for {@link WarningCode}.
+     */
+    public static final WarningCode LONG_WORDS_IN_DOCUMENT = fromString("LongWordsInDocument");
+
+    /**
+     * Static value DocumentTruncated for {@link WarningCode}.
+     */
+    public static final WarningCode DOCUMENT_TRUNCATED = fromString("DocumentTruncated");
+
+    /**
+     * Creates or finds a {@link WarningCode} from its string representation.
+     *
+     * @param name A name to look for.
+     * @return The corresponding {@link WarningCode}.
+     */
+    @JsonCreator
+    public static WarningCode fromString(String name) {
+        return fromString(name, WarningCode.class);
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/package-info.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/package-info.java
index 6a74fe88bbba..b5689afdf224 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/package-info.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/package-info.java
@@ -1,7 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
 /**
- * Package containing classes for creating a {@link com.azure.ai.textanalytics.TextAnalyticsClient} to
- * perform operations on Azure Text Analytics
+ * Package containing the classes for TextAnalyticsClient.
+ * The Text Analytics API is a suite of text analytics web services built with
+ * best-in-class Microsoft machine learning algorithms. The API can be used to
+ * analyze unstructured text for tasks such as sentiment analysis, key phrase
+ * extraction and language detection. No training data is needed to use this
+ * API; just bring your text data. This API uses advanced natural language
+ * processing techniques to deliver best in class predictions. Further
+ * documentation can be found in
+ * https://docs.microsoft.com/en-us/azure/cognitive-services/text-analytics/overview.
  */
 package com.azure.ai.textanalytics;
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/module-info.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/module-info.java
index 6aa1d9797d06..1712b699caea 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/module-info.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/module-info.java
@@ -10,5 +10,5 @@
 
     opens com.azure.ai.textanalytics.implementation to com.fasterxml.jackson.databind;
     opens com.azure.ai.textanalytics.models to com.fasterxml.jackson.databind;
-    opens com.azure.ai.textanalytics.implementation.models to com.fasterxml.jackson.databind;
+    opens com.azure.ai.textanalytics.implementation.models to com.fasterxml.jackson.databind, com.azure.core;
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
index 31366ed43a82..c8da3bca0d22 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
@@ -26,7 +26,7 @@ public static void main(String[] args) {
         String document = "hello world";
 
         final DetectedLanguage detectedLanguage = client.detectLanguage(document);
-        System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+        System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
index a4fc692a651a..c6a211256169 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguageAsync.java
@@ -27,8 +27,8 @@ public static void main(String[] args) {
         String document = "hello world";
 
         client.detectLanguage(document).subscribe(
-            result -> System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-                result.getName(), result.getIso6391Name(), result.getScore()),
+            result -> System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                result.getName(), result.getIso6391Name(), result.getConfidenceScore()),
             error -> System.err.println("There was an error detecting language of the text." + error),
             () -> System.out.println("Language detected."));
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
index 3a30b3c8b9ec..de08ebd1aea1 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ReadmeSamples.java
@@ -112,8 +112,8 @@ public void analyzeSentiment() {
     public void detectLanguages() {
         String document = "Bonjour tout le monde";
         DetectedLanguage detectedLanguage = textAnalyticsClient.detectLanguage(document);
-        System.out.printf("Detected language name: %s, ISO 6391 name: %s, score: %f.%n",
-            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+        System.out.printf("Detected language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
     }
 
     /**
@@ -122,8 +122,8 @@ public void detectLanguages() {
     public void recognizeEntity() {
         String document = "Satya Nadella is the CEO of Microsoft";
         textAnalyticsClient.recognizeEntities(document).forEach(entity ->
-            System.out.printf("Recognized entity: %s, category: %s, subCategory: %s, score: %f.%n",
-                entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+            System.out.printf("Recognized entity: %s, category: %s, subcategory: %s, confidence score: %f.%n",
+                entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
     }
 
     /**
@@ -135,8 +135,8 @@ public void recognizeLinkedEntity() {
             System.out.println("Linked Entities:");
             System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(), linkedEntity.getDataSource());
-            linkedEntity.getLinkedEntityMatches().forEach(linkedEntityMatch ->
-                System.out.printf("Text: %s, score: %f.%n", linkedEntityMatch.getText(), linkedEntityMatch.getConfidenceScore()));
+            linkedEntity.getMatches().forEach(match ->
+                System.out.printf("Text: %s, confidence score: %f.%n", match.getText(), match.getConfidenceScore()));
         });
     }
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
index 3ceb99fcea66..a5d8dd896ce3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntities.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
         String document = "Satya Nadella is the CEO of Microsoft";
 
         client.recognizeEntities(document).forEach(entity -> System.out.printf(
-            "Recognized categorized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-            entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+            "Recognized categorized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+            entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
index 1e66ef5b36a5..b70ba3ac2551 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeEntitiesAsync.java
@@ -27,11 +27,13 @@ public static void main(String[] args) {
         String document = "Satya Nadella is the CEO of Microsoft";
 
         client.recognizeEntities(document).subscribe(
-            entity -> System.out.printf(
-                "Recognized categorized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()),
+            entityCollection -> entityCollection.forEach(entity -> System.out.printf(
+                "Recognized categorized entity: %s, entity category: %s, entity subcategory: %s,"
+                    + " confidence score: %f.%n",
+                entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore())),
             error -> System.err.println("There was an error recognizing entities of the text." + error),
-            () -> System.out.println("Entities recognized."));
+            () -> System.out.println("Entities recognized.")
+        );
 
         // The .subscribe() creation and assignment is not a blocking call. For the purpose of this example, we sleep
         // the thread so the program does not end before the send operation is complete. Using .block() instead of
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
index 08bab97c57f6..382b0bf44fd6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntities.java
@@ -29,8 +29,9 @@ public static void main(String[] args) {
             System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                 linkedEntity.getDataSource());
-            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+            linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                "Matched entity: %s, confidence score: %f.%n",
+                entityMatch.getText(), entityMatch.getConfidenceScore()));
         });
     }
 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
index 5d533dad4d69..4365a11684c4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/RecognizeLinkedEntitiesAsync.java
@@ -27,14 +27,15 @@ public static void main(String[] args) {
         String document = "Old Faithful is a geyser at Yellowstone Park.";
 
         client.recognizeLinkedEntities(document).subscribe(
-            linkedEntity -> {
+            linkedEntityCollection -> linkedEntityCollection.forEach(linkedEntity -> {
                 System.out.println("Linked Entities:");
                 System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                     linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                     linkedEntity.getDataSource());
-                linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                    "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
-            },
+                linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                    "Matched entity: %s, confidence score: %f.%n",
+                    entityMatch.getText(), entityMatch.getConfidenceScore()));
+            }),
             error -> System.err.println("There was an error recognizing linked entity of the text." + error),
             () -> System.out.println("Linked entity recognized."));
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
index 7057181c728b..0aa63768ba5e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientJavaDocCodeSnippets.java
@@ -3,12 +3,12 @@
 
 package com.azure.ai.textanalytics;
 
-import com.azure.ai.textanalytics.models.CategorizedEntity;
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
@@ -17,6 +17,7 @@
 import com.azure.core.credential.AzureKeyCredential;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -65,8 +66,8 @@ public void detectLanguage() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguage#string
         String document = "Bonjour tout le monde";
         textAnalyticsAsyncClient.detectLanguage(document).subscribe(detectedLanguage ->
-            System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore()));
+            System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore()));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguage#string
     }
 
@@ -78,8 +79,8 @@ public void detectLanguageWithCountryHint() {
         String document = "This text is in English";
         String countryHint = "US";
         textAnalyticsAsyncClient.detectLanguage(document, countryHint).subscribe(detectedLanguage ->
-            System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore()));
+            System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore()));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguage#string-string
     }
 
@@ -98,8 +99,9 @@ public void detectLanguageStringList() {
             // Batch result of languages
             for (DetectLanguageResult detectLanguageResult : batchResult.getElements()) {
                 DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                    detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                    detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                    detectedLanguage.getConfidenceScore());
             }
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguageBatch#Iterable
@@ -123,8 +125,9 @@ public void detectLanguageStringListWithCountryHint() {
                 // Batch result of languages
                 for (DetectLanguageResult detectLanguageResult : batchResult.getElements()) {
                     DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                        detectedLanguage.getConfidenceScore());
                 }
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguageBatch#Iterable-String
@@ -148,8 +151,9 @@ public void detectLanguageStringListWithOptions() {
                 // Batch result of languages
                 for (DetectLanguageResult detectLanguageResult : batchResult.getElements()) {
                     DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                        detectedLanguage.getConfidenceScore());
                 }
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguageBatch#Iterable-String-TextAnalyticsRequestOptions
@@ -177,8 +181,9 @@ public void detectBatchLanguagesMaxOverload() {
                 // Batch result of languages
                 for (DetectLanguageResult detectLanguageResult : response.getElements()) {
                     DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, score: %f.%n",
-                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                    System.out.printf("Detected language name: %s, ISO 6391 Name: %s, confidence score: %f.%n",
+                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                        detectedLanguage.getConfidenceScore());
                 }
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.detectLanguageBatch#Iterable-TextAnalyticsRequestOptions
@@ -193,10 +198,11 @@ public void recognizeEntities() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeEntities#string
         String document = "Satya Nadella is the CEO of Microsoft";
         textAnalyticsAsyncClient.recognizeEntities(document)
-            .subscribe(entity -> System.out.printf("Recognized categorized entity: %s, category: %s, score: %f.%n",
+            .subscribe(entityCollection -> entityCollection.forEach(entity ->
+                System.out.printf("Recognized categorized entity: %s, category: %s, confidence score: %f.%n",
                 entity.getText(),
                 entity.getCategory(),
-                entity.getConfidenceScore()));
+                entity.getConfidenceScore())));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeEntities#string
     }
 
@@ -207,10 +213,11 @@ public void recognizeEntitiesWithLanguage() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeEntities#string-string
         String document = "Satya Nadella is the CEO of Microsoft";
         textAnalyticsAsyncClient.recognizeEntities(document, "en")
-            .subscribe(entity -> System.out.printf("Recognized categorized entity: %s, category: %s, score: %f.%n",
+            .subscribe(entityCollection -> entityCollection.forEach(entity ->
+                System.out.printf("Recognized categorized entity: %s, category: %s, confidence score: %f.%n",
                 entity.getText(),
                 entity.getCategory(),
-                entity.getConfidenceScore()));
+                entity.getConfidenceScore())));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeEntities#string-string
     }
 
@@ -232,8 +239,8 @@ public void recognizeEntitiesStringList() {
             // Batch result of categorized entities
             batchResult.getElements().forEach(recognizeEntitiesResult ->
                 recognizeEntitiesResult.getEntities().forEach(entity -> System.out.printf(
-                    "Recognized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                    entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore())));
+                    "Recognized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+                    entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore())));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeCategorizedEntitiesBatch#Iterable
     }
@@ -255,7 +262,7 @@ public void recognizeEntitiesStringListWithLanguageCode() {
                 // Batch Result of entities
                 batchResult.getElements().forEach(recognizeEntitiesResult ->
                     recognizeEntitiesResult.getEntities().forEach(entity -> System.out.printf(
-                        "Recognized categorized entity: %s, category: %s, score: %f.%n",
+                        "Recognized categorized entity: %s, category: %s, confidence score: %f.%n",
                         entity.getText(), entity.getCategory(), entity.getConfidenceScore())));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeCategorizedEntitiesBatch#Iterable-String
@@ -278,7 +285,7 @@ public void recognizeEntitiesStringListWithOptions() {
                 // Batch Result of entities
                 batchResult.getElements().forEach(recognizeEntitiesResult ->
                     recognizeEntitiesResult.getEntities().forEach(entity -> System.out.printf(
-                        "Recognized categorized entity: %s, category: %s, score: %f.%n",
+                        "Recognized categorized entity: %s, category: %s, confidence score: %f.%n",
                             entity.getText(), entity.getCategory(), entity.getConfidenceScore())));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeCategorizedEntitiesBatch#Iterable-String-TextAnalyticsRequestOptions
@@ -291,8 +298,8 @@ public void recognizeEntitiesStringListWithOptions() {
     public void recognizeBatchEntitiesMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeCategorizedEntitiesBatch#Iterable-TextAnalyticsRequestOptions
         List<TextDocumentInput> textDocumentInputs1 = Arrays.asList(
-            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week."),
-            new TextDocumentInput("1", "I work at Microsoft."));
+            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week.").setLanguage("en"),
+            new TextDocumentInput("1", "I work at Microsoft.").setLanguage("en"));
 
         // Request options: show statistics and model version
         TextAnalyticsRequestOptions requestOptions = new TextAnalyticsRequestOptions().setIncludeStatistics(true);
@@ -306,7 +313,7 @@ public void recognizeBatchEntitiesMaxOverload() {
 
                 response.getElements().forEach(recognizeEntitiesResult ->
                     recognizeEntitiesResult.getEntities().forEach(entity -> System.out.printf(
-                        "Recognized categorized entity: %s, category: %s, score: %f.%n",
+                        "Recognized categorized entity: %s, category: %s, confidence score: %f.%n",
                         entity.getText(),
                         entity.getCategory(),
                         entity.getConfidenceScore())));
@@ -323,14 +330,16 @@ public void recognizeLinkedEntities() {
 
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntities#string
         String document = "Old Faithful is a geyser at Yellowstone Park.";
-        textAnalyticsAsyncClient.recognizeLinkedEntities(document).subscribe(linkedEntity -> {
-            System.out.println("Linked Entities:");
-            System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
-                linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
-                linkedEntity.getDataSource());
-            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
-        });
+        textAnalyticsAsyncClient.recognizeLinkedEntities(document).subscribe(
+            linkedEntityCollection -> linkedEntityCollection.forEach(linkedEntity -> {
+                System.out.println("Linked Entities:");
+                System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
+                    linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
+                    linkedEntity.getDataSource());
+                linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                    "Matched entity: %s, confidence score: %f.%n",
+                    entityMatch.getText(), entityMatch.getConfidenceScore()));
+            }));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntities#string
     }
 
@@ -341,15 +350,16 @@ public void recognizeLinkedEntitiesWithLanguage() {
 
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntities#string-string
         String document = "Old Faithful is a geyser at Yellowstone Park.";
-        textAnalyticsAsyncClient.recognizeLinkedEntities(document, "en")
-            .subscribe(linkedEntity -> {
+        textAnalyticsAsyncClient.recognizeLinkedEntities(document, "en").subscribe(
+            linkedEntityCollection -> linkedEntityCollection.forEach(linkedEntity -> {
                 System.out.println("Linked Entities:");
                 System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                     linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                     linkedEntity.getDataSource());
-                linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                    "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
-            });
+                linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                    "Matched entity: %s, confidence score: %f.%n",
+                    entityMatch.getText(), entityMatch.getConfidenceScore()));
+            }));
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntities#string-string
     }
 
@@ -376,8 +386,9 @@ public void recognizeLinkedEntitiesStringList() {
                     System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                         linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                         linkedEntity.getDataSource());
-                    linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                        "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                    linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                        "Matched entity: %s, confidence score: %f.%n",
+                        entityMatch.getText(), entityMatch.getConfidenceScore()));
                 }));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntitiesBatch#Iterable
@@ -408,8 +419,9 @@ public void recognizeLinkedEntitiesStringListWithLanguageCode() {
                         System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                             linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "Matched entity: %s, confidence score: %f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     }));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntitiesBatch#Iterable-String
@@ -439,8 +451,9 @@ public void recognizeLinkedEntitiesStringListWithOptions() {
                         System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                             linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "Matched entity: %s, confidence score: %f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     }));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntitiesBatch#Iterable-String-TextAnalyticsRequestOptions
@@ -453,8 +466,8 @@ public void recognizeLinkedEntitiesStringListWithOptions() {
     public void recognizeBatchLinkedEntitiesMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntitiesBatch#Iterable-TextAnalyticsRequestOptions
         List<TextDocumentInput> textDocumentInputs1 = Arrays.asList(
-            new TextDocumentInput("0", "Old Faithful is a geyser at Yellowstone Park."),
-            new TextDocumentInput("1", "Mount Shasta has lenticular clouds."));
+            new TextDocumentInput("0", "Old Faithful is a geyser at Yellowstone Park.").setLanguage("en"),
+            new TextDocumentInput("1", "Mount Shasta has lenticular clouds.").setLanguage("en"));
 
         // Request options: show statistics and model version
         TextAnalyticsRequestOptions requestOptions = new TextAnalyticsRequestOptions().setIncludeStatistics(true);
@@ -472,8 +485,9 @@ public void recognizeBatchLinkedEntitiesMaxOverload() {
                         System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                             linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "Matched entity: %s, score: %.2f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "Matched entity: %s, confidence score: %.2f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     }));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.recognizeLinkedEntitiesBatch#Iterable-TextAnalyticsRequestOptions
@@ -581,8 +595,8 @@ public void extractKeyPhrasesStringListWithOptions() {
     public void extractBatchKeyPhrasesMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.extractKeyPhrasesBatch#Iterable-TextAnalyticsRequestOptions
         List<TextDocumentInput> textDocumentInputs1 = Arrays.asList(
-            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week."),
-            new TextDocumentInput("1", "I work at Microsoft."));
+            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week.").setLanguage("en"),
+            new TextDocumentInput("1", "I work at Microsoft.").setLanguage("en"));
 
         // Request options: show statistics and model version
         TextAnalyticsRequestOptions requestOptions = new TextAnalyticsRequestOptions().setIncludeStatistics(true);
@@ -752,8 +766,8 @@ public void analyzeSentimentStringListWithOptions() {
     public void analyzeBatchSentimentMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsAsyncClient.analyzeSentimentBatch#Iterable-TextAnalyticsRequestOptions
         List<TextDocumentInput> textDocumentInputs1 = Arrays.asList(
-            new TextDocumentInput("0", "The hotel was dark and unclean."),
-            new TextDocumentInput("1", "The restaurant had amazing gnocchi."));
+            new TextDocumentInput("0", "The hotel was dark and unclean.").setLanguage("en"),
+            new TextDocumentInput("1", "The restaurant had amazing gnocchi.").setLanguage("en"));
 
         // Request options: show statistics and model version
         TextAnalyticsRequestOptions requestOptions = new TextAnalyticsRequestOptions().setIncludeStatistics(true);
@@ -784,8 +798,8 @@ public void analyzeBatchSentimentMaxOverload() {
 
     // Text Analytics Paged flux
     public void textAnalyticsPagedFluxSample() {
-        TextAnalyticsPagedFlux<CategorizedEntity> pagedFlux =
-            textAnalyticsAsyncClient.recognizeEntities("");
+        TextAnalyticsPagedFlux<RecognizeEntitiesResult> pagedFlux =
+            textAnalyticsAsyncClient.recognizeEntitiesBatch(Collections.singletonList(""));
         // BEGIN: com.azure.ai.textanalytics.util.TextAnalyticsPagedFlux.subscribe
         pagedFlux
             .log()
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
index d88c0e6eee6a..e6e08b0fef75 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/TextAnalyticsClientJavaDocCodeSnippets.java
@@ -4,10 +4,11 @@
 package com.azure.ai.textanalytics;
 
 import com.azure.ai.textanalytics.models.CategorizedEntity;
+import com.azure.ai.textanalytics.models.CategorizedEntityCollection;
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
-import com.azure.ai.textanalytics.models.LinkedEntity;
+import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
@@ -20,6 +21,7 @@
 
 import java.net.HttpURLConnection;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -66,8 +68,8 @@ public void createTextAnalyticsClient() {
     public void detectLanguage() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguage#String
         DetectedLanguage detectedLanguage = textAnalyticsClient.detectLanguage("Bonjour tout le monde");
-        System.out.printf("Detected language name: %s, ISO 6391 name: %s, score: %f.%n",
-            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+        System.out.printf("Detected language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguage#String
     }
 
@@ -78,8 +80,8 @@ public void detectLanguageWithCountryHint() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguage#String-String
         DetectedLanguage detectedLanguage = textAnalyticsClient.detectLanguage(
             "This text is in English", "US");
-        System.out.printf("Detected language name: %s, ISO 6391 name: %s, score: %f.%n",
-            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+        System.out.printf("Detected language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguage#String-String
     }
 
@@ -100,8 +102,8 @@ public void detectLanguageStringList() {
 
             response.getElements().forEach(detectLanguageResult -> {
                 DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                System.out.printf("Primary language name: %s, ISO 6391 name: %s, score: %f.%n",
-                    detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                System.out.printf("Primary language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                    detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getConfidenceScore());
             });
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguageBatch#Iterable
@@ -127,8 +129,9 @@ public void detectLanguageStringListWithCountryHint() {
                 response.getElements().forEach(detectLanguageResult -> {
                     System.out.printf("Document ID: %s%n", detectLanguageResult.getId());
                     DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Primary language name: %s, ISO 6391 name: %s, score: %f.%n",
-                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                    System.out.printf("Primary language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                        detectedLanguage.getConfidenceScore());
                 });
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguageBatch#Iterable-String
@@ -154,8 +157,9 @@ public void detectLanguageStringListWithOptions() {
                 response.getElements().forEach(detectLanguageResult -> {
                     System.out.printf("Document ID: %s%n", detectLanguageResult.getId());
                     DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Primary language name: %s, ISO 6391 name: %s, score: %f.%n",
-                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                    System.out.printf("Primary language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                        detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                        detectedLanguage.getConfidenceScore());
                 });
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguageBatch#Iterable-String-TextAnalyticsRequestOptions
@@ -184,8 +188,9 @@ public void detectBatchLanguagesMaxOverload() {
                     response.getElements().forEach(detectLanguageResult -> {
                         System.out.printf("Document ID: %s%n", detectLanguageResult.getId());
                         DetectedLanguage detectedLanguage = detectLanguageResult.getPrimaryLanguage();
-                        System.out.printf("Primary language name: %s, ISO 6391 name: %s, score: %f.%n",
-                            detectedLanguage.getName(), detectedLanguage.getIso6391Name(), detectedLanguage.getScore());
+                        System.out.printf("Primary language name: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                            detectedLanguage.getName(), detectedLanguage.getIso6391Name(),
+                            detectedLanguage.getConfidenceScore());
                     });
                 });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.detectLanguageBatch#Iterable-TextAnalyticsRequestOptions-Context
@@ -198,10 +203,10 @@ public void detectBatchLanguagesMaxOverload() {
      */
     public void recognizeEntities() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeCategorizedEntities#String
-        final TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntitiesResult =
+        final CategorizedEntityCollection recognizeEntitiesResult =
             textAnalyticsClient.recognizeEntities("Satya Nadella is the CEO of Microsoft");
         for (CategorizedEntity entity : recognizeEntitiesResult) {
-            System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+            System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                 entity.getText(), entity.getCategory(), entity.getConfidenceScore());
         }
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeCategorizedEntities#String
@@ -212,11 +217,11 @@ public void recognizeEntities() {
      */
     public void recognizeEntitiesWithLanguage() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeCategorizedEntities#String-String
-        final TextAnalyticsPagedIterable<CategorizedEntity> recognizeEntitiesResult =
+        final CategorizedEntityCollection recognizeEntitiesResult =
             textAnalyticsClient.recognizeEntities("Satya Nadella is the CEO of Microsoft", "en");
 
         for (CategorizedEntity entity : recognizeEntitiesResult) {
-            System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+            System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                 entity.getText(), entity.getCategory(), entity.getConfidenceScore());
         }
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeCategorizedEntities#String-String
@@ -239,7 +244,7 @@ public void recognizeEntitiesStringList() {
 
             response.getElements().forEach(recognizeEntitiesResult ->
                 recognizeEntitiesResult.getEntities().forEach(entity ->
-                    System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+                    System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                         entity.getText(), entity.getCategory(), entity.getConfidenceScore())));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeCategorizedEntitiesBatch#Iterable
@@ -264,7 +269,7 @@ public void recognizeEntitiesStringListWithLanguageCode() {
 
                 response.getElements().forEach(recognizeEntitiesResult ->
                     recognizeEntitiesResult.getEntities().forEach(entity -> {
-                        System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+                        System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                             entity.getText(), entity.getCategory(), entity.getConfidenceScore());
                     }));
             });
@@ -290,7 +295,7 @@ public void recognizeEntitiesStringListWithOptions() {
 
                 response.getElements().forEach(recognizeEntitiesResult ->
                     recognizeEntitiesResult.getEntities().forEach(entity -> {
-                        System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+                        System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                             entity.getText(), entity.getCategory(), entity.getConfidenceScore());
                     }));
             });
@@ -304,8 +309,8 @@ public void recognizeEntitiesStringListWithOptions() {
     public void recognizeBatchEntitiesMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeEntitiesBatch#Iterable-TextAnalyticsRequestOptions-Context
         List<TextDocumentInput> textDocumentInputs = Arrays.asList(
-            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week."),
-            new TextDocumentInput("1", "I work at Microsoft.")
+            new TextDocumentInput("0", "I had a wonderful trip to Seattle last week.").setLanguage("en"),
+            new TextDocumentInput("1", "I work at Microsoft.").setLanguage("en")
         );
 
         textAnalyticsClient.recognizeEntitiesBatch(textDocumentInputs,
@@ -319,7 +324,7 @@ public void recognizeBatchEntitiesMaxOverload() {
 
                         response.getElements().forEach(recognizeEntitiesResult ->
                             recognizeEntitiesResult.getEntities().forEach(entity -> {
-                                System.out.printf("Recognized entity: %s, entity category: %s, score: %f.%n",
+                                System.out.printf("Recognized entity: %s, entity category: %s, confidence score: %f.%n",
                                     entity.getText(), entity.getCategory(), entity.getConfidenceScore());
                             }));
                     });
@@ -339,8 +344,8 @@ public void recognizeLinkedEntities() {
             System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                 linkedEntity.getDataSource());
-            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+            linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                "Matched entity: %s, confidence score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntities#String
     }
@@ -355,8 +360,9 @@ public void recognizeLinkedEntitiesWithLanguage() {
             System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                 linkedEntity.getDataSource());
-            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+            linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                "Matched entity: %s, confidence score: %f.%n",
+                entityMatch.getText(), entityMatch.getConfidenceScore()));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntities#String-String
     }
@@ -382,8 +388,9 @@ public void recognizeLinkedEntitiesStringList() {
                     System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                         linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                         linkedEntity.getDataSource());
-                    linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                        "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                    linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                        "Matched entity: %s, confidence score: %f.%n",
+                        entityMatch.getText(), entityMatch.getConfidenceScore()));
                 }));
         });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntitiesBatch#Iterable
@@ -412,8 +419,9 @@ public void recognizeLinkedEntitiesStringListWithLanguageCode() {
                         System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                             linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "Matched entity: %s, confidence score: %f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     }));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntitiesBatch#Iterable-String
@@ -442,8 +450,9 @@ public void recognizeLinkedEntitiesStringListWithOptions() {
                         System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                             linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "Matched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "Matched entity: %s, confidence score: %f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     }));
             });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntitiesBatch#Iterable-String-TextAnalyticsRequestOptions
@@ -455,8 +464,8 @@ public void recognizeLinkedEntitiesStringListWithOptions() {
     public void recognizeLinkedEntitiesBatchMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntitiesBatch#Iterable-TextAnalyticsRequestOptions-Context
         List<TextDocumentInput> textDocumentInputs = Arrays.asList(
-            new TextDocumentInput("1", "Old Faithful is a geyser at Yellowstone Park.", "en"),
-            new TextDocumentInput("2", "Mount Shasta has lenticular clouds.", "en")
+            new TextDocumentInput("1", "Old Faithful is a geyser at Yellowstone Park.").setLanguage("en"),
+            new TextDocumentInput("2", "Mount Shasta has lenticular clouds.").setLanguage("en")
         );
 
         textAnalyticsClient.recognizeLinkedEntitiesBatch(textDocumentInputs,
@@ -474,8 +483,9 @@ public void recognizeLinkedEntitiesBatchMaxOverload() {
                             System.out.printf("Name: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(),
                                 linkedEntity.getDataSource());
-                            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                                "Matched entity: %s, score: %.2f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                            linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                                "Matched entity: %s, confidence score: %.2f.%n",
+                                entityMatch.getText(), entityMatch.getConfidenceScore()));
                         }));
                 });
         // END: com.azure.ai.textanalytics.TextAnalyticsClient.recognizeLinkedEntitiesBatch#Iterable-TextAnalyticsRequestOptions-Context
@@ -601,8 +611,8 @@ public void extractKeyPhrasesStringListWithOptions() {
     public void extractBatchKeyPhrasesMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.extractKeyPhrasesBatch#Iterable-TextAnalyticsRequestOptions-Context
         List<TextDocumentInput> textDocumentInputs = Arrays.asList(
-            new TextDocumentInput("1", "My cat might need to see a veterinarian.", "en"),
-            new TextDocumentInput("2", "The pitot tube is used to measure airspeed.", "en")
+            new TextDocumentInput("1", "My cat might need to see a veterinarian.").setLanguage("en"),
+            new TextDocumentInput("2", "The pitot tube is used to measure airspeed.").setLanguage("en")
         );
 
         // Extracting batch key phrases
@@ -812,8 +822,8 @@ public void analyzeSentimentStringListWithOptions() {
     public void analyzeBatchSentimentMaxOverload() {
         // BEGIN: com.azure.ai.textanalytics.TextAnalyticsClient.analyzeSentimentBatch#Iterable-TextAnalyticsRequestOptions-Context
         List<TextDocumentInput> textDocumentInputs = Arrays.asList(
-            new TextDocumentInput("1", "The hotel was dark and unclean. The restaurant had amazing gnocchi.", "en"),
-            new TextDocumentInput("2", "The restaurant had amazing gnocchi. The hotel was dark and unclean.", "en")
+            new TextDocumentInput("1", "The hotel was dark and unclean. The restaurant had amazing gnocchi.").setLanguage("en"),
+            new TextDocumentInput("2", "The restaurant had amazing gnocchi. The hotel was dark and unclean.").setLanguage("en")
         );
 
         // Analyzing batch sentiments
@@ -855,13 +865,14 @@ public void analyzeBatchSentimentMaxOverload() {
      * Code snippet for {@Link TextAnalyticsPagedIterable}
      */
     public void textAnalyticsPagedIterableSample() {
-        TextAnalyticsPagedIterable<LinkedEntity> pagedIterable = textAnalyticsClient.recognizeLinkedEntities("");
+        TextAnalyticsPagedIterable<RecognizeLinkedEntitiesResult> pagedIterable =
+            textAnalyticsClient.recognizeLinkedEntitiesBatch(Collections.singleton(""));
         // BEGIN: com.azure.ai.textanalytics.util.TextAnalyticsPagedIterable.stream
         pagedIterable.stream().forEach(item -> System.out.println("Processing item" + item));
         // END: com.azure.ai.textanalytics.util.TextAnalyticsPagedIterable.stream
 
         // BEGIN: com.azure.ai.textanalytics.util.TextAnalyticsPagedIterable.iterator
-        Iterator<LinkedEntity> iterator = pagedIterable.iterator();
+        Iterator<RecognizeLinkedEntitiesResult> iterator = pagedIterable.iterator();
         while (iterator.hasNext()) {
             System.out.println("Processing item" + iterator.next());
         }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
index 114f7a7cd6f8..aa25ed9ae8e4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocuments.java
@@ -37,9 +37,9 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "The hotel was dark and unclean. I wouldn't recommend staying there.", "en"),
-            new TextDocumentInput("B", "The restaurant had amazing gnocchi! The waiters were excellent.", "en"),
-            new TextDocumentInput("C", "The hotel was dark and unclean. The restaurant had amazing gnocchi!", "en")
+            new TextDocumentInput("A", "The hotel was dark and unclean. I wouldn't recommend staying there.").setLanguage("en"),
+            new TextDocumentInput("B", "The restaurant had amazing gnocchi! The waiters were excellent.").setLanguage("en"),
+            new TextDocumentInput("C", "The hotel was dark and unclean. The restaurant had amazing gnocchi!").setLanguage("en")
         );
 
         // Request options: show statistics and model version
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
index 09ed165ffcae..c92228592995 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/AnalyzeSentimentBatchDocumentsAsync.java
@@ -36,9 +36,9 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "The hotel was dark and unclean. I wouldn't recommend staying there.", "en"),
-            new TextDocumentInput("B", "The restaurant had amazing gnocchi! The waiters were excellent.", "en"),
-            new TextDocumentInput("C", "The hotel was dark and unclean. The restaurant had amazing gnocchi!", "en")
+            new TextDocumentInput("A", "The hotel was dark and unclean. I wouldn't recommend staying there.").setLanguage("en"),
+            new TextDocumentInput("B", "The restaurant had amazing gnocchi! The waiters were excellent.").setLanguage("en"),
+            new TextDocumentInput("C", "The hotel was dark and unclean. The restaurant had amazing gnocchi!").setLanguage("en")
         );
 
         // Request options: show statistics and model version
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
index c7e86c1e593f..b3c73f2d635f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocuments.java
@@ -64,8 +64,8 @@ public static void main(String[] args) {
                 } else {
                     // Valid document
                     DetectedLanguage language = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-                        language.getName(), language.getIso6391Name(), language.getScore());
+                    System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                        language.getName(), language.getIso6391Name(), language.getConfidenceScore());
                 }
             }
         });
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
index b0c3ca69e63f..69e8bf721928 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchDocumentsAsync.java
@@ -62,8 +62,8 @@ public static void main(String[] args) {
                     } else {
                         // Valid document
                         DetectedLanguage language = detectLanguageResult.getPrimaryLanguage();
-                        System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-                            language.getName(), language.getIso6391Name(), language.getScore());
+                        System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                            language.getName(), language.getIso6391Name(), language.getConfidenceScore());
                     }
                 }
             },
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
index 755b55d740c3..4dc289feb2af 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocuments.java
@@ -45,8 +45,8 @@ public static void main(String[] args) {
             } else {
                 // Valid document
                 DetectedLanguage language = detectLanguageResult.getPrimaryLanguage();
-                System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-                    language.getName(), language.getIso6391Name(), language.getScore());
+                System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                    language.getName(), language.getIso6391Name(), language.getConfidenceScore());
             }
         });
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
index 7c032136afb6..dd434550f2b8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/DetectLanguageBatchStringDocumentsAsync.java
@@ -47,8 +47,8 @@ public static void main(String[] args) {
                 } else {
                     // Valid document
                     DetectedLanguage language = detectLanguageResult.getPrimaryLanguage();
-                    System.out.printf("Detected primary language: %s, ISO 6391 name: %s, score: %f.%n",
-                        language.getName(), language.getIso6391Name(), language.getScore());
+                    System.out.printf("Detected primary language: %s, ISO 6391 name: %s, confidence score: %f.%n",
+                        language.getName(), language.getIso6391Name(), language.getConfidenceScore());
                 }
             },
             error -> System.err.println("There was an error detecting language of the documents." + error),
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
index 820fe64c0f64..e6d1ab673340 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocuments.java
@@ -35,8 +35,8 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "The food was delicious and there were wonderful staff.", "en"),
-            new TextDocumentInput("B", "The pitot tube is used to measure airspeed.", "en")
+            new TextDocumentInput("A", "The food was delicious and there were wonderful staff.").setLanguage("en"),
+            new TextDocumentInput("B", "The pitot tube is used to measure airspeed.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
index 4fcd9a3c2971..fe6ba490feec 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/ExtractKeyPhrasesBatchDocumentsAsync.java
@@ -34,8 +34,8 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "My cat might need to see a veterinarian.", "en"),
-            new TextDocumentInput("B", "The pitot tube is used to measure airspeed.", "en")
+            new TextDocumentInput("A", "My cat might need to see a veterinarian.").setLanguage("en"),
+            new TextDocumentInput("B", "The pitot tube is used to measure airspeed.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
index 5bbf21d68270..24d2b4b3019c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
@@ -5,7 +5,7 @@
 
 import com.azure.ai.textanalytics.TextAnalyticsClient;
 import com.azure.ai.textanalytics.TextAnalyticsClientBuilder;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
@@ -35,14 +35,14 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "Satya Nadella is the CEO of Microsoft.", "en"),
-            new TextDocumentInput("B", "Elon Musk is the CEO of SpaceX and Tesla.", "en")
+            new TextDocumentInput("A", "Satya Nadella is the CEO of Microsoft.").setLanguage("en"),
+            new TextDocumentInput("B", "Elon Musk is the CEO of SpaceX and Tesla.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
         TextAnalyticsRequestOptions requestOptions = new TextAnalyticsRequestOptions().setIncludeStatistics(true).setModelVersion("latest");
 
-        Iterable<TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult>> entitiesBatchResult =
+        Iterable<TextAnalyticsPagedResponse<RecognizeEntitiesResult>> entitiesBatchResult =
             client.recognizeEntitiesBatch(documents, requestOptions, Context.NONE).iterableByPage();
 
         // Recognizing entities for each document in a batch of documents
@@ -56,7 +56,7 @@ public static void main(String[] args) {
 
             // Recognized entities for each document in a batch of documents
             AtomicInteger counter = new AtomicInteger();
-            for (RecognizeCategorizedEntitiesResult entitiesResult : pagedResponse.getElements()) {
+            for (RecognizeEntitiesResult entitiesResult : pagedResponse.getElements()) {
                 // Recognized entities for each document in a batch of documents
                 System.out.printf("%n%s%n", documents.get(counter.getAndIncrement()));
                 if (entitiesResult.isError()) {
@@ -65,8 +65,8 @@ public static void main(String[] args) {
                 } else {
                     // Valid document
                     entitiesResult.getEntities().forEach(entity -> System.out.printf(
-                        "Recognized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                        entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore())
+                        "Recognized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+                        entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore())
                     );
                 }
             }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
index dc16b89f1ed4..be80414355f2 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocumentsAsync.java
@@ -5,7 +5,7 @@
 
 import com.azure.ai.textanalytics.TextAnalyticsAsyncClient;
 import com.azure.ai.textanalytics.TextAnalyticsClientBuilder;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
@@ -34,8 +34,8 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "Satya Nadella is the CEO of Microsoft.", "en"),
-            new TextDocumentInput("B", "Elon Musk is the CEO of SpaceX and Tesla.", "en")
+            new TextDocumentInput("A", "Satya Nadella is the CEO of Microsoft.").setLanguage("en"),
+            new TextDocumentInput("B", "Elon Musk is the CEO of SpaceX and Tesla.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
@@ -53,7 +53,7 @@ public static void main(String[] args) {
 
                 // Recognized entities for each of documents from a batch of documents
                 AtomicInteger counter = new AtomicInteger();
-                for (RecognizeCategorizedEntitiesResult entitiesResult : pagedResponse.getElements()) {
+                for (RecognizeEntitiesResult entitiesResult : pagedResponse.getElements()) {
                     System.out.printf("%n%s%n", documents.get(counter.getAndIncrement()));
                     if (entitiesResult.isError()) {
                         // Erroneous document
@@ -61,8 +61,8 @@ public static void main(String[] args) {
                     } else {
                         // Valid document
                         entitiesResult.getEntities().forEach(entity -> System.out.printf(
-                            "Recognized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                            entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+                            "Recognized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+                            entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
                     }
                 }
             },
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
index 714dc2a44d61..adc289682058 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocuments.java
@@ -5,7 +5,7 @@
 
 import com.azure.ai.textanalytics.TextAnalyticsClient;
 import com.azure.ai.textanalytics.TextAnalyticsClientBuilder;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.core.credential.AzureKeyCredential;
 
 import java.util.Arrays;
@@ -36,7 +36,7 @@ public static void main(String[] args) {
 
         // Recognizing entities for each document in a batch of documents
         AtomicInteger counter = new AtomicInteger();
-        for (RecognizeCategorizedEntitiesResult entitiesResult : client.recognizeEntitiesBatch(documents, "en")) {
+        for (RecognizeEntitiesResult entitiesResult : client.recognizeEntitiesBatch(documents, "en")) {
             // Recognized entities for each of documents from a batch of documents
             System.out.printf("%nText = %s%n", documents.get(counter.getAndIncrement()));
             if (entitiesResult.isError()) {
@@ -45,8 +45,8 @@ public static void main(String[] args) {
             } else {
                 // Valid document
                 entitiesResult.getEntities().forEach(entity -> System.out.printf(
-                    "Recognized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                    entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+                    "Recognized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+                    entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
             }
         }
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
index 38511aeecf8a..e275eb944cbf 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchStringDocumentsAsync.java
@@ -45,8 +45,8 @@ public static void main(String[] args) {
                 } else {
                     // Valid document
                     entitiesResult.getEntities().forEach(entity -> System.out.printf(
-                        "Recognized entity: %s, entity category: %s, entity sub-category: %s, score: %f.%n",
-                        entity.getText(), entity.getCategory(), entity.getSubCategory(), entity.getConfidenceScore()));
+                        "Recognized entity: %s, entity category: %s, entity subcategory: %s, confidence score: %f.%n",
+                        entity.getText(), entity.getCategory(), entity.getSubcategory(), entity.getConfidenceScore()));
                 }
             },
             error -> System.err.println("There was an error recognizing entities of the documents." + error),
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
index b0e2ebdc23fc..07cf4636dc09 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
@@ -35,8 +35,8 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "Old Faithful is a geyser at Yellowstone Park.", "en"),
-            new TextDocumentInput("B", "Mount Shasta has lenticular clouds.", "en")
+            new TextDocumentInput("A", "Old Faithful is a geyser at Yellowstone Park.").setLanguage("en"),
+            new TextDocumentInput("B", "Mount Shasta has lenticular clouds.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
@@ -54,7 +54,6 @@ public static void main(String[] args) {
             System.out.printf("Documents statistics: document count = %s, erroneous document count = %s, transaction count = %s, valid document count = %s.%n",
                 batchStatistics.getDocumentCount(), batchStatistics.getInvalidDocumentCount(), batchStatistics.getTransactionCount(), batchStatistics.getValidDocumentCount());
 
-
             AtomicInteger counter = new AtomicInteger();
             for (RecognizeLinkedEntitiesResult entitiesResult : pagedResponse.getElements()) {
                 // Recognized linked entities from documents
@@ -68,8 +67,9 @@ public static void main(String[] args) {
                         System.out.println("Linked Entities:");
                         System.out.printf("\tName: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(), linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "\tMatched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "\tMatched entity: %s, confidence score: %f.%n",
+                            entityMatch.getText(), entityMatch.getConfidenceScore()));
                     });
                 }
             }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
index ad08aed75cd7..0f2266ba5067 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocumentsAsync.java
@@ -34,8 +34,8 @@ public static void main(String[] args) {
 
         // The texts that need be analyzed.
         List<TextDocumentInput> documents = Arrays.asList(
-            new TextDocumentInput("A", "Old Faithful is a geyser at Yellowstone Park.", "en"),
-            new TextDocumentInput("B", "Mount Shasta has lenticular clouds.", "en")
+            new TextDocumentInput("A", "Old Faithful is a geyser at Yellowstone Park.").setLanguage("en"),
+            new TextDocumentInput("B", "Mount Shasta has lenticular clouds.").setLanguage("en")
         );
 
         // Request options: show statistics and model version
@@ -64,8 +64,9 @@ public static void main(String[] args) {
                             System.out.println("Linked Entities:");
                             System.out.printf("\tName: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                                 linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(), linkedEntity.getDataSource());
-                            linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                                "\tMatched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                            linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                                "\tMatched entity: %s, confidence score: %f.%n",
+                                entityMatch.getText(), entityMatch.getConfidenceScore()));
                         });
                     }
                 }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
index 4c25929d6b99..93852ec8e9fd 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocuments.java
@@ -48,8 +48,9 @@ public static void main(String[] args) {
                     System.out.println("Linked Entities:");
                     System.out.printf("\tName: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                         entity.getName(), entity.getDataSourceEntityId(), entity.getUrl(), entity.getDataSource());
-                    entity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                        "\tMatched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                    entity.getMatches().forEach(entityMatch -> System.out.printf(
+                        "\tMatched entity: %s, confidence score: %f.%n",
+                        entityMatch.getText(), entityMatch.getConfidenceScore()));
                 });
             }
         }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
index a364f2f1be5e..04448fa31b9f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchStringDocumentsAsync.java
@@ -48,8 +48,8 @@ public static void main(String[] args) {
                         System.out.println("Linked Entities:");
                         System.out.printf("\tName: %s, entity ID in data source: %s, URL: %s, data source: %s.%n",
                             linkedEntity.getName(), linkedEntity.getDataSourceEntityId(), linkedEntity.getUrl(), linkedEntity.getDataSource());
-                        linkedEntity.getLinkedEntityMatches().forEach(entityMatch -> System.out.printf(
-                            "\tMatched entity: %s, score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
+                        linkedEntity.getMatches().forEach(entityMatch -> System.out.printf(
+                            "\tMatched entity: %s, confidence score: %f.%n", entityMatch.getText(), entityMatch.getConfidenceScore()));
                     });
                 }
             },
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
new file mode 100644
index 000000000000..0024054f32b6
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
@@ -0,0 +1,721 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.ai.textanalytics;
+
+import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextDocumentInput;
+import com.azure.core.credential.AzureKeyCredential;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import reactor.test.StepVerifier;
+
+import java.util.Collections;
+
+import static com.azure.ai.textanalytics.TestUtils.VALID_HTTPS_LOCALHOST;
+import static com.azure.ai.textanalytics.TextAnalyticsClientTestBase.INVALID_DOCUMENT_BATCH_NPE_MESSAGE;
+import static com.azure.ai.textanalytics.TextAnalyticsClientTestBase.INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE;
+import static com.azure.ai.textanalytics.TextAnalyticsClientTestBase.INVALID_DOCUMENT_NPE_MESSAGE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Unit tests for Text Analytics asynchronous client's documents input
+ */
+public class DocumentInputAsyncTest {
+
+    static TextAnalyticsAsyncClient client;
+
+    @BeforeAll
+    protected static void beforeTest() {
+        client = new TextAnalyticsClientBuilder()
+            .endpoint(VALID_HTTPS_LOCALHOST)
+            .credential(new AzureKeyCredential("fakeKey"))
+            .buildAsyncClient();
+    }
+
+    @AfterAll
+    protected static void afterTest() {
+        client = null;
+    }
+
+    // Detect language
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguage(String)}
+     */
+    @Test
+    public void detectLanguageNullInput() {
+        StepVerifier.create(client.detectLanguage(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguage(String, String)}
+     */
+    @Test
+    public void detectLanguageNullInputWithCountryHint() {
+        StepVerifier.create(client.detectLanguage(null, "US"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable)}
+     */
+    @Test
+    public void detectLanguagesBatchNullInput() {
+        StepVerifier.create(client.detectLanguageBatch(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable)}
+     */
+    @Test
+    public void detectLanguagesBatchEmptyInputList() {
+        StepVerifier.create(client.detectLanguageBatch(Collections.emptyList()))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, String)}
+     */
+    @Test
+    public void detectLanguagesBatchNullInputWithCountryHint() {
+        StepVerifier.create(client.detectLanguageBatch(null, "US"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, String)}
+     */
+    @Test
+    public void detectLanguagesBatchEmptyInputListWithCountryHint() {
+        StepVerifier.create(client.detectLanguageBatch(Collections.emptyList(), "US"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void detectLanguagesBatchNullInputWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.detectLanguageBatch(null, "US",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void detectLanguagesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.detectLanguageBatch(Collections.emptyList(), "US",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void detectLanguagesBatchNullInputWithMaxOverload() {
+        StepVerifier.create(client.detectLanguageBatch(null,
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void detectLanguagesBatchEmptyInputListWithMaxOverload() {
+        StepVerifier.create(client.detectLanguageBatch(Collections.emptyList(),
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    // Recognize Entity
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntities(String)}
+     */
+    @Test
+    public void recognizeEntitiesNullInput() {
+        StepVerifier.create(client.recognizeEntities(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntities(String, String)}
+     */
+    @Test
+    public void recognizeEntitiesNullInputWithCountryHint() {
+        StepVerifier.create(client.recognizeEntities(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable)}
+     */
+    @Test
+    public void recognizeEntitiesBatchNullInput() {
+        StepVerifier.create(client.recognizeEntitiesBatch(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable)}
+     */
+    @Test
+    public void recognizeEntitiesBatchEmptyInputList() {
+        StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList()))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String)}
+     */
+    @Test
+    public void recognizeEntitiesBatchNullInputWithCountryHint() {
+        StepVerifier.create(client.recognizeEntitiesBatch(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String)}
+     */
+    @Test
+    public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
+        StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList(), "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.recognizeEntitiesBatch(null, "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList(), "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeEntitiesBatchNullInputWithMaxOverload() {
+        StepVerifier.create(client.recognizeEntitiesBatch(null,
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeEntitiesBatchEmptyInputListWithMaxOverload() {
+        StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList(),
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    // Recognize linked entity
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntities(String)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesNullInput() {
+        StepVerifier.create(client.recognizeLinkedEntities(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntities(String, String)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesNullInputWithCountryHint() {
+        StepVerifier.create(client.recognizeLinkedEntities(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchNullInput() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchEmptyInputList() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList()))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(null, "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchNullInputWithMaxOverload() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(null,
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithMaxOverload() {
+        StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList(),
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    // Extract key phrase
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrases(String)}
+     */
+    @Test
+    public void extractKeyPhrasesNullInput() {
+        StepVerifier.create(client.extractKeyPhrases(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrases(String, String)}
+     */
+    @Test
+    public void extractKeyPhrasesNullInputWithCountryHint() {
+        StepVerifier.create(client.extractKeyPhrases(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchNullInput() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchEmptyInputList() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList()))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchNullInputWithCountryHint() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList(), "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(null, "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList(), "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchNullInputWithMaxOverload() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(null,
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchEmptyInputListWithMaxOverload() {
+        StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList(),
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    // Sentiment
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentiment(String)}
+     */
+    @Test
+    public void analyseSentimentNullInput() {
+        StepVerifier.create(client.analyzeSentiment(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentiment(String, String)}
+     */
+    @Test
+    public void analyseSentimentNullInputWithCountryHint() {
+        StepVerifier.create(client.analyzeSentiment(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable)}
+     */
+    @Test
+    public void analyseSentimentBatchNullInput() {
+        StepVerifier.create(client.analyzeSentimentBatch(null))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable)}
+     */
+    @Test
+    public void analyseSentimentBatchEmptyInputList() {
+        StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList()))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String)}
+     */
+    @Test
+    public void analyseSentimentBatchNullInputWithCountryHint() {
+        StepVerifier.create(client.analyzeSentimentBatch(null, "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String)}
+     */
+    @Test
+    public void analyseSentimentBatchEmptyInputListWithCountryHint() {
+        StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(), "en"))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.analyzeSentimentBatch(null, "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions() {
+        StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(), "en",
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void analyseSentimentBatchNullInputWithMaxOverload() {
+        StepVerifier.create(client.analyzeSentimentBatch(null,
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(NullPointerException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+
+    /**
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions)}
+     */
+    @Test
+    public void analyseSentimentEmptyInputListWithMaxOverload() {
+        StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(),
+            new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
+            .verifyErrorSatisfies(exception -> {
+                assertEquals(IllegalArgumentException.class, exception.getClass());
+                assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+            });
+    }
+}
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
index 63709dd10d1b..f9a4850e699c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
@@ -42,29 +42,29 @@ protected static void afterTest() {
 
     // Detect language
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#detectLanguage(String)}
      */
     @Test
-    public void detectLanguagesNullInput() {
+    public void detectLanguageNullInput() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.detectLanguage(null));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#detectLanguage(String, String)}
      */
     @Test
-    public void detectLanguagesNullInputWithCountryHint() {
+    public void detectLanguageNullInputWithCountryHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.detectLanguage(null, "US"));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#detectLanguageBatch(Iterable)}
      */
     @Test
@@ -75,77 +75,80 @@ public void detectLanguagesBatchNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String)}
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable)}
      */
     @Test
-    public void detectLanguagesBatchNullInputWithCountryHint() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.detectLanguageBatch(null, "US"));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void detectLanguagesBatchEmptyInputList() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.detectLanguageBatch(Collections.emptyList()));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String)}
      */
     @Test
-    public void detectLanguagesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void detectLanguagesBatchNullInputWithCountryHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
-            client.detectLanguageBatch(null, "US", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+            client.detectLanguageBatch(null, "US"));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String)}
      */
     @Test
-    public void detectLanguagesBatchNullInputWithMaxOverload() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.detectLanguageBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void detectLanguagesBatchEmptyInputListWithCountryHint() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.detectLanguageBatch(Collections.emptyList(), "US"));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that an illegal argument exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void detectLanguageEmptyInputList() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.detectLanguageBatch(Collections.emptyList()));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void detectLanguagesBatchNullInputWithCountryHintAndRequestOptions() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.detectLanguageBatch(null, "US",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void detectLanguageEmptyInputListWithCountryHint() {
+    public void detectLanguagesBatchEmptyInputListWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.detectLanguageBatch(Collections.emptyList(), "US"));
+            client.detectLanguageBatch(Collections.emptyList(), "US",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void detectLanguageEmptyInputListWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.detectLanguageBatch(Collections.emptyList(), "US", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void detectLanguagesBatchNullInputWithMaxOverload() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.detectLanguageBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true),
+                Context.NONE));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of {@link DetectLanguageInput} is given for
-     * {@link TextAnalyticsClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of {@link DetectLanguageInput} is
+     * given for {@link TextAnalyticsClient#detectLanguageBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void detectLanguageEmptyInputListWithMaxOverload() {
+    public void detectLanguagesBatchEmptyInputListWithMaxOverload() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.detectLanguageBatch(
                 Collections.emptyList(), new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
@@ -155,7 +158,7 @@ public void detectLanguageEmptyInputListWithMaxOverload() {
     // Recognize Entity
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#recognizeEntities(String)}
      */
     @Test
@@ -166,7 +169,7 @@ public void recognizeEntitiesNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#recognizeEntities(String, String)}
      */
     @Test
@@ -177,7 +180,7 @@ public void recognizeEntitiesNullInputWithCountryHint() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable)}
      */
     @Test
@@ -188,77 +191,80 @@ public void recognizeEntitiesBatchNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String)}
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHint() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeEntitiesBatch(null, "en"));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void recognizeEntitiesBatchEmptyInputList() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.recognizeEntitiesBatch(Collections.emptyList()));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeEntitiesBatchNullInputWithCountryHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeEntitiesBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+            client.recognizeEntitiesBatch(null, "en"));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithMaxOverload() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeEntitiesBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.recognizeEntitiesBatch(Collections.emptyList(), "en"));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that an illegal argument exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesEmptyInputList() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeEntitiesBatch(Collections.emptyList()));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.recognizeEntitiesBatch(null, "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesEmptyInputListWithCountryHint() {
+    public void recognizeEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeEntitiesBatch(Collections.emptyList(), "en"));
+            client.recognizeEntitiesBatch(Collections.emptyList(), "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void recognizeEntitiesEmptyInputListWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeEntitiesBatch(Collections.emptyList(), "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void recognizeEntitiesBatchNullInputWithMaxOverload() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.recognizeEntitiesBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true),
+                Context.NONE));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of {@link TextDocumentInput} is given for
-     * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void recognizeEntitiesEmptyInputListWithMaxOverload() {
+    public void recognizeEntitiesBatchEmptyInputListWithMaxOverload() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeEntitiesBatch(
                 Collections.emptyList(), new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
@@ -268,7 +274,7 @@ public void recognizeEntitiesEmptyInputListWithMaxOverload() {
     // Recognize linked entity
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#recognizeLinkedEntities(String)}
      */
     @Test
@@ -279,7 +285,7 @@ public void recognizeLinkedEntitiesNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#recognizeLinkedEntities(String, String)}
      */
     @Test
@@ -290,7 +296,7 @@ public void recognizeLinkedEntitiesNullInputWithCountryHint() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable)}
      */
     @Test
@@ -301,77 +307,81 @@ public void recognizeLinkedEntitiesBatchNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String)}
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeLinkedEntitiesBatch(null, "en"));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void recognizeLinkedEntitiesBatchEmptyInputList() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.recognizeLinkedEntitiesBatch(Collections.emptyList()));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeLinkedEntitiesBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+            client.recognizeLinkedEntitiesBatch(null, "en"));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithMaxOverload() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.recognizeLinkedEntitiesBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en"));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that an illegal argument exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesEmptyInputList() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeLinkedEntitiesBatch(Collections.emptyList()));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.recognizeLinkedEntitiesBatch(null, "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesEmptyInputListWithCountryHint() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en"));
+            client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void recognizeLinkedEntitiesEmptyInputListWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void recognizeLinkedEntitiesBatchNullInputWithMaxOverload() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.recognizeLinkedEntitiesBatch(null,
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of {@link TextDocumentInput} is given for
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void recognizeLinkedEntitiesEmptyInputListWithMaxOverload() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithMaxOverload() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeLinkedEntitiesBatch(
                 Collections.emptyList(), new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
@@ -381,7 +391,7 @@ public void recognizeLinkedEntitiesEmptyInputListWithMaxOverload() {
     // Extract key phrase
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#extractKeyPhrases(String)}
      */
     @Test
@@ -392,7 +402,7 @@ public void extractKeyPhrasesNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#extractKeyPhrases(String, String)}
      */
     @Test
@@ -403,7 +413,7 @@ public void extractKeyPhrasesNullInputWithCountryHint() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable)}
      */
     @Test
@@ -414,7 +424,18 @@ public void extractKeyPhrasesBatchNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable)}
+     */
+    @Test
+    public void extractKeyPhrasesBatchEmptyInputList() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.extractKeyPhrasesBatch(Collections.emptyList()));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    }
+
+    /**
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String)}
      */
     @Test
@@ -425,66 +446,58 @@ public void extractKeyPhrasesBatchNullInputWithCountryHint() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.extractKeyPhrasesBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.extractKeyPhrasesBatch(Collections.emptyList(), "en"));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithMaxOverload() {
+    public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(NullPointerException.class, () ->
-            client.extractKeyPhrasesBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
+            client.extractKeyPhrasesBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that an illegal argument exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesEmptyInputList() {
+    public void extractKeyPhrasesBatchEmptyInputListWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.extractKeyPhrasesBatch(Collections.emptyList()));
+            client.extractKeyPhrasesBatch(Collections.emptyList(), "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String)}
-     */
-    @Test
-    public void extractKeyPhrasesEmptyInputListWithCountryHint() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.extractKeyPhrasesBatch(Collections.emptyList(), "en"));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
-    }
-
-    /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void extractKeyPhrasesEmptyInputListWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.extractKeyPhrasesBatch(Collections.emptyList(), "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void extractKeyPhrasesBatchNullInputWithMaxOverload() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.extractKeyPhrasesBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true),
+                Context.NONE));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of {@link TextDocumentInput} is given for
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void extractKeyPhrasesEmptyInputListWithMaxOverload() {
+    public void extractKeyPhrasesBatchEmptyInputListWithMaxOverload() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.extractKeyPhrasesBatch(
                 Collections.emptyList(), new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
@@ -494,7 +507,7 @@ public void extractKeyPhrasesEmptyInputListWithMaxOverload() {
     // Sentiment
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#analyzeSentiment(String)}
      */
     @Test
@@ -505,7 +518,7 @@ public void analyseSentimentNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null document is given for
      * {@link TextAnalyticsClient#analyzeSentiment(String, String)}
      */
     @Test
@@ -516,7 +529,7 @@ public void analyseSentimentNullInputWithCountryHint() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null document is given for
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable)}
      */
     @Test
@@ -527,74 +540,76 @@ public void analyseSentimentBatchNullInput() {
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String)}
+     * Verifies that an {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHint() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.analyzeSentimentBatch(null, "en"));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void analyseSentimentBatchEmptyInputList() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.analyzeSentimentBatch(Collections.emptyList()));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
+    public void analyseSentimentBatchNullInputWithCountryHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
-            client.analyzeSentimentBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+            client.analyzeSentimentBatch(null, "en"));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when null documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithMaxOverload() {
-        Exception exception = assertThrows(NullPointerException.class, () ->
-            client.analyzeSentimentBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
-        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
+    public void analyseSentimentBatchEmptyInputListWithCountryHint() {
+        Exception exception = assertThrows(IllegalArgumentException.class, () ->
+            client.analyzeSentimentBatch(Collections.emptyList(), "en"));
+        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that an illegal argument exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentEmptyInputList() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.analyzeSentimentBatch(Collections.emptyList()));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.analyzeSentimentBatch(null, "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentEmptyInputListWithCountryHint() {
+    public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.analyzeSentimentBatch(Collections.emptyList(), "en"));
+            client.analyzeSentimentBatch(Collections.emptyList(), "en",
+                new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of documents is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
+     * Verifies that a {@link NullPointerException} is thrown when null documents is given for
+     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void analyseSentimentEmptyInputListWithCountryHintAndRequestOptions() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () ->
-            client.analyzeSentimentBatch(Collections.emptyList(), "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
-        assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
+    public void analyseSentimentBatchNullInputWithMaxOverload() {
+        Exception exception = assertThrows(NullPointerException.class, () ->
+            client.analyzeSentimentBatch(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
+        assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
     }
 
     /**
-     * Verifies that a null pointer exception is thrown when an empty list of {@link TextDocumentInput} is given for
-     * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions, Context)}
+     * Verifies that a {@link IllegalArgumentException} is thrown when an empty list of {@link TextDocumentInput} is
+     * given for {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
     public void analyseSentimentEmptyInputListWithMaxOverload() {
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TestUtils.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TestUtils.java
index 5906b005947f..b9e4ab0a1803 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TestUtils.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TestUtils.java
@@ -5,21 +5,24 @@
 
 import com.azure.ai.textanalytics.models.AnalyzeSentimentResult;
 import com.azure.ai.textanalytics.models.CategorizedEntity;
-import com.azure.ai.textanalytics.models.DetectLanguageInput;
+import com.azure.ai.textanalytics.models.CategorizedEntityCollection;
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
-import com.azure.ai.textanalytics.models.EntityCategory;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
+import com.azure.ai.textanalytics.models.KeyPhrasesCollection;
 import com.azure.ai.textanalytics.models.LinkedEntity;
+import com.azure.ai.textanalytics.models.LinkedEntityCollection;
 import com.azure.ai.textanalytics.models.LinkedEntityMatch;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.SentimentConfidenceScores;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
-import com.azure.ai.textanalytics.models.TextDocumentInput;
 import com.azure.ai.textanalytics.models.TextDocumentStatistics;
+import com.azure.ai.textanalytics.models.DetectLanguageInput;
+import com.azure.ai.textanalytics.models.EntityCategory;
+import com.azure.ai.textanalytics.models.TextDocumentInput;
 import com.azure.ai.textanalytics.models.TextSentiment;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
 import com.azure.core.exception.HttpResponseException;
@@ -55,6 +58,8 @@ final class TestUtils {
         "Hello world. This is some input text that I love.",
         "Bonjour tout le monde");
 
+    static final String TOO_LONG_INPUT = "Thisisaveryveryverylongtextwhichgoesonforalongtimeandwhichalmostdoesn'tseemtostopatanygivenpointintime.ThereasonforthistestistotryandseewhathappenswhenwesubmitaveryveryverylongtexttoLanguage.Thisshouldworkjustfinebutjustincaseitisalwaysgoodtohaveatestcase.ThisallowsustotestwhathappensifitisnotOK.Ofcourseitisgoingtobeokbutthenagainitisalsobettertobesure!";
+
     static final List<String> KEY_PHRASE_FRENCH_INPUTS = Arrays.asList(
         "Bonjour tout le monde.",
         "Je m'appelle Mondly.");
@@ -67,8 +72,8 @@ final class TestUtils {
     // Spanish that can be given as a hint.
     static final List<String> SPANISH_SAME_AS_ENGLISH_INPUTS = Arrays.asList("personal", "social");
 
-    static final DetectedLanguage DETECTED_LANGUAGE_SPANISH = new DetectedLanguage("Spanish", "es", 1.0);
-    static final DetectedLanguage DETECTED_LANGUAGE_ENGLISH = new DetectedLanguage("English", "en", 1.0);
+    static final DetectedLanguage DETECTED_LANGUAGE_SPANISH = new DetectedLanguage("Spanish", "es", 1.0, null);
+    static final DetectedLanguage DETECTED_LANGUAGE_ENGLISH = new DetectedLanguage("English", "en", 1.0, null);
 
     static final List<DetectedLanguage> DETECT_SPANISH_LANGUAGE_RESULTS = Arrays.asList(
         DETECTED_LANGUAGE_SPANISH, DETECTED_LANGUAGE_SPANISH);
@@ -93,6 +98,21 @@ static List<DetectLanguageInput> getDuplicateIdDetectLanguageInputs() {
         );
     }
 
+    static List<TextDocumentInput> getDuplicateTextDocumentInputs() {
+        return Arrays.asList(
+            new TextDocumentInput("0", CATEGORIZED_ENTITY_INPUTS.get(0)),
+            new TextDocumentInput("0", CATEGORIZED_ENTITY_INPUTS.get(0)),
+            new TextDocumentInput("0", CATEGORIZED_ENTITY_INPUTS.get(0))
+        );
+    }
+
+    static List<TextDocumentInput> getWarningsTextDocumentInputs() {
+        return Arrays.asList(
+            new TextDocumentInput("0", TOO_LONG_INPUT),
+            new TextDocumentInput("1", CATEGORIZED_ENTITY_INPUTS.get(1))
+        );
+    }
+
     static List<TextDocumentInput> getTextDocumentInputs(List<String> inputs) {
         return IntStream.range(0, inputs.size())
             .mapToObj(index ->
@@ -104,9 +124,9 @@ static List<TextDocumentInput> getTextDocumentInputs(List<String> inputs) {
      * Helper method to get the expected Batch Detected Languages
      */
     static TextAnalyticsPagedResponse<DetectLanguageResult> getExpectedBatchDetectedLanguages() {
-        DetectedLanguage detectedLanguage1 = new DetectedLanguage("English", "en", 0.0);
-        DetectedLanguage detectedLanguage2 = new DetectedLanguage("Spanish", "es", 0.0);
-        DetectedLanguage detectedLanguage3 = new DetectedLanguage("(Unknown)", "(Unknown)", 0.0);
+        DetectedLanguage detectedLanguage1 = new DetectedLanguage("English", "en", 0.0, null);
+        DetectedLanguage detectedLanguage2 = new DetectedLanguage("Spanish", "es", 0.0, null);
+        DetectedLanguage detectedLanguage3 = new DetectedLanguage("(Unknown)", "(Unknown)", 0.0, null);
 
         TextDocumentStatistics textDocumentStatistics1 = new TextDocumentStatistics(26, 1);
         TextDocumentStatistics textDocumentStatistics2 = new TextDocumentStatistics(40, 1);
@@ -126,7 +146,7 @@ static TextAnalyticsPagedResponse<DetectLanguageResult> getExpectedBatchDetected
     /**
      * Helper method to get the expected Batch Categorized Entities
      */
-    static TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult> getExpectedBatchCategorizedEntities() {
+    static TextAnalyticsPagedResponse<RecognizeEntitiesResult> getExpectedBatchCategorizedEntities() {
         return new TextAnalyticsPagedResponse<>(null, 200, null,
             Arrays.asList(getExpectedBatchCategorizedEntities1(), getExpectedBatchCategorizedEntities2()),
             null,  DEFAULT_MODEL_VERSION,
@@ -147,45 +167,46 @@ static TextAnalyticsPagedResponse<CategorizedEntity> getExpectedCategorizedEntit
      * Helper method to get the expected Categorized Entities List 1
      */
     static List<CategorizedEntity> getCategorizedEntitiesList1() {
-        CategorizedEntity categorizedEntity1 = new CategorizedEntity("Seattle", EntityCategory.LOCATION, "GPE", 26, 7, 0.0);
-        CategorizedEntity categorizedEntity2 = new CategorizedEntity("last week", EntityCategory.DATE_TIME, "DateRange", 34, 9, 0.0);
-        return Arrays.asList(categorizedEntity1, categorizedEntity2);
+        CategorizedEntity categorizedEntity1 = new CategorizedEntity("trip", EntityCategory.EVENT, null, 0.0);
+        CategorizedEntity categorizedEntity2 = new CategorizedEntity("Seattle", EntityCategory.LOCATION, "GPE", 0.0);
+        CategorizedEntity categorizedEntity3 = new CategorizedEntity("last week", EntityCategory.DATE_TIME, "DateRange", 0.0);
+        return Arrays.asList(categorizedEntity1, categorizedEntity2, categorizedEntity3);
     }
 
     /**
      * Helper method to get the expected Categorized Entities List 2
      */
     static List<CategorizedEntity> getCategorizedEntitiesList2() {
-        CategorizedEntity categorizedEntity3 = new CategorizedEntity("Microsoft", EntityCategory.ORGANIZATION, null, 10, 9, 0.0);
+        CategorizedEntity categorizedEntity3 = new CategorizedEntity("Microsoft", EntityCategory.ORGANIZATION, null, 0.0);
         return Arrays.asList(categorizedEntity3);
     }
 
     /**
      * Helper method to get the expected Batch Categorized Entities
      */
-    static RecognizeCategorizedEntitiesResult getExpectedBatchCategorizedEntities1() {
+    static RecognizeEntitiesResult getExpectedBatchCategorizedEntities1() {
         IterableStream<CategorizedEntity> categorizedEntityList1 = new IterableStream<>(getCategorizedEntitiesList1());
         TextDocumentStatistics textDocumentStatistics1 = new TextDocumentStatistics(44, 1);
-        RecognizeCategorizedEntitiesResult recognizeCategorizedEntitiesResult1 = new RecognizeCategorizedEntitiesResult("0", textDocumentStatistics1, null, categorizedEntityList1);
-        return recognizeCategorizedEntitiesResult1;
+        RecognizeEntitiesResult recognizeEntitiesResult1 = new RecognizeEntitiesResult("0", textDocumentStatistics1, null, new CategorizedEntityCollection(categorizedEntityList1, null));
+        return recognizeEntitiesResult1;
     }
 
     /**
      * Helper method to get the expected Batch Categorized Entities
      */
-    static RecognizeCategorizedEntitiesResult getExpectedBatchCategorizedEntities2() {
+    static RecognizeEntitiesResult getExpectedBatchCategorizedEntities2() {
         IterableStream<CategorizedEntity> categorizedEntityList2 = new IterableStream<>(getCategorizedEntitiesList2());
         TextDocumentStatistics textDocumentStatistics2 = new TextDocumentStatistics(20, 1);
-        RecognizeCategorizedEntitiesResult recognizeCategorizedEntitiesResult2 = new RecognizeCategorizedEntitiesResult("1", textDocumentStatistics2, null, categorizedEntityList2);
-        return recognizeCategorizedEntitiesResult2;
+        RecognizeEntitiesResult recognizeEntitiesResult2 = new RecognizeEntitiesResult("1", textDocumentStatistics2, null, new CategorizedEntityCollection(categorizedEntityList2, null));
+        return recognizeEntitiesResult2;
     }
 
     /**
      * Helper method to get the expected Batch Linked Entities
      */
     static TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult> getExpectedBatchLinkedEntities() {
-        LinkedEntityMatch linkedEntityMatch1 = new LinkedEntityMatch("Seattle", 0.0, 7, 26);
-        LinkedEntityMatch linkedEntityMatch2 = new LinkedEntityMatch("Microsoft", 0.0, 9, 10);
+        LinkedEntityMatch linkedEntityMatch1 = new LinkedEntityMatch("Seattle", 0.0);
+        LinkedEntityMatch linkedEntityMatch2 = new LinkedEntityMatch("Microsoft", 0.0);
 
         LinkedEntity linkedEntity1 = new LinkedEntity(
             "Seattle", new IterableStream<>(Collections.singletonList(linkedEntityMatch1)),
@@ -203,8 +224,8 @@ static TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult> getExpectedBatc
         TextDocumentStatistics textDocumentStatistics1 = new TextDocumentStatistics(44, 1);
         TextDocumentStatistics textDocumentStatistics2 = new TextDocumentStatistics(20, 1);
 
-        RecognizeLinkedEntitiesResult recognizeLinkedEntitiesResult1 = new RecognizeLinkedEntitiesResult("0", textDocumentStatistics1, null, linkedEntityList1);
-        RecognizeLinkedEntitiesResult recognizeLinkedEntitiesResult2 = new RecognizeLinkedEntitiesResult("1", textDocumentStatistics2, null, linkedEntityList2);
+        RecognizeLinkedEntitiesResult recognizeLinkedEntitiesResult1 = new RecognizeLinkedEntitiesResult("0", textDocumentStatistics1, null, new LinkedEntityCollection(linkedEntityList1, null));
+        RecognizeLinkedEntitiesResult recognizeLinkedEntitiesResult2 = new RecognizeLinkedEntitiesResult("1", textDocumentStatistics2, null, new LinkedEntityCollection(linkedEntityList2, null));
 
         TextDocumentBatchStatistics textDocumentBatchStatistics = new TextDocumentBatchStatistics(2, 2, 0, 2);
         List<RecognizeLinkedEntitiesResult> recognizeLinkedEntitiesResultList = Arrays.asList(recognizeLinkedEntitiesResult1, recognizeLinkedEntitiesResult2);
@@ -219,8 +240,8 @@ static TextAnalyticsPagedResponse<ExtractKeyPhraseResult> getExpectedBatchKeyPhr
         TextDocumentStatistics textDocumentStatistics1 = new TextDocumentStatistics(49, 1);
         TextDocumentStatistics textDocumentStatistics2 = new TextDocumentStatistics(21, 1);
 
-        ExtractKeyPhraseResult extractKeyPhraseResult1 = new ExtractKeyPhraseResult("0", textDocumentStatistics1, null, new IterableStream<>(Arrays.asList("input text", "world")));
-        ExtractKeyPhraseResult extractKeyPhraseResult2 = new ExtractKeyPhraseResult("1", textDocumentStatistics2, null, new IterableStream<>(Collections.singletonList("monde")));
+        ExtractKeyPhraseResult extractKeyPhraseResult1 = new ExtractKeyPhraseResult("0", textDocumentStatistics1, null, new KeyPhrasesCollection(new IterableStream<>(Arrays.asList("input text", "world")), null));
+        ExtractKeyPhraseResult extractKeyPhraseResult2 = new ExtractKeyPhraseResult("1", textDocumentStatistics2, null, new KeyPhrasesCollection(new IterableStream<>(Collections.singletonList("monde")), null));
 
         TextDocumentBatchStatistics textDocumentBatchStatistics = new TextDocumentBatchStatistics(2, 2, 0, 2);
         List<ExtractKeyPhraseResult> extractKeyPhraseResultList = Arrays.asList(extractKeyPhraseResult1, extractKeyPhraseResult2);
@@ -238,16 +259,16 @@ static TextAnalyticsPagedResponse<AnalyzeSentimentResult> getExpectedBatchTextSe
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(TextSentiment.MIXED,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 31, 0),
-                new SentenceSentiment(TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 35, 32)
-            )));
+                new SentenceSentiment("", TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
 
         final DocumentSentiment expectedDocumentSentiment2 = new DocumentSentiment(TextSentiment.MIXED,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 35, 0),
-                new SentenceSentiment(TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 31, 36)
-            )));
+                new SentenceSentiment("", TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
 
         final AnalyzeSentimentResult analyzeSentimentResult1 = new AnalyzeSentimentResult("0",
             textDocumentStatistics, null, expectedDocumentSentiment);
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
index c3a9644d2381..569f202ad6d2 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
@@ -21,14 +21,18 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.stream.Collectors;
 
+import static com.azure.ai.textanalytics.TestUtils.getCategorizedEntitiesList1;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchCategorizedEntities;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchDetectedLanguages;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchKeyPhrases;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchLinkedEntities;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchTextSentiment;
-import static com.azure.ai.textanalytics.TestUtils.getExpectedCategorizedEntities;
+import static com.azure.ai.textanalytics.models.WarningCode.LONG_WORDS_IN_DOCUMENT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TextAnalyticsAsyncClientTest extends TextAnalyticsClientTestBase {
     private TextAnalyticsAsyncClient client;
@@ -113,7 +117,7 @@ public void detectLanguagesBatchStringInput() {
      */
     @Test
     public void detectSingleTextLanguage() {
-        DetectedLanguage primaryLanguage = new DetectedLanguage("English", "en", 1.0);
+        DetectedLanguage primaryLanguage = new DetectedLanguage("English", "en", 1.0, null);
         StepVerifier.create(client.detectLanguage("This is a test English Text"))
             .assertNext(response -> validatePrimaryLanguage(primaryLanguage, response))
             .verifyComplete();
@@ -146,7 +150,7 @@ public void detectLanguageEmptyText() {
     public void detectLanguageFaultyText() {
         StepVerifier.create(client.detectLanguage("!@#%%"))
             .assertNext(response -> validatePrimaryLanguage(
-                new DetectedLanguage("(Unknown)", "(Unknown)", 0.0), response))
+                new DetectedLanguage("(Unknown)", "(Unknown)", 0.0, null), response))
             .verifyComplete();
     }
 
@@ -167,7 +171,7 @@ public void detectLanguageDuplicateIdInput() {
     public void detectLanguageEmptyCountryHint() {
         StepVerifier.create(client.detectLanguage("Este es un documento  escrito en Español", ""))
             .assertNext(response -> validatePrimaryLanguage(
-                new DetectedLanguage("Spanish", "es", 0.0), response))
+                new DetectedLanguage("Spanish", "es", 0.0, null), response))
             .verifyComplete();
     }
 
@@ -178,15 +182,16 @@ public void detectLanguageEmptyCountryHint() {
     public void detectLanguageNoneCountryHint() {
         StepVerifier.create(client.detectLanguage("Este es un documento  escrito en Español", "none"))
             .assertNext(response -> validatePrimaryLanguage(
-                new DetectedLanguage("Spanish", "es", 0.0), response))
+                new DetectedLanguage("Spanish", "es", 0.0, null), response))
             .verifyComplete();
     }
 
     // Entities
     @Test
     public void recognizeEntitiesForTextInput() {
-        StepVerifier.create(client.recognizeEntities("I had a wonderful trip to Seattle last week.").byPage())
-            .assertNext(response -> validateCategorizedEntities(getExpectedCategorizedEntities(), response))
+        StepVerifier.create(client.recognizeEntities("I had a wonderful trip to Seattle last week."))
+            .assertNext(response -> validateCategorizedEntities(getCategorizedEntitiesList1(),
+                response.stream().collect(Collectors.toList())))
             .verifyComplete();
     }
 
@@ -200,10 +205,17 @@ public void recognizeEntitiesForEmptyText() {
     @Test
     public void recognizeEntitiesForFaultyText() {
         StepVerifier.create(client.recognizeEntities("!@#%%"))
-            .expectNextCount(0)
+            .assertNext(result -> assertFalse(result.getWarnings().iterator().hasNext()))
             .verifyComplete();
     }
 
+    @Test
+    public void recognizeEntitiesDuplicateIdInput() {
+        recognizeCategorizedEntityDuplicateIdRunner(inputs ->
+            StepVerifier.create(client.recognizeEntitiesBatch(inputs, null))
+                .verifyErrorSatisfies(ex -> assertEquals(HttpResponseException.class, ex.getClass())));
+    }
+
     @Test
     public void recognizeEntitiesBatchInputSingleError() {
         recognizeBatchCategorizedEntitySingleErrorRunner((inputs) ->
@@ -252,14 +264,27 @@ public void recognizeEntitiesForListWithOptions() {
                 .verifyComplete());
     }
 
+    @Test
+    public void recognizeEntitiesTooManyDocuments() {
+        recognizeEntitiesTooManyDocumentsRunner(inputs -> {
+            StepVerifier.create(client.recognizeEntitiesBatch(inputs))
+                .verifyErrorSatisfies(ex -> {
+                    HttpResponseException exception = (HttpResponseException) ex;
+                    assertEquals(HttpResponseException.class, exception.getClass());
+                    assertEquals(EXCEEDED_ALLOWED_DOCUMENTS_LIMITS_MESSAGE, exception.getMessage());
+                    assertEquals(INVALID_DOCUMENT_BATCH, exception.getValue().toString());
+                });
+        });
+    }
+
     // Linked Entities
     @Test
     public void recognizeLinkedEntitiesForTextInput() {
-        final LinkedEntityMatch linkedEntityMatch = new LinkedEntityMatch("Seattle", 0.0, 7, 26);
+        final LinkedEntityMatch linkedEntityMatch = new LinkedEntityMatch("Seattle", 0.0);
         final LinkedEntity linkedEntity = new LinkedEntity("Seattle", new IterableStream<>(Collections.singletonList(linkedEntityMatch)), "en", "Seattle", "https://en.wikipedia.org/wiki/Seattle", "Wikipedia");
 
         StepVerifier.create(client.recognizeLinkedEntities("I had a wonderful trip to Seattle last week."))
-            .assertNext(response -> validateLinkedEntity(linkedEntity, response))
+            .assertNext(response -> validateLinkedEntity(linkedEntity, response.iterator().next()))
             .verifyComplete();
     }
 
@@ -273,10 +298,17 @@ public void recognizeLinkedEntitiesForEmptyText() {
     @Test
     public void recognizeLinkedEntitiesForFaultyText() {
         StepVerifier.create(client.recognizeLinkedEntities("!@#%%"))
-            .expectNextCount(0)
+            .assertNext(result -> assertFalse(result.getWarnings().iterator().hasNext()))
             .verifyComplete();
     }
 
+    @Test
+    public void recognizeLinkedEntitiesDuplicateIdInput() {
+        recognizeBatchLinkedEntityDuplicateIdRunner(inputs ->
+            StepVerifier.create(client.recognizeLinkedEntitiesBatch(inputs, null))
+                .verifyErrorSatisfies(ex -> assertEquals(HttpResponseException.class, ex.getClass())));
+    }
+
     @Test
     public void recognizeLinkedEntitiesForBatchInput() {
         recognizeBatchLinkedEntityRunner((inputs) ->
@@ -317,11 +349,24 @@ public void recognizeLinkedEntitiesForListStringWithOptions() {
                 .verifyComplete());
     }
 
+    @Test
+    public void recognizeLinkedEntitiesTooManyDocuments() {
+        recognizeLinkedEntitiesTooManyDocumentsRunner(inputs -> {
+            StepVerifier.create(client.recognizeLinkedEntitiesBatch(inputs))
+                .verifyErrorSatisfies(ex -> {
+                    HttpResponseException exception = (HttpResponseException) ex;
+                    assertEquals(HttpResponseException.class, exception.getClass());
+                    assertEquals(EXCEEDED_ALLOWED_DOCUMENTS_LIMITS_MESSAGE, exception.getMessage());
+                    assertEquals(INVALID_DOCUMENT_BATCH, exception.getValue().toString());
+                });
+        });
+    }
+
     // Key Phrases
     @Test
     public void extractKeyPhrasesForTextInput() {
         StepVerifier.create(client.extractKeyPhrases("Bonjour tout le monde."))
-            .assertNext(response -> assertEquals("monde", response))
+            .assertNext(response -> assertEquals("monde", response.iterator().next()))
             .verifyComplete();
     }
 
@@ -335,10 +380,17 @@ public void extractKeyPhrasesForEmptyText() {
     @Test
     public void extractKeyPhrasesForFaultyText() {
         StepVerifier.create(client.extractKeyPhrases("!@#%%"))
-            .expectNextCount(0)
+            .assertNext(result -> assertFalse(result.getWarnings().iterator().hasNext()))
             .verifyComplete();
     }
 
+    @Test
+    public void extractKeyPhrasesDuplicateIdInput() {
+        extractBatchKeyPhrasesDuplicateIdRunner(inputs ->
+            StepVerifier.create(client.extractKeyPhrasesBatch(inputs, null))
+                .verifyErrorSatisfies(ex -> assertEquals(HttpResponseException.class, ex.getClass())));
+    }
+
     @Test
     public void extractKeyPhrasesForBatchInput() {
         extractBatchKeyPhrasesRunner((inputs) ->
@@ -380,6 +432,35 @@ public void extractKeyPhrasesForListStringWithOptions() {
                 .verifyComplete());
     }
 
+    @Test
+    public void extractKeyPhrasesWarning() {
+        extractKeyPhrasesWarningRunner(
+            input -> StepVerifier.create(client.extractKeyPhrases(input))
+                .assertNext(keyPhrasesResult -> {
+                    keyPhrasesResult.getWarnings().forEach(warning -> {
+                        assertTrue(WARNING_TOO_LONG_DOCUMENT_INPUT_MESSAGE.equals(warning.getMessage()));
+                        assertTrue(LONG_WORDS_IN_DOCUMENT.equals(warning.getWarningCode()));
+                    });
+                })
+                .verifyComplete()
+        );
+    }
+
+    @Test
+    public void extractKeyPhrasesBatchWarning() {
+        extractKeyPhrasesBatchWarningRunner(
+            inputs -> StepVerifier.create(client.extractKeyPhrasesBatch(inputs, null))
+                .assertNext(keyPhrasesResult -> {
+                    keyPhrasesResult.getKeyPhrases().getWarnings().forEach(warning -> {
+                        assertTrue(WARNING_TOO_LONG_DOCUMENT_INPUT_MESSAGE.equals(warning.getMessage()));
+                        assertTrue(LONG_WORDS_IN_DOCUMENT.equals(warning.getWarningCode()));
+                    });
+                })
+                .expectNextCount(1)
+                .verifyComplete()
+        );
+    }
+
     // Sentiment
 
     /**
@@ -390,9 +471,9 @@ public void analyseSentimentForTextInput() {
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(TextSentiment.MIXED,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 31, 0),
-                new SentenceSentiment(TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 35, 32)
-            )));
+                new SentenceSentiment("", TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
 
         StepVerifier
             .create(client.analyzeSentiment("The hotel was dark and unclean. The restaurant had amazing gnocchi."))
@@ -418,14 +499,24 @@ public void analyseSentimentForFaultyText() {
             TextSentiment.NEUTRAL,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0), 1, 0),
-                new SentenceSentiment(TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0), 4, 1)
-            )));
+                new SentenceSentiment("", TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
 
         StepVerifier.create(client.analyzeSentiment("!@#%%"))
             .assertNext(response -> validateAnalyzedSentiment(expectedDocumentSentiment, response)).verifyComplete();
     }
 
+    /**
+     * Test analyzing sentiment for a duplicate ID list.
+     */
+    @Test
+    public void analyseSentimentDuplicateIdInput() {
+        analyseBatchSentimentDuplicateIdRunner(inputs ->
+            StepVerifier.create(client.analyzeSentimentBatch(inputs, null))
+                .verifyErrorSatisfies(ex -> assertEquals(HttpResponseException.class, ex.getClass())));
+    }
+
     /**
      * Test analyzing sentiment for a list of string input.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
index 0e359b243941..0ad3f735aad7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
@@ -6,10 +6,9 @@
 import com.azure.ai.textanalytics.models.CategorizedEntity;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
-import com.azure.ai.textanalytics.models.EntityCategory;
 import com.azure.ai.textanalytics.models.LinkedEntity;
 import com.azure.ai.textanalytics.models.LinkedEntityMatch;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.SentimentConfidenceScores;
 import com.azure.ai.textanalytics.models.TextAnalyticsException;
@@ -26,11 +25,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.azure.ai.textanalytics.TestUtils.getCategorizedEntitiesList1;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchCategorizedEntities;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchDetectedLanguages;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchKeyPhrases;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchLinkedEntities;
 import static com.azure.ai.textanalytics.TestUtils.getExpectedBatchTextSentiment;
+import static com.azure.ai.textanalytics.models.WarningCode.LONG_WORDS_IN_DOCUMENT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -102,7 +103,7 @@ public void detectLanguagesBatchStringInput() {
      */
     @Test
     public void detectSingleTextLanguage() {
-        validatePrimaryLanguage(new DetectedLanguage("English", "en", 0.0),
+        validatePrimaryLanguage(new DetectedLanguage("English", "en", 0.0, null),
             client.detectLanguage("This is a test English Text"));
     }
 
@@ -120,7 +121,7 @@ public void detectLanguageEmptyText() {
      */
     @Test
     public void detectLanguageFaultyText() {
-        DetectedLanguage primaryLanguage = new DetectedLanguage("(Unknown)", "(Unknown)", 0.0);
+        DetectedLanguage primaryLanguage = new DetectedLanguage("(Unknown)", "(Unknown)", 0.0, null);
         validatePrimaryLanguage(client.detectLanguage("!@#%%"), primaryLanguage);
     }
 
@@ -139,7 +140,7 @@ public void detectLanguageInvalidCountryHint() {
      */
     @Test
     public void detectLanguageEmptyCountryHint() {
-        validatePrimaryLanguage(new DetectedLanguage("Spanish", "es", 0.0),
+        validatePrimaryLanguage(new DetectedLanguage("Spanish", "es", 0.0, null),
             client.detectLanguage("Este es un documento  escrito en Español", ""));
     }
 
@@ -148,7 +149,7 @@ public void detectLanguageEmptyCountryHint() {
      */
     @Test
     public void detectLanguageNoneCountryHint() {
-        validatePrimaryLanguage(new DetectedLanguage("Spanish", "es", 0.0),
+        validatePrimaryLanguage(new DetectedLanguage("Spanish", "es", 0.0, null),
             client.detectLanguage("Este es un documento  escrito en Español", "none"));
     }
 
@@ -168,12 +169,8 @@ public void detectLanguageDuplicateIdInput() {
 
     @Test
     public void recognizeEntitiesForTextInput() {
-        final CategorizedEntity categorizedEntity1 = new CategorizedEntity("Seattle", EntityCategory.LOCATION, "GPE", 26, 7, 0.0);
-        final CategorizedEntity categorizedEntity2 = new CategorizedEntity("last week", EntityCategory.DATE_TIME, "DateRange", 34, 9, 0.0);
-
         final List<CategorizedEntity> entities = client.recognizeEntities("I had a wonderful trip to Seattle last week.").stream().collect(Collectors.toList());
-        validateCategorizedEntity(categorizedEntity1, entities.get(0));
-        validateCategorizedEntity(categorizedEntity2, entities.get(1));
+        validateCategorizedEntities(getCategorizedEntitiesList1(), entities);
     }
 
     @Test
@@ -187,10 +184,19 @@ public void recognizeEntitiesForFaultyText() {
         assertFalse(client.recognizeEntities("!@#%%").iterator().hasNext());
     }
 
+    @Test
+    public void recognizeEntitiesDuplicateIdInput() {
+        recognizeCategorizedEntityDuplicateIdRunner(inputs -> {
+            HttpResponseException response = assertThrows(HttpResponseException.class,
+                () -> client.recognizeEntitiesBatch(inputs, null, Context.NONE).stream().findFirst().get());
+            assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, response.getResponse().getStatusCode());
+        });
+    }
+
     @Test
     public void recognizeEntitiesBatchInputSingleError() {
         recognizeBatchCategorizedEntitySingleErrorRunner((inputs) -> {
-            TextAnalyticsPagedIterable<RecognizeCategorizedEntitiesResult> response = client.recognizeEntitiesBatch(inputs, null, Context.NONE);
+            TextAnalyticsPagedIterable<RecognizeEntitiesResult> response = client.recognizeEntitiesBatch(inputs, null, Context.NONE);
             response.forEach(recognizeEntitiesResult -> {
                 Exception exception = assertThrows(TextAnalyticsException.class, () -> recognizeEntitiesResult.getEntities());
                 assertTrue(exception.getMessage().equals(BATCH_ERROR_EXCEPTION_MESSAGE));
@@ -237,11 +243,21 @@ public void recognizeEntitiesForListWithOptions() {
                     validateCategorizedEntitiesWithPagedResponse(false, getExpectedBatchCategorizedEntities(), pagedResponse)));
     }
 
+    @Test
+    public void recognizeEntitiesTooManyDocuments() {
+        recognizeEntitiesTooManyDocumentsRunner(inputs -> {
+            HttpResponseException exception = assertThrows(HttpResponseException.class,
+                () -> client.recognizeEntitiesBatch(inputs).stream().findFirst().get());
+            assertEquals(EXCEEDED_ALLOWED_DOCUMENTS_LIMITS_MESSAGE, exception.getMessage());
+            assertEquals(INVALID_DOCUMENT_BATCH, exception.getValue().toString());
+        });
+    }
+
     // Recognize linked entity
 
     @Test
     public void recognizeLinkedEntitiesForTextInput() {
-        final LinkedEntityMatch linkedEntityMatch1 = new LinkedEntityMatch("Seattle", 0.0, 7, 26);
+        final LinkedEntityMatch linkedEntityMatch1 = new LinkedEntityMatch("Seattle", 0.0);
         final LinkedEntity linkedEntity1 = new LinkedEntity("Seattle",
             new IterableStream<>(Collections.singletonList(linkedEntityMatch1)),
             "en", "Seattle", "https://en.wikipedia.org/wiki/Seattle", "Wikipedia");
@@ -261,6 +277,15 @@ public void recognizeLinkedEntitiesForFaultyText() {
         assertFalse(client.recognizeLinkedEntities("!@#%%").iterator().hasNext());
     }
 
+    @Test
+    public void recognizeLinkedEntitiesDuplicateIdInput() {
+        recognizeBatchLinkedEntityDuplicateIdRunner(inputs -> {
+            HttpResponseException response = assertThrows(HttpResponseException.class,
+                () -> client.recognizeLinkedEntitiesBatch(inputs, null, Context.NONE).stream().findFirst().get());
+            assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, response.getResponse().getStatusCode());
+        });
+    }
+
     @Test
     public void recognizeLinkedEntitiesForBatchInput() {
         recognizeBatchLinkedEntityRunner((inputs) ->
@@ -296,6 +321,16 @@ public void recognizeLinkedEntitiesForListStringWithOptions() {
                 validateLinkedEntitiesWithPagedResponse(true, getExpectedBatchLinkedEntities(), pagedResponse)));
     }
 
+    @Test
+    public void recognizeLinkedEntitiesTooManyDocuments() {
+        recognizeLinkedEntitiesTooManyDocumentsRunner(inputs -> {
+            HttpResponseException exception = assertThrows(HttpResponseException.class,
+                () -> client.recognizeLinkedEntitiesBatch(inputs).stream().findFirst().get());
+            assertEquals(EXCEEDED_ALLOWED_DOCUMENTS_LIMITS_MESSAGE, exception.getMessage());
+            assertEquals(INVALID_DOCUMENT_BATCH, exception.getValue().toString());
+        });
+    }
+
     // Extract key phrase
 
     @Test
@@ -314,6 +349,15 @@ public void extractKeyPhrasesForFaultyText() {
         assertFalse(client.extractKeyPhrases("!@#%%").iterator().hasNext());
     }
 
+    @Test
+    public void extractKeyPhrasesDuplicateIdInput() {
+        extractBatchKeyPhrasesDuplicateIdRunner(inputs -> {
+            HttpResponseException response = assertThrows(HttpResponseException.class,
+                () -> client.extractKeyPhrasesBatch(inputs, null, Context.NONE).stream().findFirst().get());
+            assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, response.getResponse().getStatusCode());
+        });
+    }
+
     @Test
     public void extractKeyPhrasesForBatchInput() {
         extractBatchKeyPhrasesRunner((inputs) ->
@@ -349,6 +393,26 @@ public void extractKeyPhrasesForListStringWithOptions() {
                 validateExtractKeyPhraseWithPagedResponse(true, getExpectedBatchKeyPhrases(), pagedResponse)));
     }
 
+    @Test
+    public void extractKeyPhrasesWarning() {
+        extractKeyPhrasesWarningRunner(input ->
+            client.extractKeyPhrases(input).getWarnings().forEach(warning -> {
+                assertTrue(WARNING_TOO_LONG_DOCUMENT_INPUT_MESSAGE.equals(warning.getMessage()));
+                assertTrue(LONG_WORDS_IN_DOCUMENT.equals(warning.getWarningCode()));
+            }));
+    }
+
+    @Test
+    public void extractKeyPhrasesBatchWarning() {
+        extractKeyPhrasesBatchWarningRunner(inputs ->
+            client.extractKeyPhrasesBatch(inputs, null, Context.NONE).forEach(keyPhrasesResult ->
+                keyPhrasesResult.getKeyPhrases().getWarnings().forEach(warning -> {
+                    assertTrue(WARNING_TOO_LONG_DOCUMENT_INPUT_MESSAGE.equals(warning.getMessage()));
+                    assertTrue(LONG_WORDS_IN_DOCUMENT.equals(warning.getWarningCode()));
+                })
+            ));
+    }
+
     // Sentiment
 
     /**
@@ -360,9 +424,9 @@ public void analyseSentimentForTextInput() {
             TextSentiment.MIXED,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 31, 0),
-                new SentenceSentiment(TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0), 35, 32)
-            )));
+                new SentenceSentiment("", TextSentiment.NEGATIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.POSITIVE, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
         DocumentSentiment analyzeSentimentResult =
             client.analyzeSentiment("The hotel was dark and unclean. The restaurant had amazing gnocchi.");
 
@@ -386,15 +450,27 @@ public void analyseSentimentForFaultyText() {
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(TextSentiment.NEUTRAL,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
             new IterableStream<>(Arrays.asList(
-                new SentenceSentiment(TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0), 1, 0),
-                new SentenceSentiment(TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0), 4, 1)
-            )));
+                new SentenceSentiment("", TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0)),
+                new SentenceSentiment("", TextSentiment.NEUTRAL, new SentimentConfidenceScores(0.0, 0.0, 0.0))
+            )), null);
 
         DocumentSentiment analyzeSentimentResult = client.analyzeSentiment("!@#%%");
 
         validateAnalyzedSentiment(expectedDocumentSentiment, analyzeSentimentResult);
     }
 
+    /**
+     * Test analyzing sentiment for a duplicate ID list.
+     */
+    @Test
+    public void analyseSentimentDuplicateIdInput() {
+        analyseBatchSentimentDuplicateIdRunner(inputs -> {
+            HttpResponseException response = assertThrows(HttpResponseException.class,
+                () -> client.analyzeSentimentBatch(inputs, null, Context.NONE).stream().findFirst().get());
+            assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, response.getResponse().getStatusCode());
+        });
+    }
+
     /**
      * Test analyzing sentiment for a list of string input.
      */
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
index a2eb0b79f461..93f15062c3cb 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
@@ -8,27 +8,27 @@
 import com.azure.ai.textanalytics.models.DetectLanguageInput;
 import com.azure.ai.textanalytics.models.DetectLanguageResult;
 import com.azure.ai.textanalytics.models.DetectedLanguage;
-import com.azure.ai.textanalytics.models.DocumentResult;
 import com.azure.ai.textanalytics.models.DocumentSentiment;
 import com.azure.ai.textanalytics.models.ExtractKeyPhraseResult;
 import com.azure.ai.textanalytics.models.LinkedEntity;
 import com.azure.ai.textanalytics.models.LinkedEntityMatch;
-import com.azure.ai.textanalytics.models.RecognizeCategorizedEntitiesResult;
+import com.azure.ai.textanalytics.models.RecognizeEntitiesResult;
 import com.azure.ai.textanalytics.models.RecognizeLinkedEntitiesResult;
 import com.azure.ai.textanalytics.models.SentenceSentiment;
 import com.azure.ai.textanalytics.models.TextAnalyticsError;
 import com.azure.ai.textanalytics.models.TextAnalyticsRequestOptions;
+import com.azure.ai.textanalytics.models.TextAnalyticsResult;
 import com.azure.ai.textanalytics.models.TextDocumentBatchStatistics;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
 import com.azure.ai.textanalytics.models.TextDocumentStatistics;
 import com.azure.ai.textanalytics.util.TextAnalyticsPagedResponse;
-import com.azure.core.credential.TokenCredential;
+import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.netty.NettyAsyncHttpClientBuilder;
 import com.azure.core.http.policy.AddDatePolicy;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
+import com.azure.core.http.policy.AzureKeyCredentialPolicy;
 import com.azure.core.http.policy.HttpLogDetailLevel;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -40,10 +40,10 @@
 import com.azure.core.test.TestBase;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.CoreUtils;
-import com.azure.identity.DefaultAzureCredentialBuilder;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -59,33 +59,40 @@
 import static com.azure.ai.textanalytics.TestUtils.KEY_PHRASE_INPUTS;
 import static com.azure.ai.textanalytics.TestUtils.LINKED_ENTITY_INPUTS;
 import static com.azure.ai.textanalytics.TestUtils.SENTIMENT_INPUTS;
+import static com.azure.ai.textanalytics.TestUtils.TOO_LONG_INPUT;
+import static com.azure.ai.textanalytics.TestUtils.getDuplicateTextDocumentInputs;
+import static com.azure.ai.textanalytics.TestUtils.getWarningsTextDocumentInputs;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public abstract class TextAnalyticsClientTestBase extends TestBase {
-    private static final String DEFAULT_SCOPE = "https://cognitiveservices.azure.com/.default";
     private static final String NAME = "name";
     private static final String TEXT_ANALYTICS_PROPERTIES = "azure-ai-textanalytics.properties";
+    private static final String OCP_APIM_SUBSCRIPTION_KEY = "Ocp-Apim-Subscription-Key";
     private static final String VERSION = "version";
+    private static final String AZURE_TEXT_ANALYTICS_API_KEY = "AZURE_TEXT_ANALYTICS_API_KEY";
 
     private final HttpLogOptions httpLogOptions = new HttpLogOptions();
     private final Map<String, String> properties = CoreUtils.getProperties(TEXT_ANALYTICS_PROPERTIES);
     private final String clientName = properties.getOrDefault(NAME, "UnknownName");
     private final String clientVersion = properties.getOrDefault(VERSION, "UnknownVersion");
-    static final String BATCH_ERROR_EXCEPTION_MESSAGE = "Error in accessing the property on document id: 2, when RecognizeCategorizedEntitiesResult returned with an error: Document text is empty. ErrorCodeValue: {invalidDocument}";
+    static final String BATCH_ERROR_EXCEPTION_MESSAGE = "Error in accessing the property on document id: 2, when RecognizeEntitiesResult returned with an error: Document text is empty. ErrorCodeValue: {invalidDocument}";
+    static final String EXCEEDED_ALLOWED_DOCUMENTS_LIMITS_MESSAGE = "The number of documents in the request have exceeded the data limitations. See https://aka.ms/text-analytics-data-limits for additional information";
     static final String INVALID_COUNTRY_HINT_EXPECTED_EXCEPTION_MESSAGE = "Country hint is not valid. Please specify an ISO 3166-1 alpha-2 two letter country code. ErrorCodeValue: {invalidCountryHint}";
+    static final String INVALID_DOCUMENT_BATCH = "invalidDocumentBatch";
     static final String INVALID_DOCUMENT_BATCH_NPE_MESSAGE = "'documents' cannot be null.";
     static final String INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE = "'documents' cannot be empty.";
     static final String INVALID_DOCUMENT_EXPECTED_EXCEPTION_MESSAGE = "Document text is empty. ErrorCodeValue: {invalidDocument}";
     static final String INVALID_DOCUMENT_NPE_MESSAGE = "'document' cannot be null.";
+    static final String WARNING_TOO_LONG_DOCUMENT_INPUT_MESSAGE = "The document contains very long words (longer than 64 characters). These words will be truncated and may result in unreliable model predictions.";
 
     <T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
-        TokenCredential credential = null;
+        AzureKeyCredential credential = null;
 
         if (!interceptorManager.isPlaybackMode()) {
-            credential = new DefaultAzureCredentialBuilder().build();
+            credential = new AzureKeyCredential(
+                Configuration.getGlobalConfiguration().get(AZURE_TEXT_ANALYTICS_API_KEY));
         }
 
         HttpClient httpClient;
@@ -97,10 +104,11 @@ <T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
         policies.add(new RequestIdPolicy());
         policies.add(new AddDatePolicy());
 
-        HttpPolicyProviders.addBeforeRetryPolicies(policies);
         if (credential != null) {
-            policies.add(new BearerTokenAuthenticationPolicy(credential, DEFAULT_SCOPE));
+            policies.add(new AzureKeyCredentialPolicy(OCP_APIM_SUBSCRIPTION_KEY, credential));
         }
+
+        HttpPolicyProviders.addBeforeRetryPolicies(policies);
         policies.add(new RetryPolicy());
 
         HttpPolicyProviders.addAfterRetryPolicies(policies);
@@ -165,6 +173,9 @@ <T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
     @Test
     abstract void recognizeEntitiesForListLanguageHint();
 
+    @Test
+    abstract void recognizeEntitiesTooManyDocuments();
+
     // Linked Entities
     @Test
     abstract void recognizeLinkedEntitiesForTextInput();
@@ -184,6 +195,9 @@ <T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
     @Test
     abstract void recognizeLinkedEntitiesForListLanguageHint();
 
+    @Test
+    abstract void recognizeLinkedEntitiesTooManyDocuments();
+
     // Key Phrases
     @Test
     abstract void extractKeyPhrasesForTextInput();
@@ -203,6 +217,12 @@ <T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
     @Test
     abstract void extractKeyPhrasesForListLanguageHint();
 
+    @Test
+    abstract void extractKeyPhrasesWarning();
+
+    @Test
+    abstract void extractKeyPhrasesBatchWarning();
+
     // Sentiment
     @Test
     abstract void analyseSentimentForTextInput();
@@ -262,6 +282,10 @@ void recognizeCategorizedEntityStringInputRunner(Consumer<List<String>> testRunn
         testRunner.accept(CATEGORIZED_ENTITY_INPUTS);
     }
 
+    void recognizeCategorizedEntityDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
+        testRunner.accept(getDuplicateTextDocumentInputs());
+    }
+
     void recognizeCategorizedEntitiesLanguageHintRunner(BiConsumer<List<String>, String> testRunner) {
         testRunner.accept(CATEGORIZED_ENTITY_INPUTS, "en");
     }
@@ -288,6 +312,14 @@ void recognizeStringBatchCategorizedEntitiesShowStatsRunner(
         testRunner.accept(CATEGORIZED_ENTITY_INPUTS, new TextAnalyticsRequestOptions().setIncludeStatistics(true));
     }
 
+    void recognizeEntitiesTooManyDocumentsRunner(
+        Consumer<List<String>> testRunner) {
+        final String documentInput = CATEGORIZED_ENTITY_INPUTS.get(0);
+        // max num of document size is 5
+        testRunner.accept(
+            Arrays.asList(documentInput, documentInput, documentInput, documentInput, documentInput, documentInput));
+    }
+
     // Linked Entity runner
     void recognizeBatchStringLinkedEntitiesShowStatsRunner(
         BiConsumer<List<String>, TextAnalyticsRequestOptions> testRunner) {
@@ -313,6 +345,18 @@ void recognizeBatchLinkedEntityRunner(Consumer<List<TextDocumentInput>> testRunn
         testRunner.accept(TestUtils.getTextDocumentInputs(LINKED_ENTITY_INPUTS));
     }
 
+    void recognizeBatchLinkedEntityDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
+        testRunner.accept(getDuplicateTextDocumentInputs());
+    }
+
+    void recognizeLinkedEntitiesTooManyDocumentsRunner(
+        Consumer<List<String>> testRunner) {
+        final String documentInput = LINKED_ENTITY_INPUTS.get(0);
+        // max num of document size is 5
+        testRunner.accept(
+            Arrays.asList(documentInput, documentInput, documentInput, documentInput, documentInput, documentInput));
+    }
+
     // Key Phrases runner
     void extractBatchStringKeyPhrasesShowStatsRunner(BiConsumer<List<String>, TextAnalyticsRequestOptions> testRunner) {
         testRunner.accept(KEY_PHRASE_INPUTS, new TextAnalyticsRequestOptions().setIncludeStatistics(true));
@@ -337,6 +381,18 @@ void extractBatchKeyPhrasesRunner(Consumer<List<TextDocumentInput>> testRunner)
         testRunner.accept(TestUtils.getTextDocumentInputs(KEY_PHRASE_INPUTS));
     }
 
+    void extractBatchKeyPhrasesDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
+        testRunner.accept(getDuplicateTextDocumentInputs());
+    }
+
+    void extractKeyPhrasesWarningRunner(Consumer<String> testRunner) {
+        testRunner.accept(TOO_LONG_INPUT);
+    }
+
+    void extractKeyPhrasesBatchWarningRunner(Consumer<List<TextDocumentInput>> testRunner) {
+        testRunner.accept(getWarningsTextDocumentInputs());
+    }
+
     // Sentiment Runner
     void analyseSentimentLanguageHintRunner(BiConsumer<List<String>, String> testRunner) {
         testRunner.accept(SENTIMENT_INPUTS, "en");
@@ -350,6 +406,10 @@ void analyseBatchSentimentRunner(Consumer<List<TextDocumentInput>> testRunner) {
         testRunner.accept(TestUtils.getTextDocumentInputs(SENTIMENT_INPUTS));
     }
 
+    void analyseBatchSentimentDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
+        testRunner.accept(getDuplicateTextDocumentInputs());
+    }
+
     void analyseBatchStringSentimentShowStatsRunner(BiConsumer<List<String>, TextAnalyticsRequestOptions> testRunner) {
         testRunner.accept(SENTIMENT_INPUTS, new TextAnalyticsRequestOptions().setIncludeStatistics(true));
     }
@@ -370,15 +430,15 @@ String getEndpoint() {
 
     static void validateDetectLanguage(boolean showStatistics, TextAnalyticsPagedResponse<DetectLanguageResult> expected,
         TextAnalyticsPagedResponse<DetectLanguageResult> actual) {
-        validateDocumentResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
+        validateTextAnalyticsResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
             validatePrimaryLanguage(expectedItem.getPrimaryLanguage(), actualItem.getPrimaryLanguage()));
     }
 
     static void validateCategorizedEntitiesWithPagedResponse(boolean showStatistics,
-        TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult> expected,
-        TextAnalyticsPagedResponse<RecognizeCategorizedEntitiesResult> actual) {
+        TextAnalyticsPagedResponse<RecognizeEntitiesResult> expected,
+        TextAnalyticsPagedResponse<RecognizeEntitiesResult> actual) {
 
-        validateDocumentResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
+        validateTextAnalyticsResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
             validateCategorizedEntities(
                 expectedItem.getEntities().stream().collect(Collectors.toList()),
                 actualItem.getEntities().stream().collect(Collectors.toList())));
@@ -392,7 +452,7 @@ static void validateCategorizedEntities(
     static void validateLinkedEntitiesWithPagedResponse(boolean showStatistics,
         TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult> expected,
         TextAnalyticsPagedResponse<RecognizeLinkedEntitiesResult> actual) {
-        validateDocumentResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
+        validateTextAnalyticsResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
             validateLinkedEntities(
                 expectedItem.getEntities().stream().collect(Collectors.toList()),
                 actualItem.getEntities().stream().collect(Collectors.toList())));
@@ -401,7 +461,7 @@ static void validateLinkedEntitiesWithPagedResponse(boolean showStatistics,
     static void validateExtractKeyPhraseWithPagedResponse(boolean showStatistics,
         TextAnalyticsPagedResponse<ExtractKeyPhraseResult> expected,
         TextAnalyticsPagedResponse<ExtractKeyPhraseResult> actual) {
-        validateDocumentResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
+        validateTextAnalyticsResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
             validateKeyPhrases(
                 expectedItem.getKeyPhrases().stream().collect(Collectors.toList()),
                 actualItem.getKeyPhrases().stream().collect(Collectors.toList())));
@@ -410,7 +470,7 @@ static void validateExtractKeyPhraseWithPagedResponse(boolean showStatistics,
     static void validateSentimentWithPagedResponse(boolean showStatistics,
         TextAnalyticsPagedResponse<AnalyzeSentimentResult> expected,
         TextAnalyticsPagedResponse<AnalyzeSentimentResult> actual) {
-        validateDocumentResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
+        validateTextAnalyticsResult(showStatistics, expected, actual, (expectedItem, actualItem) ->
             validateAnalyzedSentiment(expectedItem.getDocumentSentiment(), actualItem.getDocumentSentiment()));
     }
 
@@ -423,7 +483,7 @@ static void validateSentimentWithPagedResponse(boolean showStatistics,
     static void validatePrimaryLanguage(DetectedLanguage expectedLanguage, DetectedLanguage actualLanguage) {
         assertEquals(expectedLanguage.getIso6391Name(), actualLanguage.getIso6391Name());
         assertEquals(expectedLanguage.getName(), actualLanguage.getName());
-        assertNotNull(actualLanguage.getScore());
+        assertNotNull(actualLanguage.getConfidenceScore());
     }
 
     /**
@@ -434,9 +494,7 @@ static void validatePrimaryLanguage(DetectedLanguage expectedLanguage, DetectedL
      */
     static void validateCategorizedEntity(
         CategorizedEntity expectedCategorizedEntity, CategorizedEntity actualCategorizedEntity) {
-        assertEquals(expectedCategorizedEntity.getGraphemeLength() > 0, actualCategorizedEntity.getGraphemeLength() > 0);
-        assertEquals(expectedCategorizedEntity.getGraphemeOffset(), actualCategorizedEntity.getGraphemeOffset());
-        assertEquals(expectedCategorizedEntity.getSubCategory(), actualCategorizedEntity.getSubCategory());
+        assertEquals(expectedCategorizedEntity.getSubcategory(), actualCategorizedEntity.getSubcategory());
         assertEquals(expectedCategorizedEntity.getText(), actualCategorizedEntity.getText());
         assertEquals(expectedCategorizedEntity.getCategory(), actualCategorizedEntity.getCategory());
         assertNotNull(actualCategorizedEntity.getConfidenceScore());
@@ -454,8 +512,8 @@ static void validateLinkedEntity(LinkedEntity expectedLinkedEntity, LinkedEntity
         assertEquals(expectedLinkedEntity.getLanguage(), actualLinkedEntity.getLanguage());
         assertEquals(expectedLinkedEntity.getUrl(), actualLinkedEntity.getUrl());
         assertEquals(expectedLinkedEntity.getDataSourceEntityId(), actualLinkedEntity.getDataSourceEntityId());
-        validateLinkedEntityMatches(expectedLinkedEntity.getLinkedEntityMatches().stream().collect(Collectors.toList()),
-            actualLinkedEntity.getLinkedEntityMatches().stream().collect(Collectors.toList()));
+        validateLinkedEntityMatches(expectedLinkedEntity.getMatches().stream().collect(Collectors.toList()),
+            actualLinkedEntity.getMatches().stream().collect(Collectors.toList()));
     }
 
     /**
@@ -536,9 +594,6 @@ static void validateAnalyzedSentenceSentiment(List<SentenceSentiment> expectedSe
      */
     static void validateSentenceSentiment(SentenceSentiment expectedSentiment, SentenceSentiment actualSentiment) {
         assertEquals(expectedSentiment.getSentiment(), actualSentiment.getSentiment());
-        // score per label doesn't need to verify since service can return it with different values
-        assertEquals(expectedSentiment.getGraphemeOffset(), actualSentiment.getGraphemeOffset());
-        assertTrue(actualSentiment.getGraphemeLength() > 0);
     }
 
     /**
@@ -555,16 +610,16 @@ static void validateAnalyzedSentiment(DocumentSentiment expectedSentiment, Docum
     }
 
     /**
-     * Helper method to verify {@link DocumentResult documents} returned in a batch request.
+     * Helper method to verify {@link TextAnalyticsResult documents} returned in a batch request.
      */
-    private static <T extends DocumentResult> void validateDocumentResult(boolean showStatistics,
+    private static <T extends TextAnalyticsResult> void validateTextAnalyticsResult(boolean showStatistics,
         TextAnalyticsPagedResponse<T> expectedResults, TextAnalyticsPagedResponse<T> actualResults,
         BiConsumer<T, T> additionalAssertions) {
 
         final Map<String, T> expected = expectedResults.getElements().stream().collect(
-            Collectors.toMap(DocumentResult::getId, r -> r));
+            Collectors.toMap(TextAnalyticsResult::getId, r -> r));
         final Map<String, T> actual = actualResults.getElements().stream().collect(
-            Collectors.toMap(DocumentResult::getId, r -> r));
+            Collectors.toMap(TextAnalyticsResult::getId, r -> r));
 
         assertEquals(expected.size(), actual.size());
 
@@ -584,7 +639,7 @@ private static <T extends DocumentResult> void validateDocumentResult(boolean sh
                 assertNull(actualValue.getError());
             } else {
                 assertNotNull(actualValue.getError());
-                assertEquals(expectedValue.getError().getCode(), actualValue.getError().getCode());
+                assertEquals(expectedValue.getError().getErrorCode(), actualValue.getError().getErrorCode());
 
                 validateErrorDocument(expectedValue.getError(), actualValue.getError());
             }
@@ -600,7 +655,7 @@ private static <T extends DocumentResult> void validateDocumentResult(boolean sh
      * @param actualStatistics the value returned by API.
      */
     private static void validateBatchStatistics(TextDocumentBatchStatistics expectedStatistics,
-        TextDocumentBatchStatistics actualStatistics) {
+                                                TextDocumentBatchStatistics actualStatistics) {
         assertEquals(expectedStatistics.getDocumentCount(), actualStatistics.getDocumentCount());
         assertEquals(expectedStatistics.getInvalidDocumentCount(), actualStatistics.getInvalidDocumentCount());
         assertEquals(expectedStatistics.getValidDocumentCount(), actualStatistics.getValidDocumentCount());
@@ -614,7 +669,7 @@ private static void validateBatchStatistics(TextDocumentBatchStatistics expected
      * @param actual the value returned by API.
      */
     private static void validateDocumentStatistics(TextDocumentStatistics expected, TextDocumentStatistics actual) {
-        assertEquals(expected.getGraphemeCount(), actual.getGraphemeCount());
+        assertEquals(expected.getCharacterCount(), actual.getCharacterCount());
         assertEquals(expected.getTransactionCount(), actual.getTransactionCount());
     }
 
@@ -634,8 +689,6 @@ private static void validateLinkedEntityMatches(List<LinkedEntityMatch> expected
             LinkedEntityMatch expectedLinkedEntity = expectedLinkedEntityMatches.get(i);
             LinkedEntityMatch actualLinkedEntity = actualLinkedEntityMatches.get(i);
             assertEquals(expectedLinkedEntity.getText(), actualLinkedEntity.getText());
-            assertEquals(expectedLinkedEntity.getGraphemeLength() > 0, actualLinkedEntity.getGraphemeLength() > 0);
-            assertEquals(expectedLinkedEntity.getGraphemeOffset(), actualLinkedEntity.getGraphemeOffset());
             assertNotNull(actualLinkedEntity.getConfidenceScore());
         }
     }
@@ -647,7 +700,7 @@ private static void validateLinkedEntityMatches(List<LinkedEntityMatch> expected
      * @param actualError the Error returned from the API.
      */
     static void validateErrorDocument(TextAnalyticsError expectedError, TextAnalyticsError actualError) {
-        assertEquals(expectedError.getCode(), actualError.getCode());
+        assertEquals(expectedError.getErrorCode(), actualError.getErrorCode());
         assertEquals(expectedError.getMessage(), actualError.getMessage());
         assertEquals(expectedError.getTarget(), actualError.getTarget());
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json
new file mode 100644
index 000000000000..981578e39fb6
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json
@@ -0,0 +1,25 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "6157e5fc-f3a3-4917-8509-cf4d293c4444",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "7",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "cc8ae190-2e4c-4271-b95e-0ccbd1d57cdb",
+      "retry-after" : "0",
+      "StatusCode" : "400",
+      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"}}}",
+      "Date" : "Thu, 30 Apr 2020 04:52:39 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json
index 93bafb2af6dd..db9e4dfdaed6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "bf7faa24-cf2d-48a2-b5a0-4839675aa06d",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "a5fdc3a0-3fa7-4b80-98e8-7a739d4c352a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "67",
+      "x-envoy-upstream-service-time" : "109",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "6ed77caa-7761-4a25-afce-f37f8a60efcf",
-      "x-aml-ta-request-id" : "87035b65-f78c-40a9-b459-3d016bdeb20a",
+      "apim-request-id" : "48f66acf-87f2-4d9b-96e1-e782aff54539",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":32,\"length\":35}]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":0,\"length\":35},{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":36,\"length\":31}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 20:43:32 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"},{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31,\"text\":\"The hotel was dark and unclean.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json
index 1743cd120c65..b207bb28e59d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "26c1f86c-5406-45ef-8c38-0b88b6a9ee10",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "5bfc2f94-994e-4501-bc55-7bef62ab587a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "60",
+      "x-envoy-upstream-service-time" : "120",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "6c82ea83-668f-4271-9fa3-0cc085e488cb",
-      "x-aml-ta-request-id" : "9a184222-e1ba-4b35-800a-0043c3026dd8",
+      "apim-request-id" : "baf52579-73a8-4377-8a02-d5ab016d55ca",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":32,\"length\":35}]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":0,\"length\":35},{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":36,\"length\":31}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 20:43:25 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"},{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31,\"text\":\"The hotel was dark and unclean.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json
index a7601afb38d0..aca336e6ecb3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "49cc98cd-a9a6-47ab-8436-794c4639fe0a",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "390d98ec-ee3c-46d8-9157-8fb209d916d4",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "72",
+      "x-envoy-upstream-service-time" : "137",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "24cf6a35-734c-4aad-a1be-aa1be6a46518",
-      "x-aml-ta-request-id" : "f4b4ea38-f3d8-48af-bf43-232e549a6331",
+      "apim-request-id" : "dc845cbb-ed0b-4139-8690-ffa5ce91d351",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":32,\"length\":35}]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":0,\"length\":35},{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":36,\"length\":31}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 20:43:30 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"},{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31,\"text\":\"The hotel was dark and unclean.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json
index d1cb1f9abdfc..ea87abfb662a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json
@@ -1,23 +1,22 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "2fb51e4d-367e-466c-b23f-69f368e06e61",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c7f450bb-9aa1-46a1-bd87-e76c7441bc67",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "1",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "ab72127f-7d59-4faf-b220-79c937ba79ea",
-      "x-aml-ta-request-id" : "4595ea83-9cd4-43d5-823c-6ca4260c34ae",
+      "apim-request-id" : "efbe390c-f5c2-41a3-886b-d6dcc12c2ab5",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"},\"message\":\"Invalid document in request.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 20:43:31 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json
index 8be0a0e634c1..190918010d9d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "a8e16b67-cc8b-4b8f-923f-888b1e203230",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c715c68e-bf05-43a7-92e6-152e7c0833d2",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "84",
+      "x-envoy-upstream-service-time" : "110",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "ff93d5f5-a592-44ac-9f2d-1b418f7db010",
-      "x-aml-ta-request-id" : "8c43f061-d353-4967-8485-25e22a939777",
+      "apim-request-id" : "7d859041-8a10-45dc-b769-662885e9ee7e",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"neutral\",\"documentScores\":{\"positive\":0.0645807832479477,\"neutral\":0.91058224439620972,\"negative\":0.0248369835317135},\"sentences\":[{\"sentiment\":\"neutral\",\"sentenceScores\":{\"positive\":0.0645807832479477,\"neutral\":0.91058224439620972,\"negative\":0.0248369835317135},\"offset\":0,\"length\":1},{\"sentiment\":\"neutral\",\"sentenceScores\":{\"positive\":0.0645807832479477,\"neutral\":0.91058224439620972,\"negative\":0.0248369835317135},\"offset\":1,\"length\":4}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Wed, 08 Jan 2020 02:26:45 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"neutral\",\"confidenceScores\":{\"positive\":0.06,\"neutral\":0.91,\"negative\":0.03},\"sentences\":[{\"sentiment\":\"neutral\",\"confidenceScores\":{\"positive\":0.06,\"neutral\":0.91,\"negative\":0.03},\"offset\":0,\"length\":1,\"text\":\"!\"},{\"sentiment\":\"neutral\",\"confidenceScores\":{\"positive\":0.06,\"neutral\":0.91,\"negative\":0.03},\"offset\":1,\"length\":4,\"text\":\"@#%%\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json
index dcff83114c1c..5416b59e4f20 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "39e2b93d-5a80-47c4-baaa-0222f0ef037c",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "8c4f6331-de27-4bd5-94e9-62694e7bf1ce",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "63",
+      "x-envoy-upstream-service-time" : "111",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "93a951b1-5086-4eab-b445-ffa38afddeba",
-      "x-aml-ta-request-id" : "bb3d367a-e339-47f8-9a96-97a1335964be",
+      "apim-request-id" : "94a7a5af-8561-4e49-a42d-2c4691b42f94",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":32,\"length\":35}]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903649390442,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318602975924,\"negative\":0.000139072391903},\"offset\":0,\"length\":35},{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08880950999E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":36,\"length\":31}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 20:43:29 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"},{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31,\"text\":\"The hotel was dark and unclean.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json
index e2ad3503aeee..0e5fe7cae062 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "98a43bfa-089f-49df-8731-5babd7f10c02",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "7a71ad5f-9e38-46d3-a97f-7d22b6be4147",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "62",
+      "x-envoy-upstream-service-time" : "116",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "f5f00435-4427-4074-8b88-70b9e8150115",
+      "apim-request-id" : "f81daae1-a4e8-4afa-be62-a6b466a0c7b5",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"documentScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35}]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"documentScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35},{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Wed, 04 Mar 2020 17:13:59 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]},{\"id\":\"1\",\"sentiment\":\"mixed\",\"statistics\":{\"charactersCount\":67,\"transactionsCount\":1},\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":0,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"},{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":36,\"length\":31,\"text\":\"The hotel was dark and unclean.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json
index 5f2023e4717a..98a159515f80 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json
@@ -1,24 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/sentiment",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//sentiment",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "77d36e4e-e07c-4699-8156-0b2ce6873a5f",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "3a1c8bc7-9278-4a60-8baa-c5c304b349f3",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "66",
+      "x-envoy-upstream-service-time" : "116",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "2b0778b3-eac0-4109-a7d1-5637122262e1",
-      "x-aml-ta-request-id" : "bbd07093-e174-4f8f-9fb6-9ec33cd48812",
+      "apim-request-id" : "75039135-fa22-4c6c-825d-6452b99e24ca",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"documentScores\":{\"positive\":0.49978500604629522,\"neutral\":0.0001903650991153,\"negative\":0.500024676322937},\"sentences\":[{\"sentiment\":\"negative\",\"sentenceScores\":{\"positive\":4.08881751355E-05,\"neutral\":4.88695768581E-05,\"negative\":0.99991023540496826},\"offset\":0,\"length\":31},{\"sentiment\":\"positive\",\"sentenceScores\":{\"positive\":0.99952912330627441,\"neutral\":0.0003318606177345,\"negative\":0.0001390725374222},\"offset\":32,\"length\":35}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Wed, 08 Jan 2020 02:16:05 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"sentiment\":\"mixed\",\"confidenceScores\":{\"positive\":0.5,\"neutral\":0.0,\"negative\":0.5},\"sentences\":[{\"sentiment\":\"negative\",\"confidenceScores\":{\"positive\":0.0,\"neutral\":0.0,\"negative\":1.0},\"offset\":0,\"length\":31,\"text\":\"The hotel was dark and unclean.\"},{\"sentiment\":\"positive\",\"confidenceScores\":{\"positive\":1.0,\"neutral\":0.0,\"negative\":0.0},\"offset\":32,\"length\":35,\"text\":\"The restaurant had amazing gnocchi.\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHint.json
index 68a9cba58b8a..474e09f6baf7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHint.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "4c6db74e-74ae-4e61-8278-41e99211e1a4",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "d29baca1-0bf4-47f1-927d-f04f6f2f1f43",
       "Content-Type" : "application/json"
     },
     "Response" : {
@@ -13,11 +13,11 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "3bc19e7b-f06a-414f-a880-9656b6a837e4",
+      "apim-request-id" : "219091a3-23fd-4e8f-af46-51788a011907",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 22:51:44 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHintForBatchOperation.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHintForBatchOperation.json
index 354ffc5febf8..e5982a588866 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHintForBatchOperation.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultCountryHintForBatchOperation.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "c701c8da-5348-430e-aa36-5b86360b8a40",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "0e50d1aa-13ce-4b88-aa46-cb6786bc979e",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "444ce462-b874-48dd-84d8-b1f32bd1c290",
+      "apim-request-id" : "0dbd716c-942a-46fd-abca-a903c3e12a1d",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 22:51:44 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguage.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguage.json
index 18be91fe858d..cb08dfb81944 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguage.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguage.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "7da7488d-e991-4614-88e0-313fb941d653",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "d2a6d6de-e582-4584-87f8-129704d4a54a",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "5f58f826-95be-480c-b45f-f26defce1eff",
+      "apim-request-id" : "39eb45d0-ea4e-4ed5-88b3-be834a3329b1",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Mondly\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 21:10:24 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Mondly\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguageForBatchOperation.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguageForBatchOperation.json
index efae6aec91c2..96ed69d31d14 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguageForBatchOperation.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultLanguageForBatchOperation.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "95447ddf-aa08-4504-b78a-10ee4fa414e2",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "5cf9ac37-da20-4c6b-9f71-ab4b9fa90e83",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "4",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "f302cc2b-71fb-4981-b5f1-037f9f966f8d",
+      "apim-request-id" : "f57d2158-f80f-4193-a069-ec2f610974b0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"]},{\"id\":\"1\",\"keyPhrases\":[\"Mondly\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 20 Mar 2020 16:53:35 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"],\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"Mondly\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultPipeline.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultPipeline.json
index dd977e734a68..0002fdce69f2 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultPipeline.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithDefaultPipeline.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "04efccd7-3ca3-4797-b1c5-e02013ec5dfc",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "1d791e03-8ed9-4525-b738-129fc648fb45",
       "Content-Type" : "application/json"
     },
     "Response" : {
@@ -13,11 +13,11 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "78545539-a57c-40bd-97e5-d460dcf711ec",
+      "apim-request-id" : "3cab5f4e-4710-43a9-acbd-bbed7e479147",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 20 Mar 2020 16:53:30 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithInvalidApiKeyCredential.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithInvalidApiKeyCredential.json
index e7692635bfe5..04880f093033 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithInvalidApiKeyCredential.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithInvalidApiKeyCredential.json
@@ -1,18 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "297f0a4a-de6b-4966-aa4d-33f140d1f670",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "7668c3a1-18fe-4517-aec6-807f6464d047",
       "Content-Type" : "application/json"
     },
     "Response" : {
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "2ef43920-d9b5-4c04-bb25-834463644188",
+      "WWW-Authenticate" : "AzureApiManagementKey realm=\"https://westus2.ppe.cognitiveservices.azure.com/text/analytics\",name=\"Ocp-Apim-Subscription-Key\",type=\"header\"",
       "retry-after" : "0",
-      "Content-Length" : "224",
+      "Content-Length" : "225",
       "StatusCode" : "401",
-      "Body" : "{\"error\":{\"code\":\"401\",\"message\":\"Access denied due to invalid subscription key or wrong API endpoint. Make sure to provide a valid key for an active subscription and use a correct regional API endpoint for your resource.\"}}",
-      "Date" : "Fri, 20 Mar 2020 16:53:38 GMT"
+      "Body" : "{\"error\":{\"code\":\"401\",\"message\": \"Access denied due to invalid subscription key or wrong API endpoint. Make sure to provide a valid key for an active subscription and use a correct regional API endpoint for your resource.\"}}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
+      "Content-Type" : "application/json"
     },
     "Exception" : null
   } ],
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHint.json
index 6703abae9af4..13d83b442b6d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHint.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "a25f5b7e-1d4e-42f3-8b4f-189cb9affc43",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "ec96c7c2-36eb-4a6b-9fa2-0761348f2233",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "7620488d-1148-4924-8d8d-e7c95e27fe03",
+      "apim-request-id" : "8b6a679f-87fb-4b48-8de6-d733c232700f",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 22:51:44 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHintForBatchOperation.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHintForBatchOperation.json
index 65f1aa8e8710..9a167ad1897a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHintForBatchOperation.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewCountryHintForBatchOperation.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "b9405833-b709-4c4f-a3e7-17741e7c3178",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "ea9b85d5-fd0b-4b53-91e8-ebc4d05c664a",
       "Content-Type" : "application/json"
     },
     "Response" : {
@@ -13,11 +13,11 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "d70c3925-e502-43f2-bb1a-b9bc8e912d6b",
+      "apim-request-id" : "2d4567a0-347c-4706-8772-1b84e5c92e32",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 21:10:24 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguage.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguage.json
index 3304e4d8edb4..46528694c067 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguage.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguage.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "20df3367-e344-46ad-a758-953a6aaf9b5a",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "5e23dec1-dd4a-415e-b600-e109fc2f925c",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "4",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "be8f9584-b5bd-42cf-8e94-19eafbcb3a1a",
+      "apim-request-id" : "5a8ac46c-9125-46d2-804b-8e08fdc03089",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Je m'appelle Mondly\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 21:10:24 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Je m'appelle Mondly\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguageForBatchOperation.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguageForBatchOperation.json
index f2100635dd9d..a717ba37d52a 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguageForBatchOperation.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNewLanguageForBatchOperation.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "48bd44fa-ddfd-4623-a3d0-0238b4fbbe0a",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c0635dfd-294d-4cee-bb49-56849619da59",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "4",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "f4dcf448-f4fc-4834-bed6-a628ac21819b",
+      "apim-request-id" : "723acc13-583f-435c-bb27-9fe3bd416fe9",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"]},{\"id\":\"1\",\"keyPhrases\":[\"Je m'appelle Mondly\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 24 Mar 2020 21:10:24 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"],\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"Je m'appelle Mondly\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNullServiceVersion.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNullServiceVersion.json
index 680a28fded8f..b130c60189f8 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNullServiceVersion.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithNullServiceVersion.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "60b84ad6-8cd3-44f6-994d-b921bba266af",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c26cf288-c912-49f8-89db-f4e93a69ef4e",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "944245fd-8c77-4a44-b9e8-a4b4bca6bb44",
+      "apim-request-id" : "3e7b8e1a-71c0-4cd5-b5b3-8ca28fe65a0a",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 20 Mar 2020 16:53:32 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToInvalidKey.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToInvalidKey.json
index fd3fad454f8a..29c306958b92 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToInvalidKey.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToInvalidKey.json
@@ -1,18 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "6a544856-4a73-4773-bb7b-742a5f0b9af3",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "7263d388-8337-4f34-bd89-091877803b4e",
       "Content-Type" : "application/json"
     },
     "Response" : {
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "8b1cf6a6-aa5b-44b4-8c44-8ab8038c5913",
+      "WWW-Authenticate" : "AzureApiManagementKey realm=\"https://westus2.ppe.cognitiveservices.azure.com/text/analytics\",name=\"Ocp-Apim-Subscription-Key\",type=\"header\"",
       "retry-after" : "0",
-      "Content-Length" : "224",
+      "Content-Length" : "225",
       "StatusCode" : "401",
-      "Body" : "{\"error\":{\"code\":\"401\",\"message\":\"Access denied due to invalid subscription key or wrong API endpoint. Make sure to provide a valid key for an active subscription and use a correct regional API endpoint for your resource.\"}}",
-      "Date" : "Fri, 20 Mar 2020 16:53:40 GMT"
+      "Body" : "{\"error\":{\"code\":\"401\",\"message\": \"Access denied due to invalid subscription key or wrong API endpoint. Make sure to provide a valid key for an active subscription and use a correct regional API endpoint for your resource.\"}}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
+      "Content-Type" : "application/json"
     },
     "Exception" : null
   } ],
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToValidKey.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToValidKey.json
index a831a05d09bc..038740b6f6fc 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToValidKey.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithRotateToValidKey.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "7b4e038f-cbc3-40fb-b119-7e582d2aa502",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "bd554a3b-56e6-428a-b9c1-ca85499d1396",
       "Content-Type" : "application/json"
     },
     "Response" : {
@@ -13,11 +13,11 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "ca6e7e74-d2cb-4f5f-9a07-1eb67c0cb841",
+      "apim-request-id" : "814618b0-a84b-4329-8bf1-5c6b00e7dc2b",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 20 Mar 2020 16:53:32 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithValidApiKeyCredential.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithValidApiKeyCredential.json
index 34a66df7c2b4..e0f2a7a8be6d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithValidApiKeyCredential.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/clientBuilderWithValidApiKeyCredential.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.4 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "6e2ab1fa-eddf-4884-92c6-3ea97bdf7f9d",
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "15007527-5e92-4b9e-9a43-4ff1a2153247",
       "Content-Type" : "application/json"
     },
     "Response" : {
@@ -13,11 +13,11 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "b997d3bc-8cef-47f7-ba95-409871f90765",
+      "apim-request-id" : "6a90988f-83ad-4a6f-9598-62c3a5958ff7",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 20 Mar 2020 16:53:30 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:17 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json
index 4f36ba008693..0129d844b940 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json
@@ -1,26 +1,25 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "aabc5399-ae00-4ead-8ead-bca8b1989d7d",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b27774bc-d2d4-4f86-94fa-8af830bf480f",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "4",
+      "x-envoy-upstream-service-time" : "131",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "54177f2c-6394-44d2-b2eb-a972ad56c0d3",
-      "x-aml-ta-request-id" : "2eeef4d1-c228-4733-98b2-31b9c2fbbae1",
+      "apim-request-id" : "0c3ce8d9-fd5f-4ee9-9148-ef246412161d",
       "retry-after" : "0",
       "StatusCode" : "400",
-      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"},\"message\":\"Invalid document in request.\"}}",
-      "Date" : "Sun, 15 Dec 2019 18:40:59 GMT",
+      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"}}}",
+      "Date" : "Thu, 30 Apr 2020 03:19:53 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyCountryHint.json
index 887530f334c7..171ff3acffe4 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyCountryHint.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "a891b249-3510-4735-94ae-2816629ccc94",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "fc50ed8b-a253-44a0-9a3d-b3ddf8b735ad",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "1",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "d6d75a0b-87dd-4713-9821-e79ae51564db",
+      "apim-request-id" : "29ffb9f3-a27e-4153-a3b7-e9b81394c68e",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 03 Mar 2020 21:34:16 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyText.json
index 125d1b23ee4b..dfa19617cca6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageEmptyText.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "e4c37fd8-d81c-4ab7-a517-89257f475b92",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "fda541db-a54d-40ce-9af8-9c7c31b6720b",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "2",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=0",
-      "apim-request-id" : "1854038a-38d2-485c-960e-6ed5820ec990",
-      "x-aml-ta-request-id" : "5a2557a4-c158-4378-94e7-1b39f8605a62",
+      "apim-request-id" : "67ed867c-981d-459c-b069-8a83a61f7fbb",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"},\"message\":\"Invalid document in request.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:58 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageFaultyText.json
index 5e796018297d..cd50802112dc 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageFaultyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageFaultyText.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "d3a5ab6f-88f1-4391-afe9-f45f8ab573e0",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b4798dac-a6de-414c-b454-9015fc274e4c",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -13,15 +13,14 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "453f0d88-f510-421d-b79c-cf95a628e6be",
-      "x-aml-ta-request-id" : "2afe0f54-c9e9-4c61-96e5-f6b6243f428c",
+      "apim-request-id" : "8464a8c1-5b12-43ed-83ba-57ae307d8daa",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:41:00 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageInvalidCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageInvalidCountryHint.json
index a939e8fb3fe0..7053f0309988 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageInvalidCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageInvalidCountryHint.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "c628558e-16be-4406-8e3f-c16a5872ccf7",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b9cbba15-0057-4127-adf9-02a6573dbf20",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -13,15 +13,14 @@
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=0",
-      "apim-request-id" : "2f848a95-6b34-41bf-9a70-c639559eae87",
-      "x-aml-ta-request-id" : "240f51c5-2f65-466a-9f7c-8f32e1bee371",
+      "apim-request-id" : "d3048c6a-f280-4303-a500-6fbe274e42de",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidCountryHint\",\"message\":\"Country hint is not valid. Please specify an ISO 3166-1 alpha-2 two letter country code.\"},\"message\":\"Invalid Country Hint.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:59 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid Country Hint.\",\"innererror\":{\"code\":\"InvalidCountryHint\",\"message\":\"Country hint is not valid. Please specify an ISO 3166-1 alpha-2 two letter country code.\"}}}],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageNoneCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageNoneCountryHint.json
index 34aa1d41899e..6c14fdd16738 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageNoneCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguageNoneCountryHint.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "e3dcaa85-9081-4116-8f92-d9f6df308a9e",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b85ce7a1-93c9-4757-ae1e-8aa42c1efb2f",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "82ba5840-0dfd-4c78-a4a5-c9d4a2c8a37b",
+      "apim-request-id" : "650c3b64-125a-4045-aded-945ff682c6aa",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 03 Mar 2020 21:25:21 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInput.json
index cd1caf761f36..a0acc03c88e3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "3f29b175-67c1-4323-a35a-de116b207383",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "944c5c64-c881-4308-a447-816f72df9ab0",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "5",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=3",
-      "apim-request-id" : "43b9ec52-c955-4eeb-a1a5-2797a8207890",
-      "x-aml-ta-request-id" : "d192d264-5fc2-41ab-8bfd-13adfc42d6b1",
+      "apim-request-id" : "52ef94e1-4b42-49db-b8f2-5bd6bfed78de",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]},{\"id\":\"2\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:41:00 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"2\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInputShowStatistics.json
index 89db94dbc837..188f68f3e61f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInputShowStatistics.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchInputShowStatistics.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "e4223261-bd5d-4fe2-9554-e4e5446c56f4",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "e1e1b615-a26b-4c9e-961e-ae73b2168cf1",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "6",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=3",
-      "apim-request-id" : "f8999cef-f30b-4ffa-a471-9c8748c9fa47",
-      "x-aml-ta-request-id" : "25923640-7e6f-4e17-93db-625c1851e727",
+      "apim-request-id" : "48410bc9-b67c-4615-8bcf-2cadfe4f2d46",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":3,\"validDocumentsCount\":3,\"erroneousDocumentsCount\":0,\"transactionsCount\":3},\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}],\"statistics\":{\"charactersCount\":26,\"transactionsCount\":1}},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}],\"statistics\":{\"charactersCount\":40,\"transactionsCount\":1}},{\"id\":\"2\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}],\"statistics\":{\"charactersCount\":6,\"transactionsCount\":1}}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:59 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":3,\"validDocumentsCount\":3,\"erroneousDocumentsCount\":0,\"transactionsCount\":3},\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"statistics\":{\"charactersCount\":26,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"statistics\":{\"charactersCount\":40,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"2\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"statistics\":{\"charactersCount\":6,\"transactionsCount\":1},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHint.json
index bdc0dd1917b2..515ad3413f89 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHint.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "de228f54-3435-4075-bbe2-84d568ba00c5",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "e8c4d152-8f81-43ba-beab-333ffc907333",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "5",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=3",
-      "apim-request-id" : "ff18a335-ae1e-4041-b7ea-a723e1fe7e1c",
-      "x-aml-ta-request-id" : "0c8a99c1-0d5e-4e28-9b9d-2e5d54de567a",
+      "apim-request-id" : "a7d6e3ca-f60f-4a20-99ca-a5ac0ef79451",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]},{\"id\":\"2\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:59 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"2\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHintWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHintWithOptions.json
index ccd8d0bb7dd5..92ed0217cccf 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHintWithOptions.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchListCountryHintWithOptions.json
@@ -1,26 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "289f86d5-9be4-4aaa-997f-a2ef450ee431",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "e54088d4-3873-44d9-b21f-7d26d068896d",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "11",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=3",
-      "apim-request-id" : "015b0679-56c7-4f1e-b4d9-fd962085e8bb",
+      "apim-request-id" : "bdf7f3e6-3805-4dfd-bdc3-404e12b68a30",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":3,\"validDocumentsCount\":3,\"erroneousDocumentsCount\":0,\"transactionsCount\":3},\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}],\"statistics\":{\"charactersCount\":26,\"transactionsCount\":1}},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}],\"statistics\":{\"charactersCount\":40,\"transactionsCount\":1}},{\"id\":\"2\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}],\"statistics\":{\"charactersCount\":6,\"transactionsCount\":1}}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Wed, 04 Mar 2020 16:00:31 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":3,\"validDocumentsCount\":3,\"erroneousDocumentsCount\":0,\"transactionsCount\":3},\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"statistics\":{\"charactersCount\":26,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"statistics\":{\"charactersCount\":40,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"2\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"statistics\":{\"charactersCount\":6,\"transactionsCount\":1},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchStringInput.json
index 3948fdfc3bda..4f163bf2ab41 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchStringInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectLanguagesBatchStringInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "e55e2090-42ea-46ce-8916-c0302d77ef20",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "9fc32873-4b4c-47cb-8378-e1647f654d9a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "5",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=3",
-      "apim-request-id" : "79cf04cb-21fb-4ca5-9777-03bba3ad58c3",
-      "x-aml-ta-request-id" : "855d6420-bc78-49fa-853c-3f488453720b",
+      "apim-request-id" : "702da38b-f3d2-4d1f-8c01-c42cf5cdd23d",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]},{\"id\":\"1\",\"detectedLanguages\":[{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"score\":1.0}]},{\"id\":\"2\",\"detectedLanguages\":[{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"score\":0.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:58 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"1\",\"detectedLanguage\":{\"name\":\"Spanish\",\"iso6391Name\":\"es\",\"confidenceScore\":1.0},\"warnings\":[]},{\"id\":\"2\",\"detectedLanguage\":{\"name\":\"(Unknown)\",\"iso6391Name\":\"(Unknown)\",\"confidenceScore\":0.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectSingleTextLanguage.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectSingleTextLanguage.json
index 499490600f13..707c7cd28103 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectSingleTextLanguage.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/detectSingleTextLanguage.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//languages",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "42c2e666-5591-4307-a822-0e32dd28fde6",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "98b653f8-4f93-4fdc-b4ee-adabc657071c",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "bf650aba-ca58-41fe-a7bc-3ee2bb7b85c0",
-      "x-aml-ta-request-id" : "1fa535eb-5585-4d65-b242-c7686270f6a2",
+      "apim-request-id" : "ce9d081a-00cb-4505-81a9-d845d92a4210",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguages\":[{\"name\":\"English\",\"iso6391Name\":\"en\",\"score\":1.0}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Sun, 15 Dec 2019 18:40:59 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"detectedLanguage\":{\"name\":\"English\",\"iso6391Name\":\"en\",\"confidenceScore\":1.0},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesBatchWarning.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesBatchWarning.json
new file mode 100644
index 000000000000..574b1e965176
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesBatchWarning.json
@@ -0,0 +1,26 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "09f7916f-881b-4eda-b39d-9751d3a3807a",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "22",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
+      "apim-request-id" : "2fe14015-84a7-463c-b291-1c0843a2b509",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Thisisaveryveryverylongtextwhichgoesonforalongtimeandwhichalmost\"],\"warnings\":[{\"code\":\"LongWordsInDocument\",\"message\":\"The document contains very long words (longer than 64 characters). These words will be truncated and may result in unreliable model predictions.\"}]},{\"id\":\"1\",\"keyPhrases\":[\"Microsoft\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Thu, 07 May 2020 02:48:33 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesDuplicateIdInput.json
new file mode 100644
index 000000000000..5f13c5933a9d
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesDuplicateIdInput.json
@@ -0,0 +1,25 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "bd79c9e5-7980-4380-bc33-b523d2c53e2e",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "112",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "6c965e67-2741-4b70-97f2-6d4705d5f714",
+      "retry-after" : "0",
+      "StatusCode" : "400",
+      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"}}}",
+      "Date" : "Thu, 30 Apr 2020 04:52:37 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInput.json
index 25ceb4b396fa..b81a36772db3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "c06ff081-7cd8-4067-9a79-4e4abeb64e19",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "50ed4022-98a0-4504-a0ca-1e4ab870ab91",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "11",
+      "x-envoy-upstream-service-time" : "5",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "6d0a7ed6-0460-4828-be82-7e00e73857d4",
-      "x-aml-ta-request-id" : "8cfb3cb4-c4a9-46b9-aec6-c69e705ca62e",
+      "apim-request-id" : "3390b669-3026-418c-a00e-298bc6d64d38",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:33:53 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInputShowStatistics.json
index ff3104b125f8..e122a4129652 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInputShowStatistics.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchInputShowStatistics.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "cfeb9641-e809-4708-b37f-88358eaf0312",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "80c81b1a-6682-46cd-a2f3-5c1ec8673a8d",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "6",
+      "x-envoy-upstream-service-time" : "5",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "429897b3-0b7c-4d5c-9203-6eaab27da52f",
-      "x-aml-ta-request-id" : "c8d65a02-0651-4cf4-917a-f206f6f740c6",
+      "apim-request-id" : "d2d9b818-a6a7-47f5-9606-3ca8118b1d08",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"statistics\":{\"charactersCount\":49,\"transactionsCount\":1}},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"statistics\":{\"charactersCount\":21,\"transactionsCount\":1}}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:43:54 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"statistics\":{\"charactersCount\":49,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"statistics\":{\"charactersCount\":21,\"transactionsCount\":1},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchStringInput.json
index 55614eba5530..1787566b8905 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchStringInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForBatchStringInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "df579208-6407-49fe-8fef-d54739727c5f",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "d915e11c-f5c4-4147-a491-8b12787a203f",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "10",
+      "x-envoy-upstream-service-time" : "6",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "688d17a4-b114-4dc0-b2e8-fdff4de5500e",
-      "x-aml-ta-request-id" : "1b8e4fea-2ab2-4a3e-a5ab-223d7220aa30",
+      "apim-request-id" : "e73ae469-8ca5-4a26-bbb4-e548ff416167",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:32:49 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForEmptyText.json
index 0e72cdbb72ff..e7055afa0c2c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForEmptyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForEmptyText.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "42eff98a-0b1b-4624-aad2-b6b6e4cab91a",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "fcf765fa-9e9f-4c1f-b15b-b7a917cda77c",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "3",
+      "x-envoy-upstream-service-time" : "1",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=0",
-      "apim-request-id" : "6ab467f7-f320-4e1e-9c86-0126865b112e",
+      "apim-request-id" : "2917c294-c86c-44b3-8eaf-1a087a5332d5",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 10 Mar 2020 05:33:48 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForFaultyText.json
index 304ef66d9660..112abcec8fef 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForFaultyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForFaultyText.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "d825fe65-81b2-4959-8a04-323619abc8ff",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "054f1961-34b0-4f46-ba07-129ef22f203a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "5",
+      "x-envoy-upstream-service-time" : "3",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "5ae0d526-c2e7-42e1-b9bb-ff4b5e39e6de",
-      "x-aml-ta-request-id" : "a1f3e143-7ec6-4976-80c5-7380890ee157",
+      "apim-request-id" : "e8821ad2-0c24-40f6-abe4-21a9a0049264",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Mon, 16 Dec 2019 19:27:02 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListLanguageHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListLanguageHint.json
index d750249ae6d9..d67f8a762f93 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListLanguageHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListLanguageHint.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "d6a9fd72-8233-4c03-b4a2-c9c361a8421e",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "af10e3af-edbd-4433-b60b-f8743c2cb972",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "11",
+      "x-envoy-upstream-service-time" : "5",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "38b9abb6-c8bc-468a-8c0c-91cec945baa0",
-      "x-aml-ta-request-id" : "ddb68a95-84b6-4aa8-8bac-260a4edbb63c",
+      "apim-request-id" : "0f1c2ba1-0f81-4d8d-ac1b-f8f67f0db9e8",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:32:48 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListStringWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListStringWithOptions.json
index 6ff8a8c53ce7..9c0bd50d9273 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListStringWithOptions.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForListStringWithOptions.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "01a2d780-6932-4fd7-a184-cf8c90434c0a",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c6ed0a9f-a4ee-4e3d-8a74-e0c603014b4e",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "6",
+      "x-envoy-upstream-service-time" : "5",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "e02b2b38-f59b-4535-9256-e69ec37f04b9",
+      "apim-request-id" : "e1a68dde-4ac7-4e1d-8da5-7527fa757817",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"statistics\":{\"charactersCount\":49,\"transactionsCount\":1}},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"statistics\":{\"charactersCount\":21,\"transactionsCount\":1}}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Wed, 04 Mar 2020 17:13:48 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"input text\",\"world\"],\"statistics\":{\"charactersCount\":49,\"transactionsCount\":1},\"warnings\":[]},{\"id\":\"1\",\"keyPhrases\":[\"monde\"],\"statistics\":{\"charactersCount\":21,\"transactionsCount\":1},\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForTextInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForTextInput.json
index d28de74cbb6d..bd2b2eb3e675 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForTextInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesForTextInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/keyPhrases",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "3be7e42b-301a-4db9-970e-e707d60caeac",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b57d36cb-3bc5-40f2-aba9-cb9aba3e3d95",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "2",
+      "x-envoy-upstream-service-time" : "4",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "fb026813-d781-4208-9f69-e23041e738fa",
-      "x-aml-ta-request-id" : "165e0b26-d158-46ee-a966-5439fd8ed098",
+      "apim-request-id" : "42f434be-b16a-4b5f-9920-75e5d92d0eed",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:33:53 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"monde\"],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesWarning.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesWarning.json
new file mode 100644
index 000000000000..373d8ae1a030
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/extractKeyPhrasesWarning.json
@@ -0,0 +1,26 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.ppe.cognitiveservices.azure.com/text/analytics/v3.0//keyPhrases",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "6070fa8f-51ce-4ee1-8262-bb1413d91844",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "4",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
+      "apim-request-id" : "8d61f6e0-6f52-4d7a-a157-c8380bf2b60d",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"keyPhrases\":[\"Thisisaveryveryverylongtextwhichgoesonforalongtimeandwhichalmost\"],\"warnings\":[{\"code\":\"LongWordsInDocument\",\"message\":\"The document contains very long words (longer than 64 characters). These words will be truncated and may result in unreliable model predictions.\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Thu, 07 May 2020 02:48:54 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesBatchInputSingleError.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesBatchInputSingleError.json
index ada789de376a..8dea8ba2991d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesBatchInputSingleError.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesBatchInputSingleError.json
@@ -1,22 +1,22 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "aa3e0208-2802-44cb-866b-ad7ecc56681a",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "c155ee1b-e8ec-4897-a653-351837349cca",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
       "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "74e7ac64-4284-4bc7-86d5-9b32175dc25c",
+      "apim-request-id" : "fde49364-8059-4cb5-b65f-19e1180db44f",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"2\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"},\"message\":\"Invalid document in request.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 28 Jan 2020 00:25:42 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"2\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesDuplicateIdInput.json
new file mode 100644
index 000000000000..5d75bf441cc7
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesDuplicateIdInput.json
@@ -0,0 +1,25 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "0697cc18-e2ad-40d2-9403-238072c99231",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "5",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "625712f8-5ad4-4c0f-b446-12ce318345db",
+      "retry-after" : "0",
+      "StatusCode" : "400",
+      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"}}}",
+      "Date" : "Thu, 30 Apr 2020 04:52:39 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInput.json
index 1ff3aca45159..2df061228dbc 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInput.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "e0e8c557-5bc5-42ca-9dda-a5c05c4b5d38",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "44c61065-7f1f-4b50-a029-f49551867ddd",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "77",
+      "x-envoy-upstream-service-time" : "91",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "944832eb-0e60-4f63-baa8-1cc381d8ffcd",
+      "apim-request-id" : "a91c7873-b4ef-44bd-9253-e662937f1f59",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"type\":\"Organization\",\"offset\":10,\"length\":9,\"score\":0.99}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 23:37:11 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"category\":\"Organization\",\"offset\":10,\"length\":9,\"confidenceScore\":0.37}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInputShowStatistics.json
index 842d59c0eba5..b6bd99a9fee7 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInputShowStatistics.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchInputShowStatistics.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "03f11f25-9da6-4c18-b6b2-1550840f887c",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "33da35c7-b013-4cf9-86aa-c67157d11287",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "80",
+      "x-envoy-upstream-service-time" : "95",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "b8091f0d-6deb-4351-b25b-47ca77eb488c",
+      "apim-request-id" : "e8e8adf7-30c7-4bc6-a080-254f68a32b67",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"text\":\"Microsoft\",\"type\":\"Organization\",\"offset\":10,\"length\":9,\"score\":0.99}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 23:36:22 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"text\":\"Microsoft\",\"category\":\"Organization\",\"offset\":10,\"length\":9,\"confidenceScore\":0.37}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchStringInput.json
index 9e9f49de181e..4f49e89a8bac 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchStringInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForBatchStringInput.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "b2658e8c-d5fe-4986-b2d8-2c38ed7a8f03",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "e1176b08-6a1f-4306-8c72-06140a9d526f",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "67",
+      "x-envoy-upstream-service-time" : "97",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "d88d63ca-b847-438f-a294-396be2524e08",
+      "apim-request-id" : "0214cc9d-0063-4c09-aa8f-0940393b9a58",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"type\":\"Organization\",\"offset\":10,\"length\":9,\"score\":0.99}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 23:35:31 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"category\":\"Organization\",\"offset\":10,\"length\":9,\"confidenceScore\":0.37}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForEmptyText.json
index d95682eb0df5..d62ca7b600f9 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForEmptyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForEmptyText.json
@@ -1,26 +1,25 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "1221c2bb-9541-4201-a2ce-ff119ba77dc9",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "235ca2bb-7dd2-452b-9acd-a6196322953f",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
       "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "b90ddc69-b691-4008-95d4-8f7ce3029cfa",
-      "x-aml-ta-request-id" : "fb985580-7eff-4032-bb58-5744906a215a",
+      "apim-request-id" : "9891bfdc-977a-4561-9fa3-e2517e7d3c0e",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"},\"message\":\"Invalid document in request.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:35:00 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json
index 7195afe1b6da..86ff28aca612 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "ea8835bd-4259-4867-9c01-e1845882c1bf",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "b23078f9-d856-402d-9138-9ce2e07e0c4a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "29",
+      "x-envoy-upstream-service-time" : "56",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "64334c9b-a767-419f-b5d0-cfb331a405e8",
-      "x-aml-ta-request-id" : "84ca812c-7b19-48b3-b254-8b27ac149336",
+      "apim-request-id" : "e8cccb7c-1b1a-48c5-be73-8eb7435af38c",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Fri, 27 Dec 2019 22:10:43 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListLanguageHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListLanguageHint.json
index 3289d1587a20..51630aa29257 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListLanguageHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListLanguageHint.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "95998f8d-6d81-477f-9300-33049e3f8474",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "039a577f-2ee6-4e6e-a5ca-334386f11459",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "75",
+      "x-envoy-upstream-service-time" : "102",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "10b0f1cf-1842-4065-a839-6e5e53d9daac",
+      "apim-request-id" : "5a80653a-fbc5-4e3a-9f55-7ee98a651260",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"type\":\"Organization\",\"offset\":10,\"length\":9,\"score\":0.99}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 23:34:13 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"text\":\"Microsoft\",\"category\":\"Organization\",\"offset\":10,\"length\":9,\"confidenceScore\":0.37}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListWithOptions.json
index 503244f53193..626efdfb3870 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListWithOptions.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForListWithOptions.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "9742e16c-c6db-4c06-b853-504d91145647",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "008fab9b-6761-4859-a195-0a59e32dd2e4",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "73",
+      "x-envoy-upstream-service-time" : "87",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "cd55e083-d48a-42bf-9403-76004730f862",
+      "apim-request-id" : "ea3fa9ac-ebcb-4d7d-8cd8-d6b6db1f6dde",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"text\":\"Microsoft\",\"type\":\"Organization\",\"offset\":10,\"length\":9,\"score\":0.99}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 16:18:20 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"text\":\"Microsoft\",\"category\":\"Organization\",\"offset\":10,\"length\":9,\"confidenceScore\":0.37}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForTextInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForTextInput.json
index 74a32abe2983..3e868809568d 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForTextInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForTextInput.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "1b7a88fc-556f-46d4-b6d1-e9334291b058",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "9cb6c777-9a17-45dc-8bc5-144f5bc4d59a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "58",
+      "x-envoy-upstream-service-time" : "76",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "ed2b7fcf-4b61-4483-86d1-7ce95cc0f4e3",
+      "apim-request-id" : "3297d4e1-232d-46a0-ae46-205a2929c97e",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"Seattle\",\"type\":\"Location\",\"subtype\":\"GPE\",\"offset\":26,\"length\":7,\"score\":0.92},{\"text\":\"last week\",\"type\":\"DateTime\",\"subtype\":\"DateRange\",\"offset\":34,\"length\":9,\"score\":0.8}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 23:26:53 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.62},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.6},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesTooManyDocuments.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesTooManyDocuments.json
new file mode 100644
index 000000000000..ff6bc7592345
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesTooManyDocuments.json
@@ -0,0 +1,26 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/recognition/general",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "2a6195db-9126-4c71-969d-0d75fa549c6d",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "128",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=6",
+      "apim-request-id" : "bb5b1fee-7fd8-4f5d-be80-8827934adb6e",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"2\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"3\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"4\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]},{\"id\":\"5\",\"entities\":[{\"text\":\"trip\",\"category\":\"Event\",\"offset\":18,\"length\":4,\"confidenceScore\":0.61},{\"text\":\"Seattle\",\"category\":\"Location\",\"subcategory\":\"GPE\",\"offset\":26,\"length\":7,\"confidenceScore\":0.82},{\"text\":\"last week\",\"category\":\"DateTime\",\"subcategory\":\"DateRange\",\"offset\":34,\"length\":9,\"confidenceScore\":0.8}],\"warnings\":[]}],\"errors\":[{\"id\":\"\",\"error\":{\"code\":\"InvalidRequest\",\"message\":\"The request has exceeded the allowed document limits.\",\"innererror\":{\"code\":\"InvalidDocumentBatch\",\"message\":\"The number of documents in the request have exceeded the data limitations. See https://aka.ms/text-analytics-data-limits for additional information\"}}}],\"modelVersion\":\"2020-04-01\"}",
+      "Date" : "Fri, 08 May 2020 05:52:36 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesDuplicateIdInput.json
new file mode 100644
index 000000000000..ad7e3561cd81
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesDuplicateIdInput.json
@@ -0,0 +1,25 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "604f60ed-8d4d-43e8-bef7-954acfe4886c",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "5",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "apim-request-id" : "17c4f097-2f3f-4fa4-98a0-a036e24933d6",
+      "retry-after" : "0",
+      "StatusCode" : "400",
+      "Body" : "{\"error\":{\"code\":\"InvalidRequest\",\"message\":\"Invalid document in request.\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Request contains duplicated Ids. Make sure each document has a unique Id.\"}}}",
+      "Date" : "Thu, 30 Apr 2020 04:52:37 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInput.json
index 8a830ad877cc..b29849149041 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "801ab3cf-aa2a-43c7-add5-e1c8e8a2b49d",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "cb5a7ee7-b977-4b83-866f-39f03af7a7d2",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "12",
+      "x-envoy-upstream-service-time" : "19",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "dd8d437b-aa02-4be1-8a96-bfb6591755ae",
-      "x-aml-ta-request-id" : "d7bbf941-abd6-44c3-9658-6922a117da0c",
+      "apim-request-id" : "21baa840-355e-4ac0-ba17-4434a669aa70",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.11472424095537814}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"score\":0.18693659716732069}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:32:51 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:19 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInputShowStatistics.json
index f92232db6b70..fd7689f63463 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInputShowStatistics.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchInputShowStatistics.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "17da0fae-061a-4b79-a605-addb46a09b95",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "8b28c5ff-1989-459c-925d-8e1de9030f7d",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "14",
+      "x-envoy-upstream-service-time" : "18",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "56651941-2cb9-4113-8a2c-9b473f517058",
-      "x-aml-ta-request-id" : "a7782d77-f675-498c-87a5-b4cb7868346d",
+      "apim-request-id" : "4d1fa8fe-1ec6-4fcf-86b7-9f551acf9945",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.11472424095537814}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"score\":0.18693659716732069}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:35:58 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchStringInput.json
index 42498d9f6e13..da426aaea9fe 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchStringInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForBatchStringInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "10dc1e7a-05e9-489f-8568-b4c8be54790d",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "ba5ba3c8-7119-4cff-8888-bc522556cfc3",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "23",
+      "x-envoy-upstream-service-time" : "18",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "20720445-eb4f-4ce7-b89b-43792d6f879f",
-      "x-aml-ta-request-id" : "1cac6013-2ba1-492d-8395-b91cd2d134e4",
+      "apim-request-id" : "db699c2b-7ca7-4348-8570-7ede1f277d4a",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.11472424095537814}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"score\":0.18693659716732069}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:39:25 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForEmptyText.json
index c64b5bd92211..c8945efee485 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForEmptyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForEmptyText.json
@@ -1,26 +1,25 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "9d57fa09-3847-4d14-a9aa-be82464d592b",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "5afd8182-c8f2-454c-8278-95132a14f5af",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
       "x-envoy-upstream-service-time" : "2",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "193e013b-5f7d-4597-a924-39739e88b377",
-      "x-aml-ta-request-id" : "781c87ff-a6a8-4c48-9c96-b4097ac44128",
+      "apim-request-id" : "de80e78b-df15-4a64-8f1a-4ebbe7450dd8",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"innerError\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"},\"message\":\"Invalid document in request.\"}}],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:39:26 GMT",
+      "Body" : "{\"documents\":[],\"errors\":[{\"id\":\"0\",\"error\":{\"code\":\"InvalidArgument\",\"message\":\"Invalid document in request.\",\"innererror\":{\"code\":\"InvalidDocument\",\"message\":\"Document text is empty.\"}}}],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForFaultyText.json
index 2ea55fb270bb..f1e76d293f58 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForFaultyText.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForFaultyText.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "edab5962-f052-40b3-83f3-3a7f11e52d3e",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "2f50a5ed-679e-485d-a1c6-59921c90d5a5",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "5017",
+      "x-envoy-upstream-service-time" : "16",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "f2d5e5a9-ebf8-49d8-8354-13429b5d7a02",
-      "x-aml-ta-request-id" : "f6615e24-9bca-481a-b3d9-30a55ffd391f",
+      "apim-request-id" : "56625abf-52f0-4967-b086-0a7a90cbb690",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:35:00 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:20 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListLanguageHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListLanguageHint.json
index f2885add0808..1967eac24394 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListLanguageHint.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListLanguageHint.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "9f604d8e-9e35-4fdd-913d-1e2b4b41ad6d",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "3c1af4aa-544e-450e-9b6d-5301807e72ee",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "15",
+      "x-envoy-upstream-service-time" : "22",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "c9959676-d6cb-43ee-8b46-add4ac6273f7",
-      "x-aml-ta-request-id" : "37d2a4ca-cad6-493f-81f4-6e4b40fbe8c8",
+      "apim-request-id" : "40e4642c-01a0-4ab7-9a77-fafd4ca83dc2",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.11472424095537814}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"score\":0.18693659716732069}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:39:25 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListStringWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListStringWithOptions.json
index 228637237f2b..bf0f9fea801c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListStringWithOptions.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForListStringWithOptions.json
@@ -1,23 +1,23 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking?showStats=true",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking?showStats=true",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.3 (11.0.4; Windows 10 10.0)",
-      "x-ms-client-request-id" : "a57ebccb-69e8-4ef7-b047-2530baae1945",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "e731ff31-c9b5-4844-a5eb-c6e519d2e50a",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "18",
+      "x-envoy-upstream-service-time" : "20",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=2",
-      "apim-request-id" : "8bba2bd2-9623-4ac7-9916-132ed0da8af2",
+      "apim-request-id" : "eb22c862-77fa-4ca4-89e0-3118525a5952",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.15046201222847677}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"score\":0.18693659716732069}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
-      "Date" : "Wed, 04 Mar 2020 17:13:35 GMT",
+      "Body" : "{\"statistics\":{\"documentsCount\":2,\"validDocumentsCount\":2,\"erroneousDocumentsCount\":0,\"transactionsCount\":2},\"documents\":[{\"id\":\"0\",\"statistics\":{\"charactersCount\":44,\"transactionsCount\":1},\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"statistics\":{\"charactersCount\":20,\"transactionsCount\":1},\"entities\":[{\"name\":\"Microsoft\",\"matches\":[{\"text\":\"Microsoft\",\"offset\":10,\"length\":9,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Microsoft\",\"url\":\"https://en.wikipedia.org/wiki/Microsoft\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForTextInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForTextInput.json
index 7033022a322f..02a66126f7a6 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForTextInput.json
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesForTextInput.json
@@ -1,27 +1,26 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/linking",
+    "Uri" : "https://westus2.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
-      "x-ms-client-request-id" : "c70b3abe-b742-4fe0-99f6-fcfb50a72ac4",
-      "Content-Type" : "application/json; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "1e6f521e-b399-45f8-80cd-05eb0f720c22",
+      "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "11",
+      "x-envoy-upstream-service-time" : "16",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
       "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
-      "apim-request-id" : "0590ca51-9475-4de7-8a58-023ae983eef6",
-      "x-aml-ta-request-id" : "9df16f76-7828-4be0-9515-bc479fb85195",
+      "apim-request-id" : "f795a6fd-89cc-41ef-9031-1145491039f9",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"score\":0.11472424095537814}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
-      "Date" : "Tue, 17 Dec 2019 22:39:27 GMT",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.0}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Wed, 29 Apr 2020 17:12:18 GMT",
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Exception" : null
   } ],
   "variables" : [ ]
-}
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesTooManyDocuments.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesTooManyDocuments.json
new file mode 100644
index 000000000000..be076b357cc5
--- /dev/null
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/recognizeLinkedEntitiesTooManyDocuments.json
@@ -0,0 +1,26 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.ppe.cognitiveservices.azure.com/text/analytics/v3.0//entities/linking",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.5 (11.0.4; Windows 10 10.0)",
+      "x-ms-client-request-id" : "ab2a170a-32eb-49d4-9d94-ff4a39902642",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "23",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=6",
+      "apim-request-id" : "819dd030-8b6e-4924-a9de-948c319b02f4",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"1\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"2\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"3\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"4\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]},{\"id\":\"5\",\"entities\":[{\"name\":\"Seattle\",\"matches\":[{\"text\":\"Seattle\",\"offset\":26,\"length\":7,\"confidenceScore\":0.19}],\"language\":\"en\",\"id\":\"Seattle\",\"url\":\"https://en.wikipedia.org/wiki/Seattle\",\"dataSource\":\"Wikipedia\"}],\"warnings\":[]}],\"errors\":[{\"id\":\"\",\"error\":{\"code\":\"InvalidRequest\",\"message\":\"The request has exceeded the allowed document limits.\",\"innererror\":{\"code\":\"InvalidDocumentBatch\",\"message\":\"The number of documents in the request have exceeded the data limitations. See https://aka.ms/text-analytics-data-limits for additional information\"}}}],\"modelVersion\":\"2020-02-01\"}",
+      "Date" : "Fri, 08 May 2020 05:52:38 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md b/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md
index 115f9e60af90..5ff4685eefcf 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md
@@ -5,8 +5,9 @@
 ### Setup
 ```ps
 Fork and clone https://github.com/Azure/autorest.java 
-git checkout v3
+git checkout v4
 git submodule update --init --recursive
+mvn package -Dlocal
 npm install
 npm install -g autorest
 ```
@@ -19,15 +20,16 @@ autorest --java --use=C:/work/autorest.java
 
 ### Code generation settings
 ``` yaml
-input-file: https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.0-preview.1/TextAnalytics.json
+input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/cognitiveservices/data-plane/TextAnalytics/stable/v3.0/TextAnalytics.json
 java: true
 output-folder: ..\
+generate-client-as-impl: true
 namespace: com.azure.ai.textanalytics
-enable-xml: true
 generate-client-interfaces: false
 sync-methods: none
 license-header: MICROSOFT_MIT_SMALL
 add-context-parameter: true
 models-subpackage: implementation.models
 custom-types-subpackage: models
+context-client-method-parameter: true
 ```